add 265 decode function

Conflicts: framework/live/KSYMediaPlayer.framework/KSYMediaPlayer framework/live/KSYMediaPlayer.framework/_CodeSignature/CodeDirectory framework/live/KSYMediaPlayer.framework/_CodeSignature/CodeRequirements-1 framework/live/KSYMediaPlayer.framework/_CodeSignature/CodeSignature framework/live/KSYMediaPlayerDy.framework/KSYMediaPlayerDy framework/vod/KSYMediaPlayer.framework/KSYMediaPlayer framework/vod/KSYMediaPlayer.framework/_CodeSignature/CodeDirectory framework/vod/KSYMediaPlayer.framework/_CodeSignature/CodeRequirements-1 framework/vod/KSYMediaPlayer.framework/_CodeSignature/CodeSignature framework/vod/KSYMediaPlayerDy.framework/KSYMediaPlayerDy
ksvc · Jan 5, 2017 · 5c158a2 · 5c158a2
1 parent 9031365
commit 5c158a2
Show file tree

Hide file tree

Showing 52 changed files with 591 additions and 46 deletions.
diff --git a/KSYMediaPlayerDy_iOS.podspec b/KSYMediaPlayerDy_iOS.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |spec|
   spec.name         = 'KSYMediaPlayerDy_iOS'
