From 5c158a2b4d861bc672adafbed89a935eba8beb84 Mon Sep 17 00:00:00 2001 From: shixuemei Date: Sun, 18 Sep 2016 14:03:42 +0800 Subject: [PATCH] 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 --- KSYMediaPlayerDy_iOS.podspec | 4 +- KSYMediaPlayer_iOS.podspec | 4 +- demo/KSYPlayerDemo/KSYPlayerVC.m | 3 +- doc/docset-installed.txt | 2 +- .../Blocks/KSYPlyAudioDataBlock.html | 2 +- .../Blocks/KSYPlyVideoDataBlock.html | 2 +- .../Documents/Classes/KSYAudioInfo.html | 2 +- .../Documents/Classes/KSYMediaInfo.html | 2 +- .../Documents/Classes/KSYMediaInfoProber.html | 2 +- .../Classes/KSYMoviePlayerController.html | 55 +++++- .../Documents/Classes/KSYQosInfo.html | 2 +- .../Documents/Classes/KSYVideoInfo.html | 2 +- .../Documents/Constants/KSYMPErrorCode.html | 2 +- .../Constants/MEDIAINFO_CODEC_ID.html | 2 +- .../Constants/MEDIAINFO_MUX_TYPE.html | 2 +- .../Constants/MEDIAINFO_SAMPLE_FMT.html | 2 +- .../Constants/MPMovieReloadMode.html | 2 +- .../Documents/Constants/MPMovieStatus.html | 2 +- .../Constants/MPMovieVideoDecoderMode.html | 2 +- .../MPMovieVideoDeinterlaceMode.html | 175 ++++++++++++++++++ .../Documents/Protocols/KSYMediaPlayback.html | 2 +- .../Resources/Documents/hierarchy.html | 4 +- .../Contents/Resources/Documents/index.html | 4 +- doc/docset/Contents/Resources/Nodes.xml | 12 +- doc/docset/Contents/Resources/Tokens15.xml | 31 +++- doc/docset/Contents/Resources/Tokens17.xml | 9 + doc/docset/Contents/Resources/Tokens4.xml | 36 ++++ doc/docset/Contents/Resources/docSet.dsidx | Bin 253952 -> 253952 bytes .../Contents/Resources/docSet.dsidx-shm | Bin 32768 -> 32768 bytes .../Contents/Resources/docSet.dsidx-wal | Bin 1149512 -> 1219552 bytes doc/docset/Contents/Resources/docSet.skidx | Bin 53248 -> 61440 bytes doc/docset/Contents/Resources/docSet.toc | Bin 2295 -> 2358 bytes .../Contents/Resources/docSet.tokencache | Bin 41813 -> 45549 bytes doc/html/Blocks/KSYPlyAudioDataBlock.html | 2 +- doc/html/Blocks/KSYPlyVideoDataBlock.html | 2 +- doc/html/Classes/KSYAudioInfo.html | 2 +- doc/html/Classes/KSYMediaInfo.html | 2 +- doc/html/Classes/KSYMediaInfoProber.html | 2 +- .../Classes/KSYMoviePlayerController.html | 55 +++++- doc/html/Classes/KSYQosInfo.html | 2 +- doc/html/Classes/KSYVideoInfo.html | 2 +- doc/html/Constants/KSYMPErrorCode.html | 2 +- doc/html/Constants/MEDIAINFO_CODEC_ID.html | 2 +- doc/html/Constants/MEDIAINFO_MUX_TYPE.html | 2 +- doc/html/Constants/MEDIAINFO_SAMPLE_FMT.html | 2 +- doc/html/Constants/MPMovieReloadMode.html | 2 +- doc/html/Constants/MPMovieStatus.html | 2 +- .../Constants/MPMovieVideoDecoderMode.html | 2 +- .../MPMovieVideoDeinterlaceMode.html | 175 ++++++++++++++++++ doc/html/Protocols/KSYMediaPlayback.html | 2 +- doc/html/hierarchy.html | 4 +- doc/html/index.html | 4 +- 52 files changed, 591 insertions(+), 46 deletions(-) create mode 100644 doc/docset/Contents/Resources/Documents/Constants/MPMovieVideoDeinterlaceMode.html create mode 100644 doc/docset/Contents/Resources/Tokens17.xml create mode 100644 doc/html/Constants/MPMovieVideoDeinterlaceMode.html diff --git a/KSYMediaPlayerDy_iOS.podspec b/KSYMediaPlayerDy_iOS.podspec index cbbf7e8..2fe6c98 100644 --- 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 index ad1d5fc..9340dc3 100644 --- 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 index 0bbfb59..208ee8a 100644 --- 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 index 88e3156..91e8dca 100644 --- 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 \ No newline at end of file +Time: 2016-09-21 10:23:21 +0000 \ No newline at end of file diff --git a/doc/docset/Contents/Resources/Documents/Blocks/KSYPlyAudioDataBlock.html b/doc/docset/Contents/Resources/Documents/Blocks/KSYPlyAudioDataBlock.html index 1333554..45dd383 100644 --- a/doc/docset/Contents/Resources/Documents/Blocks/KSYPlyAudioDataBlock.html +++ b/doc/docset/Contents/Resources/Documents/Blocks/KSYPlyAudioDataBlock.html @@ -112,7 +112,7 @@

Declared In