Merge pull request #27 from AAkira/dev/0.13.0

Release 0.13.0
AAkira · Jun 12, 2018 · 3b782c6 · 3b782c6
2 parents 034aae0 + 2423064
commit 3b782c6
Show file tree

Hide file tree

Showing 8 changed files with 112 additions and 245 deletions.
diff --git a/README.md b/README.md
@@ -40,7 +40,18 @@ This is written in Kotlin.
 // inject from xml
 val playerView: PlayerView by bindView(R.id.playerView)
 
-val playerManager: ExoPlayerManager = ExoPlayerManager(context) 
+val playerManager: ExoPlayerManager = ExoPlayerManager.Builder(context).run {
+            build(
+                    renderersFactory = createRenderersFactory(), // You can set your RenderersFactory
+                    loadControl = createDefaultLoadControl(      // You can set your LoadControl  
+                            minBufferMs = 15000,
+                            maxBufferMs = 50000,
+                            bufferForPlaybackMs = 2500,
+                            bufferForPlaybackAfterRebufferMs = 5000
+                    ),
+                    drmSessionManager = null                     // You can set your drmSessionManager 
+            )
+        }
 
 // inject PlayerView
 playerManager.injectView(playerView)
@@ -145,8 +156,8 @@ buildscript {
 }
 
 dependencies {
-	implementation 'com.github.aakira:exoplayer-manager:0.12.0@aar'
-	implementation 'com.github.aakira:exoplayer-manager-ima:0.12.0@aar' // if you use an IMA SDK
+	implementation 'com.github.aakira:exoplayer-manager:0.13.0@aar'
+	implementation 'com.github.aakira:exoplayer-manager-ima:0.13.0@aar' // if you use an IMA SDK
 }
 ```
 ## Using libraries

diff --git a/app/src/main/kotlin/com/github/aakira/playermanager/sample/AdActivity.kt b/app/src/main/kotlin/com/github/aakira/playermanager/sample/AdActivity.kt
@@ -27,7 +27,9 @@ class AdActivity : Activity() {
 
     private val adUiContainer: FrameLayout by bindView(R.id.adUiContainer)
     private val playerView: PlayerView by bindView(R.id.player_view)
-    private val playerManager: ExoPlayerManager by lazy(LazyThreadSafetyMode.NONE) { ExoPlayerManager(this) }
+    private val playerManager: ExoPlayerManager by lazy(LazyThreadSafetyMode.NONE) {
+        ExoPlayerManager.Builder(this).build()
+    }
     private val adPlayerController: AdPlayerController by lazy(LazyThreadSafetyMode.NONE) {
         AdPlayerController.Builder(
                 context = this,

diff --git a/app/src/main/kotlin/com/github/aakira/playermanager/sample/PlayerActivity.kt b/app/src/main/kotlin/com/github/aakira/playermanager/sample/PlayerActivity.kt
@@ -30,7 +30,17 @@ class PlayerActivity : Activity() {
     private val reconnectButton: Button by bindView(R.id.reconnectButton)
     private val stopButton: Button by bindView(R.id.stopButton)
 
-    private val playerManager: ExoPlayerManager by lazy(LazyThreadSafetyMode.NONE) { ExoPlayerManager(this) }
+    private val playerManager: ExoPlayerManager by lazy(LazyThreadSafetyMode.NONE) {
+        ExoPlayerManager.Builder(this).run {
+            build(
+                    renderersFactory = createRenderersFactory(),
+                    loadControl = createDefaultLoadControl(
+                            minBufferMs = 15000,
+                            maxBufferMs = 50000
+                    )
+            )
+        }
+    }
 
     public override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)

diff --git a/build.gradle b/build.gradle
@@ -3,8 +3,8 @@
 buildscript {
 
     // This library version
-    ext.LIBRARY_VERSION_CODE = 12
-    ext.LIBRARY_VERSION_NAME = "0.12.0"
+    ext.LIBRARY_VERSION_CODE = 13
+    ext.LIBRARY_VERSION_NAME = "0.13.0"
 
     // App information
     ext.COMPILE_SDK_VERSION = 27

diff --git a/ima/src/main/kotlin/com/github/aakira/playermanager/ima/AdPlayerController.kt b/ima/src/main/kotlin/com/github/aakira/playermanager/ima/AdPlayerController.kt
@@ -39,7 +39,7 @@ class AdPlayerController private constructor(
             val companionHeight: Int = 0
     ) {
         fun create(): AdPlayerController {
-            val playerManager = playerManager ?: ExoPlayerManager(context)
+            val playerManager = playerManager ?: ExoPlayerManager.Builder(context).build()
             playerManager.injectView(playerView)
             val sdkFactory: ImaSdkFactory = ImaSdkFactory.getInstance()
             return AdPlayerController(context, language, userAgent,

diff --git a/playermanager/src/main/java/com/github/aakira/playermanager/LimitBandwidthMeter.java b/playermanager/src/main/java/com/github/aakira/playermanager/LimitBandwidthMeter.java