-  spec.version      = '1.8.0'
+  spec.version      = '1.8.1'
   spec.license      = {
 :type => 'Proprietary',
 :text => <<-LICENSE
@@ -18,6 +18,6 @@ Pod::Spec.new do |spec|
   spec.requires_arc = true
   spec.frameworks   = 'VideoToolbox'
   spec.ios.library = 'z', 'iconv', 'stdc++.6'
-  spec.source = { :git => 'https://github.com/ksvc/KSYMediaPlayer_iOS.git', :tag => 'v1.8.0'}
+  spec.source = { :git => 'https://github.com/ksvc/KSYMediaPlayer_iOS.git', :tag => 'v1.8.1'}
   spec.vendored_frameworks = 'framework/live/KSYMediaPlayerDy.framework'
 end
diff --git a/KSYMediaPlayer_iOS.podspec b/KSYMediaPlayer_iOS.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |spec|
   spec.name         = 'KSYMediaPlayer_iOS'
-  spec.version      = '1.8.0'
+  spec.version      = '1.8.1'
   spec.license      = {
 :type => 'Proprietary',
 :text => <<-LICENSE
@@ -18,6 +18,6 @@ Pod::Spec.new do |spec|
   spec.requires_arc = true
   spec.frameworks   = 'VideoToolbox'
   spec.ios.library = 'z', 'iconv', 'stdc++.6'
-  spec.source = { :git => 'https://github.com/ksvc/KSYMediaPlayer_iOS.git', :tag => 'v1.8.0'}
+  spec.source = { :git => 'https://github.com/ksvc/KSYMediaPlayer_iOS.git', :tag => 'v1.8.1'}
   spec.vendored_frameworks = 'framework/live/KSYMediaPlayer.framework'
 end
diff --git a/demo/KSYPlayerDemo/KSYPlayerVC.m b/demo/KSYPlayerDemo/KSYPlayerVC.m
@@ -499,6 +499,7 @@ - (void)initPlayerWithURL:(NSURL *)aURL {
     _player.shouldMute = shouldMute;
     _player.shouldEnableKSYStatModule = TRUE;
     _player.shouldLoop = NO;
+    _player.deinterlaceMode = MPMovieVideoDeinterlaceMode_Auto;
     [_player setTimeout:10 readTimeout:60];
 
     NSKeyValueObservingOptions opts = NSKeyValueObservingOptionNew;
@@ -553,7 +554,7 @@ - (IBAction)onPlayVideo:(id)sender {
 
 - (IBAction)onReloadVideo:(id)sender {
     if (_player) {
-        [_player reload:_reloadUrl];
+        [_player reload:_reloadUrl flush:YES mode:MPMovieReloadMode_Accurate];
     }
 }
 

diff --git a/doc/docset-installed.txt b/doc/docset-installed.txt
@@ -1,4 +1,4 @@
 Documentation set was installed to Xcode!
 
 Path: /Users/shixuemei1/Library/Developer/Shared/Documentation/DocSets/com.ksyun.KSYLive_iOS.docset
-Time: 2016-09-14 13:27:47 +0000
+Time: 2016-09-21 10:23:21 +0000
diff --git a/doc/docset/Contents/Resources/Documents/Blocks/KSYPlyAudioDataBlock.html b/doc/docset/Contents/Resources/Documents/Blocks/KSYPlyAudioDataBlock.html
@@ -112,7 +112,7 @@ <h4 class="method-subtitle">Declared In</h4>
 				<footer>
 					<div class="footer-copyright">
 
-						<p class="copyright">Copyright &copy; 2016 Kingsoft. All rights reserved. Updated: 2016-09-14</p>
+						<p class="copyright">Copyright &copy; 2016 Kingsoft. All rights reserved. Updated: 2016-09-21</p>
 
 
 						<p class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1334)</a>.</p>

diff --git a/doc/docset/Contents/Resources/Documents/Blocks/KSYPlyVideoDataBlock.html b/doc/docset/Contents/Resources/Documents/Blocks/KSYPlyVideoDataBlock.html
@@ -112,7 +112,7 @@ <h4 class="method-subtitle">Declared In</h4>
 				<footer>
 					<div class="footer-copyright">
 
-						<p class="copyright">Copyright &copy; 2016 Kingsoft. All rights reserved. Updated: 2016-09-14</p>
+						<p class="copyright">Copyright &copy; 2016 Kingsoft. All rights reserved. Updated: 2016-09-21</p>
 
 
 						<p class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1334)</a>.</p>

diff --git a/doc/docset/Contents/Resources/Documents/Classes/KSYAudioInfo.html b/doc/docset/Contents/Resources/Documents/Classes/KSYAudioInfo.html
@@ -425,7 +425,7 @@ <h4 class="method-subtitle">Declared In</h4>
 				<footer>
 					<div class="footer-copyright">
 
-						<p class="copyright">Copyright &copy; 2016 Kingsoft. All rights reserved. Updated: 2016-09-14</p>
+						<p class="copyright">Copyright &copy; 2016 Kingsoft. All rights reserved. Updated: 2016-09-21</p>
 
 
 						<p class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1334)</a>.</p>

diff --git a/doc/docset/Contents/Resources/Documents/Classes/KSYMediaInfo.html b/doc/docset/Contents/Resources/Documents/Classes/KSYMediaInfo.html
@@ -296,7 +296,7 @@ <h4 class="method-subtitle">Declared In</h4>
 				<footer>
 					<div class="footer-copyright">
 
-						<p class="copyright">Copyright &copy; 2016 Kingsoft. All rights reserved. Updated: 2016-09-14</p>
+						<p class="copyright">Copyright &copy; 2016 Kingsoft. All rights reserved. Updated: 2016-09-21</p>
 
 
 						<p class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1334)</a>.</p>

diff --git a/doc/docset/Contents/Resources/Documents/Classes/KSYMediaInfoProber.html b/doc/docset/Contents/Resources/Documents/Classes/KSYMediaInfoProber.html
@@ -529,7 +529,7 @@ <h4 class="method-subtitle">Declared In</h4>
 				<footer>
 					<div class="footer-copyright">
 
-						<p class="copyright">Copyright &copy; 2016 Kingsoft. All rights reserved. Updated: 2016-09-14</p>
+						<p class="copyright">Copyright &copy; 2016 Kingsoft. All rights reserved. Updated: 2016-09-21</p>
 
 
 						<p class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1334)</a>.</p>

diff --git a/doc/docset/Contents/Resources/Documents/Classes/KSYMoviePlayerController.html b/doc/docset/Contents/Resources/Documents/Classes/KSYMoviePlayerController.html
@@ -72,6 +72,8 @@ <h1 id="library-title">
 
 		<option value="//api/name/controlStyle">controlStyle</option>
 
