Release 3.2.5

- 为区分是用户调用的暂停, 还是开发者暂停的, 增加了`isUserPaused` 标识及`pauseForUser`方法, 当调用`pauseForUser`时, `isUserPaused`将返回 YES - 添加水印层, 现在可以显示自定义的水印了 - 修复切换至ijkplayer内存未释放的问题
changsanjiang · Jun 13, 2020 · 44f1146 · 44f1146
1 parent e9fcad0
commit 44f1146
Show file tree

Hide file tree

Showing 1,132 changed files with 46,100 additions and 62,162 deletions.
diff --git a/Example/.DS_Store b/Example/.DS_Store
diff --git a/Example/1 ObjC Example/SJVideoPlayerExample-ObjC/Podfile b/Example/1 ObjC Example/SJVideoPlayerExample-ObjC/Podfile
diff --git a/Example/1 ObjC Example/SJVideoPlayerExample-ObjC/Podfile.lock b/Example/1 ObjC Example/SJVideoPlayerExample-ObjC/Podfile.lock
diff --git a/...C Example/SJVideoPlayerExample-ObjC/Pods/Headers/Private/Masonry/MASCompositeConstraint.h b/...C Example/SJVideoPlayerExample-ObjC/Pods/Headers/Private/Masonry/MASCompositeConstraint.h
diff --git a/...jC Example/SJVideoPlayerExample-ObjC/Pods/Headers/Private/Masonry/MASConstraint+Private.h b/...jC Example/SJVideoPlayerExample-ObjC/Pods/Headers/Private/Masonry/MASConstraint+Private.h
diff --git a/...ple/1 ObjC Example/SJVideoPlayerExample-ObjC/Pods/Headers/Private/Masonry/MASConstraint.h b/...ple/1 ObjC Example/SJVideoPlayerExample-ObjC/Pods/Headers/Private/Masonry/MASConstraint.h
diff --git a/... ObjC Example/SJVideoPlayerExample-ObjC/Pods/Headers/Private/Masonry/MASConstraintMaker.h b/... ObjC Example/SJVideoPlayerExample-ObjC/Pods/Headers/Private/Masonry/MASConstraintMaker.h
diff --git a/...ObjC Example/SJVideoPlayerExample-ObjC/Pods/Headers/Private/Masonry/MASLayoutConstraint.h b/...ObjC Example/SJVideoPlayerExample-ObjC/Pods/Headers/Private/Masonry/MASLayoutConstraint.h
diff --git a/Example/1 ObjC Example/SJVideoPlayerExample-ObjC/Pods/Headers/Private/Masonry/MASUtilities.h b/Example/1 ObjC Example/SJVideoPlayerExample-ObjC/Pods/Headers/Private/Masonry/MASUtilities.h
diff --git a/.../1 ObjC Example/SJVideoPlayerExample-ObjC/Pods/Headers/Private/Masonry/MASViewAttribute.h b/.../1 ObjC Example/SJVideoPlayerExample-ObjC/Pods/Headers/Private/Masonry/MASViewAttribute.h
diff --git a/...1 ObjC Example/SJVideoPlayerExample-ObjC/Pods/Headers/Private/Masonry/MASViewConstraint.h b/...1 ObjC Example/SJVideoPlayerExample-ObjC/Pods/Headers/Private/Masonry/MASViewConstraint.h
diff --git a/Example/1 ObjC Example/SJVideoPlayerExample-ObjC/Pods/Headers/Private/Masonry/Masonry.h b/Example/1 ObjC Example/SJVideoPlayerExample-ObjC/Pods/Headers/Private/Masonry/Masonry.h
diff --git a/...bjC Example/SJVideoPlayerExample-ObjC/Pods/Headers/Private/Masonry/NSArray+MASAdditions.h b/...bjC Example/SJVideoPlayerExample-ObjC/Pods/Headers/Private/Masonry/NSArray+MASAdditions.h
diff --git a/...le/SJVideoPlayerExample-ObjC/Pods/Headers/Private/Masonry/NSArray+MASShorthandAdditions.h b/...le/SJVideoPlayerExample-ObjC/Pods/Headers/Private/Masonry/NSArray+MASShorthandAdditions.h
diff --git a/...deoPlayerExample-ObjC/Pods/Headers/Private/Masonry/NSLayoutConstraint+MASDebugAdditions.h b/...deoPlayerExample-ObjC/Pods/Headers/Private/Masonry/NSLayoutConstraint+MASDebugAdditions.h
diff --git a/...1 ObjC Example/SJVideoPlayerExample-ObjC/Pods/Headers/Private/Masonry/View+MASAdditions.h b/...1 ObjC Example/SJVideoPlayerExample-ObjC/Pods/Headers/Private/Masonry/View+MASAdditions.h
diff --git a/...ample/SJVideoPlayerExample-ObjC/Pods/Headers/Private/Masonry/View+MASShorthandAdditions.h b/...ample/SJVideoPlayerExample-ObjC/Pods/Headers/Private/Masonry/View+MASShorthandAdditions.h
diff --git a/...mple/SJVideoPlayerExample-ObjC/Pods/Headers/Private/Masonry/ViewController+MASAdditions.h b/...mple/SJVideoPlayerExample-ObjC/Pods/Headers/Private/Masonry/ViewController+MASAdditions.h
diff --git a/...1 ObjC Example/SJVideoPlayerExample-ObjC/Pods/Headers/Private/Reachability/Reachability.h b/...1 ObjC Example/SJVideoPlayerExample-ObjC/Pods/Headers/Private/Reachability/Reachability.h
diff --git a/...JVideoPlayerExample-ObjC/Pods/Headers/Private/SJBaseVideoPlayer/AVAsset+SJAVMediaExport.h b/...JVideoPlayerExample-ObjC/Pods/Headers/Private/SJBaseVideoPlayer/AVAsset+SJAVMediaExport.h
diff --git a/...ple/SJVideoPlayerExample-ObjC/Pods/Headers/Private/SJBaseVideoPlayer/NSTimer+SJAssetAdd.h b/...ple/SJVideoPlayerExample-ObjC/Pods/Headers/Private/SJBaseVideoPlayer/NSTimer+SJAssetAdd.h
diff --git a/...Example/SJVideoPlayerExample-ObjC/Pods/Headers/Private/SJBaseVideoPlayer/SJAVBasePlayer.h b/...Example/SJVideoPlayerExample-ObjC/Pods/Headers/Private/SJBaseVideoPlayer/SJAVBasePlayer.h
diff --git a/...ideoPlayerExample-ObjC/Pods/Headers/Private/SJBaseVideoPlayer/SJAVMediaDefinitionLoader.h b/...ideoPlayerExample-ObjC/Pods/Headers/Private/SJBaseVideoPlayer/SJAVMediaDefinitionLoader.h
diff --git a/...SJVideoPlayerExample-ObjC/Pods/Headers/Private/SJBaseVideoPlayer/SJAVMediaMainPresenter.h b/...SJVideoPlayerExample-ObjC/Pods/Headers/Private/SJBaseVideoPlayer/SJAVMediaMainPresenter.h
diff --git a/...eoPlayerExample-ObjC/Pods/Headers/Private/SJBaseVideoPlayer/SJAVMediaPlaybackController.h b/...eoPlayerExample-ObjC/Pods/Headers/Private/SJBaseVideoPlayer/SJAVMediaPlaybackController.h
diff --git a/...xample/SJVideoPlayerExample-ObjC/Pods/Headers/Private/SJBaseVideoPlayer/SJAVMediaPlayer.h b/...xample/SJVideoPlayerExample-ObjC/Pods/Headers/Private/SJBaseVideoPlayer/SJAVMediaPlayer.h
diff --git a/.../SJVideoPlayerExample-ObjC/Pods/Headers/Private/SJBaseVideoPlayer/SJAVMediaPlayerLoader.h b/.../SJVideoPlayerExample-ObjC/Pods/Headers/Private/SJBaseVideoPlayer/SJAVMediaPlayerLoader.h
diff --git a/...ideoPlayerExample-ObjC/Pods/Headers/Private/SJBaseVideoPlayer/SJBaseVideoPlayer+TestLog.h b/...ideoPlayerExample-ObjC/Pods/Headers/Private/SJBaseVideoPlayer/SJBaseVideoPlayer+TestLog.h
diff --git a/...mple/SJVideoPlayerExample-ObjC/Pods/Headers/Private/SJBaseVideoPlayer/SJBaseVideoPlayer.h b/...mple/SJVideoPlayerExample-ObjC/Pods/Headers/Private/SJBaseVideoPlayer/SJBaseVideoPlayer.h
diff --git a/...SJVideoPlayerExample-ObjC/Pods/Headers/Private/SJBaseVideoPlayer/SJBaseVideoPlayerConst.h b/...SJVideoPlayerExample-ObjC/Pods/Headers/Private/SJBaseVideoPlayer/SJBaseVideoPlayerConst.h
diff --git a/...oPlayerExample-ObjC/Pods/Headers/Private/SJBaseVideoPlayer/SJBaseVideoPlayerObservation.h b/...oPlayerExample-ObjC/Pods/Headers/Private/SJBaseVideoPlayer/SJBaseVideoPlayerObservation.h
diff --git a/...rExample-ObjC/Pods/Headers/Private/SJBaseVideoPlayer/SJControlLayerAppearManagerDefines.h b/...rExample-ObjC/Pods/Headers/Private/SJBaseVideoPlayer/SJControlLayerAppearManagerDefines.h
diff --git a/...yerExample-ObjC/Pods/Headers/Private/SJBaseVideoPlayer/SJControlLayerAppearStateManager.h b/...yerExample-ObjC/Pods/Headers/Private/SJBaseVideoPlayer/SJControlLayerAppearStateManager.h
diff --git a/...VideoPlayerExample-ObjC/Pods/Headers/Private/SJBaseVideoPlayer/SJDeviceOutputPromptView.h b/...VideoPlayerExample-ObjC/Pods/Headers/Private/SJBaseVideoPlayer/SJDeviceOutputPromptView.h
diff --git a/...rExample-ObjC/Pods/Headers/Private/SJBaseVideoPlayer/SJDeviceVolumeAndBrightnessManager.h b/...rExample-ObjC/Pods/Headers/Private/SJBaseVideoPlayer/SJDeviceVolumeAndBrightnessManager.h
diff --git a/...e-ObjC/Pods/Headers/Private/SJBaseVideoPlayer/SJDeviceVolumeAndBrightnessManagerDefines.h b/...e-ObjC/Pods/Headers/Private/SJBaseVideoPlayer/SJDeviceVolumeAndBrightnessManagerDefines.h
diff --git a/...Pods/Headers/Private/SJBaseVideoPlayer/SJDeviceVolumeAndBrightnessManagerResourceLoader.h b/...Pods/Headers/Private/SJBaseVideoPlayer/SJDeviceVolumeAndBrightnessManagerResourceLoader.h
diff --git a/...ayerExample-ObjC/Pods/Headers/Private/SJBaseVideoPlayer/SJEdgeFastForwardViewController.h b/...ayerExample-ObjC/Pods/Headers/Private/SJBaseVideoPlayer/SJEdgeFastForwardViewController.h
diff --git a/...mple-ObjC/Pods/Headers/Private/SJBaseVideoPlayer/SJEdgeFastForwardViewControllerDefines.h b/...mple-ObjC/Pods/Headers/Private/SJBaseVideoPlayer/SJEdgeFastForwardViewControllerDefines.h
diff --git a/...e/SJVideoPlayerExample-ObjC/Pods/Headers/Private/SJBaseVideoPlayer/SJFitOnScreenManager.h b/...e/SJVideoPlayerExample-ObjC/Pods/Headers/Private/SJBaseVideoPlayer/SJFitOnScreenManager.h
diff --git a/...eoPlayerExample-ObjC/Pods/Headers/Private/SJBaseVideoPlayer/SJFitOnScreenManagerDefines.h b/...eoPlayerExample-ObjC/Pods/Headers/Private/SJBaseVideoPlayer/SJFitOnScreenManagerDefines.h
diff --git a/...JVideoPlayerExample-ObjC/Pods/Headers/Private/SJBaseVideoPlayer/SJFlipTransitionManager.h b/...JVideoPlayerExample-ObjC/Pods/Headers/Private/SJBaseVideoPlayer/SJFlipTransitionManager.h
diff --git a/...layerExample-ObjC/Pods/Headers/Private/SJBaseVideoPlayer/SJFlipTransitionManagerDefines.h b/...layerExample-ObjC/Pods/Headers/Private/SJBaseVideoPlayer/SJFlipTransitionManagerDefines.h
diff --git a/...deoPlayerExample-ObjC/Pods/Headers/Private/SJBaseVideoPlayer/SJFloatSmallViewController.h b/...deoPlayerExample-ObjC/Pods/Headers/Private/SJBaseVideoPlayer/SJFloatSmallViewController.h
diff --git a/...erExample-ObjC/Pods/Headers/Private/SJBaseVideoPlayer/SJFloatSmallViewControllerDefines.h b/...erExample-ObjC/Pods/Headers/Private/SJBaseVideoPlayer/SJFloatSmallViewControllerDefines.h
diff --git a/...C Example/SJVideoPlayerExample-ObjC/Pods/Headers/Private/SJBaseVideoPlayer/SJIsAppeared.h b/...C Example/SJVideoPlayerExample-ObjC/Pods/Headers/Private/SJBaseVideoPlayer/SJIsAppeared.h
diff --git a/...jC Example/SJVideoPlayerExample-ObjC/Pods/Headers/Private/SJBaseVideoPlayer/SJPlayModel.h b/...jC Example/SJVideoPlayerExample-ObjC/Pods/Headers/Private/SJBaseVideoPlayer/SJPlayModel.h
diff --git a/...PlayerExample-ObjC/Pods/Headers/Private/SJBaseVideoPlayer/SJPlayModelPropertiesObserver.h b/...PlayerExample-ObjC/Pods/Headers/Private/SJBaseVideoPlayer/SJPlayModelPropertiesObserver.h
diff --git a/...SJVideoPlayerExample-ObjC/Pods/Headers/Private/SJBaseVideoPlayer/SJPlayerAutoplayConfig.h b/...SJVideoPlayerExample-ObjC/Pods/Headers/Private/SJBaseVideoPlayer/SJPlayerAutoplayConfig.h
diff --git a/...PlayerExample-ObjC/Pods/Headers/Private/SJBaseVideoPlayer/SJPlayerGestureControlDefines.h b/...PlayerExample-ObjC/Pods/Headers/Private/SJBaseVideoPlayer/SJPlayerGestureControlDefines.h
diff --git a/...C Example/SJVideoPlayerExample-ObjC/Pods/Headers/Private/SJBaseVideoPlayer/SJPlayerView.h b/...C Example/SJVideoPlayerExample-ObjC/Pods/Headers/Private/SJBaseVideoPlayer/SJPlayerView.h