Merge pull request #24 from Mengwangchao/dep-cocos-1.3.4

1.3.4 版本发布
pili-engineering · Jan 2, 2024 · b8426c2 · b8426c2
2 parents ecc3a85 + 56e23ae
commit b8426c2
Show file tree

Hide file tree

Showing 64 changed files with 320 additions and 247 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.3.3 
+ IOS | Last Version: 1.3.4 
  Windows | 敬请期待 
  Mac | 敬请期待 
 ### qplayer2-core 功能列表
@@ -45,7 +45,7 @@ Qplayer2是一款跨平台的播放器SDK,除了基础的播放器能力外，
 ##### 引入依赖
 
 ```groovy
-pod 'qplayer2-core', '1.3.3'
+pod 'qplayer2-core', '1.3.4'
 ```
 
 

diff --git a/ReleaseNote/ReleaseNote-1.3.4.md b/ReleaseNote/ReleaseNote-1.3.4.md
@@ -0,0 +1,15 @@
+# 1.3.4 ReleaseNote
+
+- #### 能力
+
+  - 新增解码失败回调 ：QIPlayerVideoDecodeListener 
+
+    `-(**void**)onDecodeFailed:(QPlayerContext *)context retry:(**BOOL**)retry`
+
+- #### 优化
+
+  - 优化硬解降级方案。
+
+- #### 修复问题
+
+  - 修复冷启动情况下播放第一个视频为首帧非零且很大的 rtmp 时，首帧卡死，音频只能播放2-3秒，且无法恢复的问题
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; 2023 七牛云. All rights reserved. Updated: 2023-08-30</p>
+						<p class="copyright">Copyright &copy; 2023 七牛云. All rights reserved. Updated: 2023-12-26</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
@@ -744,7 +744,7 @@ <h4 class="method-subtitle">Declared In</h4>
 				<footer>
 					<div class="footer-copyright">
 
-						<p class="copyright">Copyright &copy; 2023 七牛云. All rights reserved. Updated: 2023-08-30</p>
+						<p class="copyright">Copyright &copy; 2023 七牛云. All rights reserved. Updated: 2023-12-26</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
@@ -253,7 +253,7 @@ <h4 class="method-subtitle">Declared In</h4>
 				<footer>
 					<div class="footer-copyright">
 
-						<p class="copyright">Copyright &copy; 2023 七牛云. All rights reserved. Updated: 2023-08-30</p>
+						<p class="copyright">Copyright &copy; 2023 七牛云. All rights reserved. Updated: 2023-12-26</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/QMediaModelBuilder.html b/document/qplayer2-core/html/Classes/QMediaModelBuilder.html
@@ -64,6 +64,8 @@ <h1 id="library-title">
 
 		<option value="//api/name/addStreamElementWithUserType:urlType:url:quality:isSelected:backupUrl:referer:renderType:hlsDrmKey:">- addStreamElementWithUserType:urlType:url:quality:isSelected:backupUrl:referer:renderType:hlsDrmKey:</option>
 
+		<option value="//api/name/addStreamElementWithUserType:urlType:url:quality:isSelected:backupUrl:referer:renderType:mp4DrmKey:">- addStreamElementWithUserType:urlType:url:quality:isSelected:backupUrl:referer:renderType:mp4DrmKey:</option>
+
 		<option value="//api/name/addStreamElements:">- addStreamElements:</option>
 
 		<option value="//api/name/addSubtitleElement:url:isDefault:">- addSubtitleElement:url:isDefault:</option>
@@ -173,6 +175,104 @@ <h4 class="method-subtitle">Discussion</h4>
 
 
 
