Merge pull request #27 from Mengwangchao/dep-cocos-1.4.1-2

[QPlayer2 iOS] 1.4.1 版本发布
pili-engineering · Mar 26, 2024 · 1bebcb8 · 1bebcb8
2 parents 3192759 + e1f2dd6
commit 1bebcb8
Show file tree

Hide file tree

Showing 63 changed files with 3,095 additions and 282 deletions.
diff --git a/README.md b/README.md
@@ -9,7 +9,7 @@ Qplayer2是一款跨平台的播放器SDK,除了基础的播放器能力外，
  Platform | Build Status
  -------- | ------------
  Android | https://github.com/pili-engineering/QPlayer2-Android 
- IOS | Last Version: 1.4.0 
+ IOS | Last Version: 1.4.1 
  Windows | https://github.com/pili-engineering/QPlayer2-Windows 
  HarmonyOS NEXT | 敬请期待 
  Mac | 敬请期待 
@@ -36,7 +36,7 @@ Qplayer2是一款跨平台的播放器SDK,除了基础的播放器能力外，
 | 截图                  | 自动转换成jpeg格式，可以展示在UI上，也可存放到相册           |                                  |
 | 静音播放              | 针对视频的静音，不影响系统声音                               |                                  |
 | 字幕                  | 支持srt字幕文件加载并根据时间回调当前时间的文案给上层        |                                  |
-| DRM                   | 支持HLS 私有加密/通用加密 2种方式，支持 MP4 CENC-AES-CTR 加密 |                                  |
+| DRM                   | 支持HLS 私有加密/通用加密 2种方式，支持 MP4 CENC-AES-CTR 加密，支持七牛私有 MP4 加密方式 |                                  |
 | 音视频数据上抛        | 适用于业务层需要获取当前播放的音视频数据的场景（比如推流等） |                                  |
 | 本地重建时间轴        | 以真实的流逝时间为准，避免某些视频时间轴错乱导致播放过程中异常 |                                  |
 
@@ -49,7 +49,7 @@ Qplayer2是一款跨平台的播放器SDK,除了基础的播放器能力外，
 ##### 引入依赖
 
 ```groovy
-pod 'qplayer2-core', '1.4.0'
+pod 'qplayer2-core', '1.4.1'
 ```
 
 

diff --git a/ReleaseNote/ReleaseNote-1.4.1.md b/ReleaseNote/ReleaseNote-1.4.1.md
@@ -0,0 +1,13 @@
+# 1.4.1 ReleaseNote
+
+- #### 能力
+
+  - 新增支持七牛私有 mp4 drm 加密算法
+
+
+
+
+
+
+
+
diff --git a/document/qplayer2-core/html/Classes/QMediaItemContext.html b/document/qplayer2-core/html/Classes/QMediaItemContext.html
@@ -337,7 +337,7 @@ <h4 class="method-subtitle">Declared In</h4>
 				<footer>
 					<div class="footer-copyright">
 
-						<p class="copyright">Copyright &copy; 2024 七牛云. All rights reserved. Updated: 2024-03-07</p>
+						<p class="copyright">Copyright &copy; 2024 七牛云. All rights reserved. Updated: 2024-03-21</p>
 
 
 						<p class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1334)</a>.</p>

diff --git a/document/qplayer2-core/html/Classes/QMediaItemControlHandler.html b/document/qplayer2-core/html/Classes/QMediaItemControlHandler.html
@@ -52,6 +52,12 @@ <h1 id="library-title">
 
 
 
+	<optgroup label="Properties">
+
+		<option value="//api/name/currentState">currentState</option>
+
+	</optgroup>
+
 
 
 
@@ -120,6 +126,52 @@ <h1 class="title">QMediaItemControlHandler Class Reference</h1>
 
 						<div class="task-list">
 							<div class="section-method">
+	<a name="//api/name/currentState" title="currentState"></a>
+	<h3 class="method-title"><code><a href="#//api/name/currentState">&nbsp;&nbsp;currentState</a></code>
+</h3>
+
+	<div class="method-info">
+		<div class="pointy-thing"></div>
+
+		<div class="method-info-container">
+
+
+			<div class="method-subsection brief-description">
+				<p>当前预加载状态</p>
+			</div>
+
+
+
+			<div class="method-subsection method-declaration"><code>@property (nonatomic, assign, readonly) QMediaItemState currentState</code></div>
+
+
+
+
+
+
+
+
+
+			<div class="method-subsection discussion-section">
+				<h4 class="method-subtitle">Discussion</h4>
+				<p>当前预加载状态</p>
+			</div>
+
+
+
+
+
+
+
+			<div class="method-subsection declared-in-section">
+				<h4 class="method-subtitle">Declared In</h4>
+				<p><code class="declared-in-ref">QMediaItemControlHandler.h</code></p>
+			</div>
+
+
+		</div>
+	</div>
+</div><div class="section-method">
 	<a name="//api/name/start" title="start"></a>
 	<h3 class="method-title"><code><a href="#//api/name/start">&ndash;&nbsp;start</a></code>
 </h3>
