Skip to content

Commit

Permalink
Merge pull request #20 from AstaTus/1.3.4-main
Browse files Browse the repository at this point in the history
1.3.4 main
  • Loading branch information
AstaTus authored Jan 2, 2024
2 parents 85368bb + 7873bb0 commit 6cacf88
Show file tree
Hide file tree
Showing 8 changed files with 100 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,21 @@ <h2 class="">Functions</h2>
</div>
</div>
</div>
<a data-name="-935709262%2FFunctions%2F-366775796" anchor-label="onDecodeFailed" id="-935709262%2FFunctions%2F-366775796" data-filterable-set=":qplayer2-core:dokkaHtml/release"></a>
<div class="table-row" data-filterable-current=":qplayer2-core:dokkaHtml/release" data-filterable-set=":qplayer2-core:dokkaHtml/release">
<div class="main-subrow keyValue ">
<div class=""><span class="inline-flex">
<div><a href="on-decode-failed.html"><span>on</span><wbr></wbr><span>Decode</span><wbr></wbr><span><span>Failed</span></span></a></div>
<span class="anchor-wrapper"><span class="anchor-icon" pointing-to="-935709262%2FFunctions%2F-366775796"></span>
<div class="copy-popup-wrapper "><span class="copy-popup-icon"></span><span>Link copied to clipboard</span></div>
</span></span></div>
<div>
<div class="title">
<div class="platform-hinted " data-platform-hinted="data-platform-hinted"><div class="content sourceset-depenent-content" data-active="" data-togglable=":qplayer2-core:dokkaHtml/release"><div class="symbol monospace"><span class="token keyword">abstract </span><span class="token keyword"></span><span class="token keyword">fun </span><a href="on-decode-failed.html"><span class="token function">onDecodeFailed</span></a><span class="token punctuation">(</span><span class="parameters "><span class="parameter ">retry<span class="token operator">: </span><a href="https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-boolean/index.html">Boolean</a></span></span><span class="token punctuation">)</span><span class="top-right-position"><span class="copy-icon"></span><div class="copy-popup-wrapper popup-to-left"><span class="copy-popup-icon"></span><span>Content copied to clipboard</span></div></span></div><div class="brief "><p class="paragraph">通知当前视频解码失败,</p></div></div></div>
</div>
</div>
</div>
</div>
<a data-name="-1063536198%2FFunctions%2F-366775796" anchor-label="onVideoDecodeByType" id="-1063536198%2FFunctions%2F-366775796" data-filterable-set=":qplayer2-core:dokkaHtml/release"></a>
<div class="table-row" data-filterable-current=":qplayer2-core:dokkaHtml/release" data-filterable-set=":qplayer2-core:dokkaHtml/release">
<div class="main-subrow keyValue ">
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
<!DOCTYPE html>
<html>
<head>
<meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8">
<title>onDecodeFailed</title>
<link href="../../../images/logo-icon.svg" rel="icon" type="image/svg">
<script>var pathToRoot = "../../../";</script>
<script>const storage = localStorage.getItem("dokka-dark-mode")
const savedDarkMode = storage ? JSON.parse(storage) : false
if(savedDarkMode === true){
document.getElementsByTagName("html")[0].classList.add("theme-dark")
}</script>
<script type="text/javascript" src="../../../scripts/sourceset_dependencies.js" async="async"></script>
<link href="../../../styles/style.css" rel="Stylesheet">
<link href="../../../styles/jetbrains-mono.css" rel="Stylesheet">
<link href="../../../styles/main.css" rel="Stylesheet">
<link href="../../../styles/prism.css" rel="Stylesheet">
<link href="../../../styles/logo-styles.css" rel="Stylesheet">
<script type="text/javascript" src="../../../scripts/clipboard.js" async="async"></script>
<script type="text/javascript" src="../../../scripts/navigation-loader.js" async="async"></script>
<script type="text/javascript" src="../../../scripts/platform-content-handler.js" async="async"></script>
<script type="text/javascript" src="../../../scripts/main.js" defer="defer"></script>
<script type="text/javascript" src="../../../scripts/prism.js" async="async"></script>
</head>
<body>
<div class="navigation-wrapper" id="navigation-wrapper">
<div id="leftToggler"><span class="icon-toggler"></span></div>
<div class="library-name">
<a href="../../../index.html">
<span>qplayer2-core</span>
</a>
</div>
<div>
</div>
<div class="pull-right d-flex">
<button id="theme-toggle-button"><span id="theme-toggle"></span></button>
<div id="searchBar"></div>
</div>
</div>
<div id="container">
<div id="leftColumn">
<div id="sideMenu"></div>
</div>
<div id="main">
<div class="main-content" id="content" pageIds="qplayer2-core::com.qiniu.qmedia.component.player/QIPlayerVideoDecodeListener/onDecodeFailed/#kotlin.Boolean/PointingToDeclaration//-366775796">
<div class="breadcrumbs"><a href="../../../index.html">qplayer2-core</a><span class="delimiter">/</span><a href="../index.html">com.qiniu.qmedia.component.player</a><span class="delimiter">/</span><a href="index.html">QIPlayerVideoDecodeListener</a><span class="delimiter">/</span><a href="on-decode-failed.html">onDecodeFailed</a></div>
<div class="cover ">
<h1 class="cover"><span>on</span><wbr></wbr><span>Decode</span><wbr></wbr><span><span>Failed</span></span></h1>
</div>
<div class="platform-hinted " data-platform-hinted="data-platform-hinted"><div class="content sourceset-depenent-content" data-active="" data-togglable=":qplayer2-core:dokkaHtml/release"><div class="symbol monospace"><span class="token keyword">abstract </span><span class="token keyword"></span><span class="token keyword">fun </span><a href="on-decode-failed.html"><span class="token function">onDecodeFailed</span></a><span class="token punctuation">(</span><span class="parameters "><span class="parameter ">retry<span class="token operator">: </span><a href="https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-boolean/index.html">Boolean</a></span></span><span class="token punctuation">)</span><span class="top-right-position"><span class="copy-icon"></span><div class="copy-popup-wrapper popup-to-left"><span class="copy-popup-icon"></span><span>Content copied to clipboard</span></div></span></div><p class="paragraph">通知当前视频解码失败,</p><h2 class="">Parameters</h2><div data-togglable="Parameters"><div class="table" data-togglable="Parameters"><div class="table-row" data-filterable-current=":qplayer2-core:dokkaHtml/release" data-filterable-set=":qplayer2-core:dokkaHtml/release"><div class="main-subrow keyValue WithExtraAttributes"><div class=""><span class="inline-flex"><div><span><span>retry</span></span></div></span></div><div><div class="title"><div data-togglable="Parameters"><p class="paragraph">底层是重试</p></div></div></div></div></div></div></div></div></div>
</div>
<div class="footer"><span class="go-to-top-icon"><a href="#content" id="go-to-top-link"></a></span><span>© 2023 Copyright</span><span
class="pull-right"><span>Generated by </span><a
href="https://github.com/Kotlin/dokka"><span>dokka</span><span class="padded-icon"></span></a></span>
</div>
</div>
</div>
</body>
</html>
1 change: 1 addition & 0 deletions Document/qplayer2-core/html/qplayer2-core/package-list
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,7 @@ $dokka.location:com.qiniu.qmedia.component.player/QIPlayerSubtitleListener/on_su
$dokka.location:com.qiniu.qmedia.component.player/QIPlayerSubtitleListener/on_subtitle_text_change/#kotlin.String/PointingToDeclaration/qplayer2-core/com.qiniu.qmedia.component.player/-q-i-player-subtitle-listener/on_subtitle_text_change.html
$dokka.location:com.qiniu.qmedia.component.player/QIPlayerVideoDecodeListener///PointingToDeclaration/qplayer2-core/com.qiniu.qmedia.component.player/-q-i-player-video-decode-listener/index.html
$dokka.location:com.qiniu.qmedia.component.player/QIPlayerVideoDecodeListener/notSupportCodecFormat/#kotlin.Int/PointingToDeclaration/qplayer2-core/com.qiniu.qmedia.component.player/-q-i-player-video-decode-listener/not-support-codec-format.html
$dokka.location:com.qiniu.qmedia.component.player/QIPlayerVideoDecodeListener/onDecodeFailed/#kotlin.Boolean/PointingToDeclaration/qplayer2-core/com.qiniu.qmedia.component.player/-q-i-player-video-decode-listener/on-decode-failed.html
$dokka.location:com.qiniu.qmedia.component.player/QIPlayerVideoDecodeListener/onVideoDecodeByType/#com.qiniu.qmedia.component.player.QPlayerDecodeType/PointingToDeclaration/qplayer2-core/com.qiniu.qmedia.component.player/-q-i-player-video-decode-listener/on-video-decode-by-type.html
$dokka.location:com.qiniu.qmedia.component.player/QIPlayerVideoFrameSizeChangeListener///PointingToDeclaration/qplayer2-core/com.qiniu.qmedia.component.player/-q-i-player-video-frame-size-change-listener/index.html
$dokka.location:com.qiniu.qmedia.component.player/QIPlayerVideoFrameSizeChangeListener/onVideoFrameSizeChanged/#kotlin.Int#kotlin.Int/PointingToDeclaration/qplayer2-core/com.qiniu.qmedia.component.player/-q-i-player-video-frame-size-change-listener/on-video-frame-size-changed.html
Expand Down
2 changes: 1 addition & 1 deletion Document/qplayer2-core/html/scripts/pages.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions Qplayer2Demo/.gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
*.iml
.gradle
/local.properties
/.idea
/.idea/caches
/.idea/libraries
/.idea/modules.xml
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,16 @@ class PlayerToastService
mPlayerCore.playerToastContainer?.showToast(toast)
}

override fun onDecodeFailed(retry: Boolean) {
val toast = PlayerToast.Builder()
.toastItemType(PlayerToastConfig.TYPE_NORMAL)
.location(PlayerToastConfig.LOCAT_LEFT_SIDE)
.setExtraString(PlayerToastConfig.EXTRA_TITLE, "解码失败 重试:$retry")
.duration(PlayerToastConfig.DURATION_3)
.build()
mPlayerCore.playerToastContainer?.showToast(toast)
}

override fun onCommandNotAllow(commandName: String, state: QPlayerState) {
val toast = PlayerToast.Builder()
.toastItemType(PlayerToastConfig.TYPE_NORMAL)
Expand Down
2 changes: 1 addition & 1 deletion Qplayer2Demo/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,5 @@ ext {
dependency_type = "remote"
//dependency_type = "local"

qplayer2_version='1.3.2'
qplayer2_version='1.3.4'
}
12 changes: 12 additions & 0 deletions ReleaseNote/ReleaseNote-1.3.4.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# 1.3.4 ReleaseNote

#### 能力
- 优化硬解降级方案。
-


#### 修复问题
- 修复一些bug。



0 comments on commit 6cacf88

Please sign in to comment.