+			<div class="method-subsection declared-in-section">
+				<h4 class="method-subtitle">Declared In</h4>
+				<p><code class="declared-in-ref">QMediaModelBuilder.h</code></p>
+			</div>
+
+
+		</div>
+	</div>
+</div><div class="section-method">
+	<a name="//api/name/addStreamElementWithUserType:urlType:url:quality:isSelected:backupUrl:referer:renderType:mp4DrmKey:" title="addStreamElementWithUserType:urlType:url:quality:isSelected:backupUrl:referer:renderType:mp4DrmKey:"></a>
+	<h3 class="method-title"><code><a href="#//api/name/addStreamElementWithUserType:urlType:url:quality:isSelected:backupUrl:referer:renderType:mp4DrmKey:">&ndash;&nbsp;addStreamElementWithUserType:urlType:url:quality:isSelected:backupUrl:referer:renderType:mp4DrmKey:</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>- (void)addStreamElementWithUserType:(NSString *)<em>userType</em> urlType:(QPlayerURLType)<em>urlType</em> url:(NSString *)<em>url</em> quality:(int)<em>quality</em> isSelected:(BOOL)<em>isSelected</em> backupUrl:(NSString *)<em>backupUrl</em> referer:(NSString *)<em>referer</em> renderType:(QPlayerRenderType)<em>renderType</em> mp4DrmKey:(NSString *)<em>mp4DrmKey</em></code></div>
+
+
+
+			<div class="method-subsection arguments-section parameters">
+				<h4 class="method-subtitle parameter-title">Parameters</h4>
+				<table class="argument-def parameter-def">
+
+					<tr>
+						<th scope="row" class="argument-name"><code>userType</code></th>
+						<td><p>预留字段可以填空</p></td>
+					</tr>
+
+					<tr>
+						<th scope="row" class="argument-name"><code>urlType</code></th>
+						<td><p>媒体的资源属性 只包含视频/只包含音频/同时有视频音频</p></td>
+					</tr>
+
+					<tr>
+						<th scope="row" class="argument-name"><code>url</code></th>
+						<td><p>资源地址</p></td>
+					</tr>
+
+					<tr>
+						<th scope="row" class="argument-name"><code>quality</code></th>
+						<td><p>清晰度</p></td>
+					</tr>
+
+					<tr>
+						<th scope="row" class="argument-name"><code>isSelected</code></th>
+						<td><p>是否起播时播放该流</p></td>
+					</tr>
+
+					<tr>
+						<th scope="row" class="argument-name"><code>backupUrl</code></th>
+						<td><p>备用地址</p></td>
+					</tr>
+
+					<tr>
+						<th scope="row" class="argument-name"><code>referer</code></th>
+						<td><p>http/https 协议的地址 支持该属性</p></td>
+					</tr>
+
+					<tr>
+						<th scope="row" class="argument-name"><code>renderType</code></th>
+						<td><p>视频的渲染类型</p></td>
+					</tr>
+
+					<tr>
+						<th scope="row" class="argument-name"><code>mp4DrmKey</code></th>
+						<td><p>七牛私有mp4解密密钥</p></td>
+					</tr>
+
+				</table>
+			</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">QMediaModelBuilder.h</code></p>
@@ -622,7 +722,7 @@ <h4 class="method-subtitle">Declared In</h4>
 				<footer>
 					<div class="footer-copyright">
 
-						<p class="copyright">Copyright &copy; 2023 七牛云. All rights reserved. Updated: 2023-08-30</p>
+						<p class="copyright">Copyright &copy; 2023 七牛云. All rights reserved. Updated: 2023-12-26</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/QPlayerContext.html b/document/qplayer2-core/html/Classes/QPlayerContext.html
@@ -421,7 +421,7 @@ <h4 class="method-subtitle">Declared In</h4>
 				<footer>
 					<div class="footer-copyright">
 
-						<p class="copyright">Copyright &copy; 2023 七牛云. All rights reserved. Updated: 2023-08-30</p>
+						<p class="copyright">Copyright &copy; 2023 七牛云. All rights reserved. Updated: 2023-12-26</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/QPlayerControlHandler.html b/document/qplayer2-core/html/Classes/QPlayerControlHandler.html
@@ -5753,7 +5753,7 @@ <h4 class="method-subtitle">Declared In</h4>
 				<footer>
 					<div class="footer-copyright">
 