@@ -692,7 +744,7 @@ <h4 class="method-subtitle">Declared In</h4>
 				<footer>
 					<div class="footer-copyright">
 
-						<p class="copyright">Copyright &copy; 2024 七牛云. All rights reserved. Updated: 2024-03-07</p>
+						<p class="copyright">Copyright &copy; 2024 七牛云. All rights reserved. Updated: 2024-03-21</p>
 
 
 						<p class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1334)</a>.</p>

diff --git a/document/qplayer2-core/html/Classes/QMediaModel.html b/document/qplayer2-core/html/Classes/QMediaModel.html
@@ -58,8 +58,12 @@ <h1 id="library-title">
 
 		<option value="//api/name/isLive">isLive</option>
 
+		<option value="//api/name/isReconstructTimeLine">isReconstructTimeLine</option>
+
 		<option value="//api/name/streamElements">streamElements</option>
 
+		<option value="//api/name/subtitleElements">subtitleElements</option>
+
 	</optgroup>
 
 
@@ -146,6 +150,47 @@ <h3 class="method-title"><code><a href="#//api/name/streamElements">&nbsp;&nbsp;
 
 
 
+			<div class="method-subsection declared-in-section">
+				<h4 class="method-subtitle">Declared In</h4>
+				<p><code class="declared-in-ref">QMediaModel.h</code></p>
+			</div>
+
+
+		</div>
+	</div>
+</div><div class="section-method">
+	<a name="//api/name/subtitleElements" title="subtitleElements"></a>
+	<h3 class="method-title"><code><a href="#//api/name/subtitleElements">&nbsp;&nbsp;subtitleElements</a></code>
+</h3>
+
+	<div class="method-info">
+		<div class="pointy-thing"></div>
+
+		<div class="method-info-container">
+
+
+			<div class="method-subsection brief-description">
+				<p>QSubtitleElements 字幕资源包含的流</p>
+			</div>
+
+
+
+			<div class="method-subsection method-declaration"><code>@property (strong, nonatomic, readonly) NSArray&lt;QSubtitleElement*&gt; *subtitleElements</code></div>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 			<div class="method-subsection declared-in-section">
 				<h4 class="method-subtitle">Declared In</h4>
 				<p><code class="declared-in-ref">QMediaModel.h</code></p>
@@ -187,6 +232,47 @@ <h3 class="method-title"><code><a href="#//api/name/isLive">&nbsp;&nbsp;isLive</
 
 
 
+			<div class="method-subsection declared-in-section">
+				<h4 class="method-subtitle">Declared In</h4>
+				<p><code class="declared-in-ref">QMediaModel.h</code></p>
+			</div>
+
+
+		</div>
+	</div>
+</div><div class="section-method">
+	<a name="//api/name/isReconstructTimeLine" title="isReconstructTimeLine"></a>
+	<h3 class="method-title"><code><a href="#//api/name/isReconstructTimeLine">&nbsp;&nbsp;isReconstructTimeLine</a></code>
+</h3>
+
+	<div class="method-info">
+		<div class="pointy-thing"></div>
+
+		<div class="method-info-container">
+
+
+			<div class="method-subsection brief-description">
+				<p>isReconstryctTimeLine 是否重置时间轴 true 重置 false 不重置</p>
+			</div>
+
+
+
+			<div class="method-subsection method-declaration"><code>@property (assign, nonatomic, readonly) BOOL isReconstructTimeLine</code></div>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 			<div class="method-subsection declared-in-section">
 				<h4 class="method-subtitle">Declared In</h4>
 				<p><code class="declared-in-ref">QMediaModel.h</code></p>
@@ -210,7 +296,7 @@ <h4 class="method-subtitle">Declared In</h4>
 				<footer>
 					<div class="footer-copyright">
 
-						<p class="copyright">Copyright &copy; 2024 七牛云. All rights reserved. Updated: 2024-03-07</p>
+						<p class="copyright">Copyright &copy; 2024 七牛云. All rights reserved. Updated: 2024-03-21</p>
 
 
 						<p class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1334)</a>.</p>