Skip to content

Commit

Permalink
Merge pull request #31 from Mengwangchao/dep-cocos-1.4.3
Browse files Browse the repository at this point in the history
【QPlayer2】1.4.3 版本发布
  • Loading branch information
AstaTus authored May 28, 2024
2 parents 15e401a + 22b805b commit 46126b2
Show file tree
Hide file tree
Showing 70 changed files with 330 additions and 155 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Qplayer2是一款跨平台的播放器SDK,除了基础的播放器能力外,
Platform | Build Status
-------- | ------------
Android | https://github.com/pili-engineering/QPlayer2-Android
IOS | Last Version: 1.4.2
IOS | Last Version: 1.4.3
Windows | https://github.com/pili-engineering/QPlayer2-Windows
HarmonyOS NEXT | 敬请期待
Mac | 敬请期待
Expand Down Expand Up @@ -38,7 +38,7 @@ Qplayer2是一款跨平台的播放器SDK,除了基础的播放器能力外,
| 字幕 | 支持srt字幕文件加载并根据时间回调当前时间的文案给上层 | |
| DRM | 支持HLS 私有加密/通用加密 2种方式,支持 MP4 CENC-AES-CTR 加密,支持七牛私有 MP4 加密方式 | |
| 音视频数据上抛 | 适用于业务层需要获取当前播放的音视频数据的场景(比如推流等) | |
| 本地重建时间轴 | 以真实的流逝时间为准,避免某些视频时间轴错乱导致播放过程中异常 | |
| 本地重建时间轴 | 以真实的流逝时间为准,避免某些视频时间轴错乱导致播放过程中时间进度回调数值异常 | |



Expand All @@ -49,7 +49,7 @@ Qplayer2是一款跨平台的播放器SDK,除了基础的播放器能力外,
##### 引入依赖

```groovy
pod 'qplayer2-core', '1.4.2'
pod 'qplayer2-core', '1.4.3'
```


Expand Down
28 changes: 28 additions & 0 deletions ReleaseNote/ReleaseNote-1.4.3.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
# 1.4.3 ReleaseNote

- #### 能力

- 新增设置日志等级

```objective-c
[self.mPlayerView.controlHandler setLogLevel:LOG_INFO];
```

- 移除 QPlayer2 音频中断逻辑。

中断逻辑参考 demo 的 QNotificationCenterHelper

- 移除本地重建时间轴逻辑,时间轴默认都从0开始



- #### 优化

- 减少progress通知次数
- 优化丢帧逻辑

- #### 修复问题

- 修复某些视频seek崩溃
- 屏蔽无效渲染
- 修复直播音画不同步问题
2 changes: 1 addition & 1 deletion document/qplayer2-core/html/Classes/QMediaItemContext.html
Original file line number Diff line number Diff line change
Expand Up @@ -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-21</p>
<p class="copyright">Copyright &copy; 2024 七牛云. All rights reserved. Updated: 2024-05-16</p>


<p class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1334)</a>.</p>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -744,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-21</p>
<p class="copyright">Copyright &copy; 2024 七牛云. All rights reserved. Updated: 2024-05-16</p>


<p class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1334)</a>.</p>
Expand Down
18 changes: 13 additions & 5 deletions document/qplayer2-core/html/Classes/QMediaModel.html
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ <h2 class="subtitle subtitle-overview">Overview</h2>




<h2 class="task-title">Other Methods</h2>

<div class="task-list">
<div class="section-method">
Expand Down Expand Up @@ -240,7 +240,15 @@ <h4 class="method-subtitle">Declared In</h4>

</div>
</div>
</div><div class="section-method">
</div>
</div>


<a title="Extension Methods" name="task_Extension Methods"></a>
<h2 class="task-title">Extension Methods</h2>

<div class="task-list">
<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>
Expand All @@ -257,7 +265,7 @@ <h3 class="method-title"><code><a href="#//api/name/isReconstructTimeLine">&nbsp