-						<p class="copyright">Copyright &copy; 2023 七牛云. All rights reserved. Updated: 2023-08-30</p>
+						<p class="copyright">Copyright &copy; 2023 七牛云. All rights reserved. Updated: 2023-12-26</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/QPlayerRenderHandler.html b/document/qplayer2-core/html/Classes/QPlayerRenderHandler.html
@@ -802,7 +802,7 @@ <h4 class="method-subtitle">Declared In</h4>
 				<footer>
 					<div class="footer-copyright">
 
-						<p class="copyright">Copyright &copy; 2023 七牛云. All rights reserved. Updated: 2023-08-30</p>
+						<p class="copyright">Copyright &copy; 2023 七牛云. All rights reserved. Updated: 2023-12-26</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/QPlayerView.html b/document/qplayer2-core/html/Classes/QPlayerView.html
@@ -517,7 +517,7 @@ <h4 class="method-subtitle">Declared In</h4>
 				<footer>
 					<div class="footer-copyright">
 
-						<p class="copyright">Copyright &copy; 2023 七牛云. All rights reserved. Updated: 2023-08-30</p>
+						<p class="copyright">Copyright &copy; 2023 七牛云. All rights reserved. Updated: 2023-12-26</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/QRenderView.html b/document/qplayer2-core/html/Classes/QRenderView.html
@@ -349,7 +349,7 @@ <h4 class="method-subtitle">Declared In</h4>
 				<footer>
 					<div class="footer-copyright">
 
-						<p class="copyright">Copyright &copy; 2023 七牛云. All rights reserved. Updated: 2023-08-30</p>
+						<p class="copyright">Copyright &copy; 2023 七牛云. All rights reserved. Updated: 2023-12-26</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/QStreamElement.html b/document/qplayer2-core/html/Classes/QStreamElement.html
@@ -62,6 +62,8 @@ <h1 id="library-title">
 
 		<option value="//api/name/isSelected">isSelected</option>
 
+		<option value="//api/name/mp4DrmKey">mp4DrmKey</option>
+
 		<option value="//api/name/quality">quality</option>
 
 		<option value="//api/name/referer">referer</option>
@@ -488,6 +490,47 @@ <h3 class="method-title"><code><a href="#//api/name/hlsDrmKey">&nbsp;&nbsp;hlsDr
 
 
 
+			<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/mp4DrmKey" title="mp4DrmKey"></a>
+	<h3 class="method-title"><code><a href="#//api/name/mp4DrmKey">&nbsp;&nbsp;mp4DrmKey</a></code>
+</h3>
+
+	<div class="method-info">
+		<div class="pointy-thing"></div>
+
+		<div class="method-info-container">
+
+
+			<div class="method-subsection brief-description">
+				<p>七牛私有mp4解密密钥</p>
+			</div>
+
+
+
+			<div class="method-subsection method-declaration"><code>@property (copy, nonatomic) NSString *mp4DrmKey</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>
@@ -511,7 +554,7 @@ <h4 class="method-subtitle">Declared In</h4>
 				<footer>
 					<div class="footer-copyright">
 
-						<p class="copyright">Copyright &copy; 2023 七牛云. All rights reserved. Updated: 2023-08-30</p>
+						<p class="copyright">Copyright &copy; 2023 七牛云. All rights reserved. Updated: 2023-12-26</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/QSubtitleElement.html b/document/qplayer2-core/html/Classes/QSubtitleElement.html
@@ -243,7 +243,7 @@ <h4 class="method-subtitle">Declared In</h4>
 				<footer>
 					<div class="footer-copyright">
 
-						<p class="copyright">Copyright &copy; 2023 七牛云. All rights reserved. Updated: 2023-08-30</p>
+						<p class="copyright">Copyright &copy; 2023 七牛云. All rights reserved. Updated: 2023-12-26</p>
 
 
 						<p class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1334)</a>.</p>