Merge pull request #167 from novoda/use-event-listener-with-dash

Ensure DASH media sources report bitrate changes
novoda · Jul 6, 2018 · 43f1da8 · 43f1da8
2 parents e74f9c6 + 3395736
commit 43f1da8
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/core/build.gradle b/core/build.gradle
@@ -51,7 +51,7 @@ dependencies {
     implementation 'com.google.android.exoplayer:exoplayer:2.8.1'
 
     testImplementation 'junit:junit:4.12'
-    testImplementation 'org.mockito:mockito-core:2.16.0'
+    testImplementation 'org.mockito:mockito-core:2.19.0'
     testImplementation 'org.easytesting:fest-assert-core:2.0M10'
 }
 

diff --git a/.../src/main/java/com/novoda/noplayer/internal/exoplayer/mediasource/MediaSourceFactory.java b/.../src/main/java/com/novoda/noplayer/internal/exoplayer/mediasource/MediaSourceFactory.java
@@ -37,7 +37,7 @@ public MediaSource create(Options options,
             case H264:
                 return createH264MediaSource(defaultDataSourceFactory, uri, mediaSourceEventListener);
             case DASH:
-                return createDashMediaSource(defaultDataSourceFactory, uri);
+                return createDashMediaSource(defaultDataSourceFactory, uri, mediaSourceEventListener);
             default:
                 throw new UnsupportedOperationException("Content type: " + options + " is not supported.");
         }
@@ -64,9 +64,12 @@ private MediaSource createH264MediaSource(DefaultDataSourceFactory defaultDataSo
     }
 
     private MediaSource createDashMediaSource(DefaultDataSourceFactory defaultDataSourceFactory,
-                                              Uri uri) {
+                                              Uri uri,
+                                              MediaSourceEventListener mediaSourceEventListener) {
         DefaultDashChunkSource.Factory chunkSourceFactory = new DefaultDashChunkSource.Factory(defaultDataSourceFactory);
         DashMediaSource.Factory factory = new DashMediaSource.Factory(chunkSourceFactory, defaultDataSourceFactory);
-        return factory.createMediaSource(uri);
+        DashMediaSource mediaSource = factory.createMediaSource(uri);
+        mediaSource.addEventListener(handler, mediaSourceEventListener);
+        return mediaSource;
     }
 }
diff --git a/demo/build.gradle b/demo/build.gradle
@@ -23,5 +23,5 @@ dependencies {
     implementation 'com.android.support:appcompat-v7:27.1.1'
 
     testImplementation 'junit:junit:4.12'
-    testImplementation 'com.google.truth:truth:0.40'
+    testImplementation 'com.google.truth:truth:0.41'
 }