Merge pull request #98 from newrelic/develop

Merge develop to master - SDK 34, media3 1.2.0, bitrate fix

Author: divyalatha-ks

NRExoPlayerTracker/build.gradle

@@ -4,7 +4,8 @@ plugins {
 }
 android {
     compileSdkVersion 34
-     buildToolsVersion "34.0.0"
+    buildToolsVersion "34.0.0"
+
     defaultConfig {
         minSdkVersion 16
         targetSdkVersion 34
@@ -37,7 +38,7 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'com.google.android.material:material:1.2.1'
     implementation project(path: ':NewRelicVideoCore')
-    implementation 'androidx.media3:media3-exoplayer:1.1.0'
+    implementation 'androidx.media3:media3-exoplayer:1.2.0'
     testImplementation 'junit:junit:4.13.2'
     testImplementation 'org.robolectric:robolectric:4.10.3'
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'

NRExoPlayerTracker/src/main/java/com/newrelic/videoagent/exoplayer/tracker/NRTrackerExoPlayer.java

@@ -676,8 +676,10 @@ public void onLoadCompleted(@NonNull EventTime eventTime, @NonNull LoadEventInfo
         if (mediaLoadData.dataType == C.DATA_TYPE_MEDIA
                 && mediaLoadData.trackType == C.TRACK_TYPE_VIDEO
                 && loadEventInfo.loadDurationMs > 0) {
-            // Calculate the bitrate for this specific chunk in bits per second
-            this.actualBitrate = (loadEventInfo.bytesLoaded * 8 * 1000) / loadEventInfo.loadDurationMs;
+            // Use actual video bitrate from player's video format instead of download speed
+            if (player != null && player.getVideoFormat() != null && player.getVideoFormat().bitrate != C.INDEX_UNSET) {
+                this.actualBitrate = player.getVideoFormat().bitrate;
+            }
         }
     }
 

NRIMATracker/build.gradle

@@ -4,7 +4,8 @@ plugins {
 }
 android {
     compileSdkVersion 34
-     buildToolsVersion "34.0.0"
+    buildToolsVersion "34.0.0"
+
     defaultConfig {
         minSdkVersion 16
         targetSdkVersion 34
@@ -37,7 +38,7 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'com.google.android.material:material:1.3.0'
     implementation project(path: ':NewRelicVideoCore')
-    implementation 'androidx.media3:media3-exoplayer-ima:1.1.0'
+    implementation 'androidx.media3:media3-exoplayer-ima:1.2.0'
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'

NewRelicVideoCore/build.gradle

@@ -37,8 +37,8 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.1.0'
     implementation 'com.google.android.material:material:1.1.0'
     implementation 'com.newrelic.agent.android:android-agent:7.6.3'
-    implementation 'androidx.media3:media3-exoplayer:1.1.0'
-    implementation 'androidx.media3:media3-exoplayer-ima:1.1.0'
+    implementation 'androidx.media3:media3-exoplayer:1.2.0'
+    implementation 'androidx.media3:media3-exoplayer-ima:1.2.0'
 
     // Add androidx.leanback for accurate Android TV detection
 //    implementation 'androidx.leanback:leanback:1.0.0'

app/build.gradle

@@ -65,10 +65,10 @@ dependencies {
     androidTestImplementation 'androidx.test:runner:1.5.2'
     androidTestImplementation 'androidx.test:rules:1.5.0'
 
-    implementation 'androidx.media3:media3-exoplayer:1.1.0'
-    implementation 'androidx.media3:media3-ui:1.1.0'
-    implementation 'androidx.media3:media3-exoplayer-ima:1.1.0'
-    implementation 'androidx.media3:media3-exoplayer-dash:1.1.0'
+    implementation 'androidx.media3:media3-exoplayer:1.2.0'
+    implementation 'androidx.media3:media3-ui:1.2.0'
+    implementation 'androidx.media3:media3-exoplayer-ima:1.2.0'
+    implementation 'androidx.media3:media3-exoplayer-dash:1.2.0'
 
     implementation 'com.android.support:multidex:1.0.3'
 }