Merge pull request #46 from sadhana-newrelic/NR-435627-actual-bitrate

fix: Addition of actual bitrate in attributes

Author: rajeevkumar-nr

NRExoPlayerTracker/build.gradle

@@ -8,7 +8,7 @@ android {
         minSdkVersion 16
         targetSdkVersion 33
         versionCode 6
-        versionName "3.0.2"
+        versionName "3.0.3"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
     }

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

@@ -24,6 +24,7 @@
 import java.util.Map;
 
 import static com.newrelic.videoagent.core.NRDef.*;
+import androidx.media3.common.C;
 
 /**
  * New Relic Video tracker for ExoPlayer.
@@ -38,6 +39,7 @@ public class NRTrackerExoPlayer extends NRVideoTracker implements Player.Listene
     protected List<Uri> playlist;
     protected int lastWindow;
     protected String renditionChangeShift;
+    protected long actualBitrate;
 
     /**
      * Init a new ExoPlayer tracker.
@@ -145,6 +147,10 @@ public Long getBitrate() {
         return bitrateEstimate;
     }
 
+    public Long getActualBitrate() {
+        return actualBitrate;
+    }
+
     /**
      * Get rendition bitrate.
      *
@@ -324,6 +330,7 @@ private void resetState() {
         lastWindow = 0;
         lastWidth = 0;
         lastHeight = 0;
+        actualBitrate = 0;
     }
 
     /**
@@ -487,6 +494,16 @@ public void onLoadError(EventTime eventTime, LoadEventInfo loadEventInfo, MediaL
         sendError(error);
     }
 
+    @Override
+    public void onLoadCompleted(EventTime eventTime, LoadEventInfo loadEventInfo, MediaLoadData mediaLoadData) {
+        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;
+        }
+    }
+
     @Override
     public void onBandwidthEstimate(AnalyticsListener.EventTime eventTime, int totalLoadTimeMs, long totalBytesLoaded, long bitrateEstimate) {
         NRLog.d("onBandwidthEstimate analytics");

NRIMATracker/build.gradle

@@ -8,7 +8,7 @@ android {
         minSdkVersion 16
         targetSdkVersion 33
         versionCode 6
-        versionName "3.0.2"
+        versionName "3.0.3"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
     }

NewRelicVideoCore/build.gradle

@@ -8,7 +8,7 @@ android {
         minSdkVersion 16
         targetSdkVersion 33
         versionCode 9
-        versionName "3.0.2"
+        versionName "3.0.3"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
     }

NewRelicVideoCore/src/main/java/com/newrelic/videoagent/core/tracker/NRTracker.java

@@ -139,6 +139,10 @@ public boolean preSend(String action, Map<String, Object> attributes) {
      * @param attributes Event Type attributes for this action.
      */
     public void sendEvent(String eventType, String action, Map<String, Object> attributes) {
+        if (this instanceof NRVideoTracker) {
+            ((NRVideoTracker) this).updatePlaytime();
+        }
+
         if (attributes == null) {
             attributes = new HashMap<>();
         }

NewRelicVideoCore/src/main/java/com/newrelic/videoagent/core/tracker/NRVideoTracker.java

@@ -226,7 +226,8 @@ public Map<String, Object> getAttributes(String action, Map<String, Object> attr
             }
 
             attr.put("contentTitle", getTitle());
-            attr.put("contentBitrate", getBitrate());
+//            attr.put("contentBitrate", getBitrate());
+            attr.put("contentBitrate", getActualBitrate());
             attr.put("contentRenditionBitrate", getRenditionBitrate());
             attr.put("contentRenditionWidth", getRenditionWidth());
             attr.put("contentRenditionHeight", getRenditionHeight());
@@ -243,7 +244,7 @@ public Map<String, Object> getAttributes(String action, Map<String, Object> attr
         return attr;
     }
 
-    public void generatePlayElapsedTime() {
+    public void updatePlaytime() {
         if (playtimeSinceLastEventTimestamp > 0) {
             playtimeSinceLastEvent = System.currentTimeMillis() - playtimeSinceLastEventTimestamp;
             totalPlaytime += playtimeSinceLastEvent;
@@ -598,6 +599,10 @@ public Long getBitrate() {
         return null;
     }
 
+    public Long getActualBitrate(){
+        return null;
+    }
+
     /**
      * Get the video rendition bitrate.
      *