<div class="method-subsection method-declaration"><code>@property (assign, nonatomic, readonly) BOOL isReconstructTimeLine</code></div>
<div class="method-subsection method-declaration"><code>@property (assign, nonatomic, readwrite) BOOL isReconstructTimeLine</code></div>



Expand All @@ -275,7 +283,7 @@ <h3 class="method-title"><code><a href="#//api/name/isReconstructTimeLine">&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>
<p><code class="declared-in-ref">QMediaModel+Private.h</code></p>
</div>


Expand All @@ -296,7 +304,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-21</p>
<p class="copyright">Copyright &copy; 2024 七牛云. All rights reserved. Updated: 2024-05-16</p>


<p class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1334)</a>.</p>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -822,7 +822,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-21</p>
<p class="copyright">Copyright &copy; 2024 七牛云. All rights reserved. Updated: 2024-05-16</p>


<p class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1334)</a>.</p>
Expand Down
2 changes: 1 addition & 1 deletion document/qplayer2-core/html/Classes/QPlayerContext.html
Original file line number Diff line number Diff line change
Expand Up @@ -421,7 +421,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-21</p>
<p class="copyright">Copyright &copy; 2024 七牛云. All rights reserved. Updated: 2024-05-16</p>


<p class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1334)</a>.</p>
Expand Down
62 changes: 61 additions & 1 deletion document/qplayer2-core/html/Classes/QPlayerControlHandler.html
Original file line number Diff line number Diff line change
Expand Up @@ -248,6 +248,8 @@ <h1 id="library-title">

<option value="//api/name/setDecoderType:">- setDecoderType:</option>

<option value="//api/name/setLogLevel:">- setLogLevel:</option>

<option value="//api/name/setMute:">- setMute:</option>

<option value="//api/name/setSEIEnable:">- setSEIEnable:</option>
Expand Down Expand Up @@ -1792,6 +1794,64 @@ <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">QPlayerControlHandler.h</code></p>
</div>


</div>
</div>
</div><div class="section-method">
<a name="//api/name/setLogLevel:" title="setLogLevel:"></a>
<h3 class="method-title"><code><a href="#//api/name/setLogLevel:">&ndash;&nbsp;setLogLevel:</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>- (BOOL)setLogLevel:(QLogLevel)<em>level</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>level</code></th>
<td><p>日志等级</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">QPlayerControlHandler.h</code></p>
Expand Down Expand Up @@ -6217,7 +6277,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-21</p>
<p class="copyright">Copyright &copy; 2024 七牛云. All rights reserved. Updated: 2024-05-16</p>


<p class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1334)</a>.</p>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -802,7 +802,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-21</p>
<p class="copyright">Copyright &copy; 2024 七牛云. All rights reserved. Updated: 2024-05-16</p>


<p class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1334)</a>.</p>
Expand Down
2 changes: 1 addition & 1 deletion document/qplayer2-core/html/Classes/QPlayerView.html
Original file line number Diff line number Diff line change
Expand Up @@ -517,7 +517,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-21</p>
<p class="copyright">Copyright &copy; 2024 七牛云. All rights reserved. Updated: 2024-05-16</p>


<p class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1334)</a>.</p>
Expand Down
2 changes: 1 addition & 1 deletion document/qplayer2-core/html/Classes/QRenderView.html
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,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-21</p>
<p class="copyright">Copyright &copy; 2024 七牛云. All rights reserved. Updated: 2024-05-16</p>


<p class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1334)</a>.</p>
Expand Down
2 changes: 1 addition & 1 deletion document/qplayer2-core/html/Classes/QStreamElement.html
Original file line number Diff line number Diff line change
Expand Up @@ -640,7 +640,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-21</p>
<p class="copyright">Copyright &copy; 2024 七牛云. All rights reserved. Updated: 2024-05-16</p>