+		<option value="//api/name/deinterlaceMode">deinterlaceMode</option>
+
 		<option value="//api/name/duration">duration</option>
 
 		<option value="//api/name/loadState">loadState</option>
@@ -1929,6 +1931,57 @@ <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">KSYMoviePlayerController.h</code></p>
+			</div>
+
+
+		</div>
+	</div>
+</div><div class="section-method">
+	<a name="//api/name/deinterlaceMode" title="deinterlaceMode"></a>
+	<h3 class="method-title"><code><a href="#//api/name/deinterlaceMode">&nbsp;&nbsp;deinterlaceMode</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) MPMovieVideoDeinterlaceMode deinterlaceMode</code></div>
+
+
+
+
+
+
+
+			<div class="method-subsection availability">
+				<h4 class="method-subtitle parameter-title">Availability</h4>
+				<p>Available in KSYMoviePlayerController 1.7.2 and later.</p>
+			</div>
+
+
+
+			<div class="method-subsection discussion-section">
+				<h4 class="method-subtitle">Discussion</h4>
+				<p>默认不进行反交错处理</p><div class="warning"><p><strong>Warning:</strong> 该方法由金山云引入，不是原生系统接口</p></div>
+			</div>
+
+
+
+
+
+
+
 			<div class="method-subsection declared-in-section">
 				<h4 class="method-subtitle">Declared In</h4>
 				<p><code class="declared-in-ref">KSYMoviePlayerController.h</code></p>
@@ -2738,7 +2791,7 @@ <h4 class="method-subtitle">Declared In</h4>
 				<footer>
 					<div class="footer-copyright">
 
-						<p class="copyright">Copyright &copy; 2016 Kingsoft. All rights reserved. Updated: 2016-09-14</p>
+						<p class="copyright">Copyright &copy; 2016 Kingsoft. All rights reserved. Updated: 2016-09-21</p>
 
 
 						<p class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1334)</a>.</p>

diff --git a/doc/docset/Contents/Resources/Documents/Classes/KSYQosInfo.html b/doc/docset/Contents/Resources/Documents/Classes/KSYQosInfo.html
@@ -520,7 +520,7 @@ <h4 class="method-subtitle">Declared In</h4>
 				<footer>
 					<div class="footer-copyright">
 
-						<p class="copyright">Copyright &copy; 2016 Kingsoft. All rights reserved. Updated: 2016-09-14</p>
+						<p class="copyright">Copyright &copy; 2016 Kingsoft. All rights reserved. Updated: 2016-09-21</p>
 
 
 						<p class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1334)</a>.</p>

diff --git a/doc/docset/Contents/Resources/Documents/Classes/KSYVideoInfo.html b/doc/docset/Contents/Resources/Documents/Classes/KSYVideoInfo.html
@@ -253,7 +253,7 @@ <h4 class="method-subtitle">Declared In</h4>
 				<footer>
 					<div class="footer-copyright">
 
-						<p class="copyright">Copyright &copy; 2016 Kingsoft. All rights reserved. Updated: 2016-09-14</p>
+						<p class="copyright">Copyright &copy; 2016 Kingsoft. All rights reserved. Updated: 2016-09-21</p>
 
 
 						<p class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1334)</a>.</p>

diff --git a/doc/docset/Contents/Resources/Documents/Constants/KSYMPErrorCode.html b/doc/docset/Contents/Resources/Documents/Constants/KSYMPErrorCode.html
@@ -482,7 +482,7 @@ <h4 class="method-subtitle">Declared In</h4>
 				<footer>
 					<div class="footer-copyright">
 
-						<p class="copyright">Copyright &copy; 2016 Kingsoft. All rights reserved. Updated: 2016-09-14</p>
+						<p class="copyright">Copyright &copy; 2016 Kingsoft. All rights reserved. Updated: 2016-09-21</p>
 
 
 						<p class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1334)</a>.</p>