<p class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1334)</a>.</p>
Expand Down
2 changes: 1 addition & 1 deletion document/qplayer2-core/html/Classes/QSubtitleElement.html
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,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-21</p>
<p class="copyright">Copyright &copy; 2024 七牛云. All rights reserved. Updated: 2024-05-16</p>


<p class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1334)</a>.</p>
Expand Down
2 changes: 1 addition & 1 deletion document/qplayer2-core/html/Classes/Reachability.html
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,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-21</p>
<p class="copyright">Copyright &copy; 2024 七牛云. All rights reserved. Updated: 2024-05-16</p>


<p class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1334)</a>.</p>
Expand Down
2 changes: 1 addition & 1 deletion document/qplayer2-core/html/Constants/QChannelLayout.html
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ <h4 class="method-subtitle">Constants</h4>
<footer>
<div class="footer-copyright">

<p class="copyright">Copyright &copy; 2024 七牛云. All rights reserved. Updated: 2024-03-21</p>
<p class="copyright">Copyright &copy; 2024 七牛云. All rights reserved. Updated: 2024-05-16</p>


<p class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1334)</a>.</p>
Expand Down
2 changes: 1 addition & 1 deletion document/qplayer2-core/html/Constants/QLogLevel.html
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,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-21</p>
<p class="copyright">Copyright &copy; 2024 七牛云. All rights reserved. Updated: 2024-05-16</p>


<p class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1334)</a>.</p>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,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-21</p>
<p class="copyright">Copyright &copy; 2024 七牛云. All rights reserved. Updated: 2024-05-16</p>


<p class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1334)</a>.</p>
Expand Down
2 changes: 1 addition & 1 deletion document/qplayer2-core/html/Constants/QMediaItemState.html
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,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-21</p>
<p class="copyright">Copyright &copy; 2024 七牛云. All rights reserved. Updated: 2024-05-16</p>


<p class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1334)</a>.</p>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,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-21</p>
<p class="copyright">Copyright &copy; 2024 七牛云. All rights reserved. Updated: 2024-05-16</p>


<p class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1334)</a>.</p>
Expand Down
2 changes: 1 addition & 1 deletion document/qplayer2-core/html/Constants/QPlayerBlind.html
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,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-21</p>
<p class="copyright">Copyright &copy; 2024 七牛云. All rights reserved. Updated: 2024-05-16</p>


<p class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1334)</a>.</p>
Expand Down
2 changes: 1 addition & 1 deletion document/qplayer2-core/html/Constants/QPlayerDecoder.html
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,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-21</p>
<p class="copyright">Copyright &copy; 2024 七牛云. All rights reserved. Updated: 2024-05-16</p>


<p class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1334)</a>.</p>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,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-21</p>
<p class="copyright">Copyright &copy; 2024 七牛云. All rights reserved. Updated: 2024-05-16</p>


<p class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1334)</a>.</p>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,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-21</p>
<p class="copyright">Copyright &copy; 2024 七牛云. All rights reserved. Updated: 2024-05-16</p>


<p class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1334)</a>.</p>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,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-21</p>
<p class="copyright">Copyright &copy; 2024 七牛云. All rights reserved. Updated: 2024-05-16</p>


<p class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1334)</a>.</p>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,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-21</p>
<p class="copyright">Copyright &copy; 2024 七牛云. All rights reserved. Updated: 2024-05-16</p>


<p class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1334)</a>.</p>
Expand Down
2 changes: 1 addition & 1 deletion document/qplayer2-core/html/Constants/QPlayerSeek.html
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,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-21</p>
<p class="copyright">Copyright &copy; 2024 七牛云. All rights reserved. Updated: 2024-05-16</p>


<p class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1334)</a>.</p>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,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-21</p>
<p class="copyright">Copyright &copy; 2024 七牛云. All rights reserved. Updated: 2024-05-16</p>


<p class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1334)</a>.</p>
Expand Down
Loading

0 comments on commit 46126b2

Please sign in to comment.