diff --git a/doc/docset/Contents/Resources/Documents/Constants/MEDIAINFO_CODEC_ID.html b/doc/docset/Contents/Resources/Documents/Constants/MEDIAINFO_CODEC_ID.html
@@ -406,7 +406,7 @@ <h4 class="method-subtitle">Declared In</h4>
 				<footer>
 					<div class="footer-copyright">
 
-						<p class="copyright">Copyright &copy; 2016 Kingsoft. All rights reserved. Updated: 2016-09-14</p>
+						<p class="copyright">Copyright &copy; 2016 Kingsoft. All rights reserved. Updated: 2016-09-21</p>
 
 
 						<p class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1334)</a>.</p>

diff --git a/doc/docset/Contents/Resources/Documents/Constants/MEDIAINFO_MUX_TYPE.html b/doc/docset/Contents/Resources/Documents/Constants/MEDIAINFO_MUX_TYPE.html
@@ -368,7 +368,7 @@ <h4 class="method-subtitle">Declared In</h4>
 				<footer>
 					<div class="footer-copyright">
 
-						<p class="copyright">Copyright &copy; 2016 Kingsoft. All rights reserved. Updated: 2016-09-14</p>
+						<p class="copyright">Copyright &copy; 2016 Kingsoft. All rights reserved. Updated: 2016-09-21</p>
 
 
 						<p class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1334)</a>.</p>

diff --git a/doc/docset/Contents/Resources/Documents/Constants/MEDIAINFO_SAMPLE_FMT.html b/doc/docset/Contents/Resources/Documents/Constants/MEDIAINFO_SAMPLE_FMT.html
@@ -349,7 +349,7 @@ <h4 class="method-subtitle">Declared In</h4>
 				<footer>
 					<div class="footer-copyright">
 
-						<p class="copyright">Copyright &copy; 2016 Kingsoft. All rights reserved. Updated: 2016-09-14</p>
+						<p class="copyright">Copyright &copy; 2016 Kingsoft. All rights reserved. Updated: 2016-09-21</p>
 
 
 						<p class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1334)</a>.</p>

diff --git a/doc/docset/Contents/Resources/Documents/Constants/MPMovieReloadMode.html b/doc/docset/Contents/Resources/Documents/Constants/MPMovieReloadMode.html
@@ -159,7 +159,7 @@ <h4 class="method-subtitle">Declared In</h4>
 				<footer>
 					<div class="footer-copyright">
 
-						<p class="copyright">Copyright &copy; 2016 Kingsoft. All rights reserved. Updated: 2016-09-14</p>
+						<p class="copyright">Copyright &copy; 2016 Kingsoft. All rights reserved. Updated: 2016-09-21</p>
 
 
 						<p class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1334)</a>.</p>

diff --git a/doc/docset/Contents/Resources/Documents/Constants/MPMovieStatus.html b/doc/docset/Contents/Resources/Documents/Constants/MPMovieStatus.html
@@ -197,7 +197,7 @@ <h4 class="method-subtitle">Declared In</h4>
 				<footer>
 					<div class="footer-copyright">
 
-						<p class="copyright">Copyright &copy; 2016 Kingsoft. All rights reserved. Updated: 2016-09-14</p>
+						<p class="copyright">Copyright &copy; 2016 Kingsoft. All rights reserved. Updated: 2016-09-21</p>
 
 
 						<p class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1334)</a>.</p>

diff --git a/doc/docset/Contents/Resources/Documents/Constants/MPMovieVideoDecoderMode.html b/doc/docset/Contents/Resources/Documents/Constants/MPMovieVideoDecoderMode.html
@@ -178,7 +178,7 @@ <h4 class="method-subtitle">Declared In</h4>
 				<footer>
 					<div class="footer-copyright">
 
-						<p class="copyright">Copyright &copy; 2016 Kingsoft. All rights reserved. Updated: 2016-09-14</p>
+						<p class="copyright">Copyright &copy; 2016 Kingsoft. All rights reserved. Updated: 2016-09-21</p>
 
 
 						<p class="generator">Generated by <a href="http://appledoc.gentlebytes.com">appledoc 2.2.1 (build 1334)</a>.</p>