Merge pull request #10 from mirego/task/update-exo-2.17.0

Update agent to track events from ExoPlayer 2.17.0

Author: asllop

NRExoPlayerTracker/build.gradle

@@ -3,13 +3,13 @@ plugins {
 }
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 31
 
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 29
+        targetSdkVersion 30
         versionCode 1
-        versionName "0.99.1"
+        versionName "0.99.6"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
@@ -40,8 +40,8 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'com.google.android.material:material:1.2.1'
     implementation project(path: ':NewRelicVideoCore')
-    implementation 'com.google.android.exoplayer:exoplayer:+'
+    implementation 'com.google.android.exoplayer:exoplayer:2.17.0'
     testImplementation 'junit:junit:4.+'
     androidTestImplementation 'androidx.test.ext:junit:1.1.2'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
-}
+}

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

@@ -1,14 +1,16 @@
 package com.newrelic.videoagent.exoplayer.tracker;
 
 import android.net.Uri;
-import com.google.android.exoplayer2.ExoPlaybackException;
+
+import com.google.android.exoplayer2.ExoPlayer;
+import com.google.android.exoplayer2.PlaybackException;
 import com.google.android.exoplayer2.Player;
 import com.google.android.exoplayer2.SimpleExoPlayer;
+import com.google.android.exoplayer2.TracksInfo;
 import com.google.android.exoplayer2.analytics.AnalyticsListener;
 import com.google.android.exoplayer2.source.LoadEventInfo;
 import com.google.android.exoplayer2.source.MediaLoadData;
-import com.google.android.exoplayer2.source.TrackGroupArray;
-import com.google.android.exoplayer2.trackselection.TrackSelectionArray;
+import com.google.android.exoplayer2.video.VideoSize;
 import com.newrelic.videoagent.core.tracker.NRVideoTracker;
 import com.newrelic.videoagent.core.utils.NRLog;
 import com.newrelic.videoagent.exoplayer.BuildConfig;
@@ -23,9 +25,9 @@
 /**
  * New Relic Video tracker for ExoPlayer.
  */
-public class NRTrackerExoPlayer extends NRVideoTracker implements Player.EventListener, AnalyticsListener {
+public class NRTrackerExoPlayer extends NRVideoTracker implements Player.Listener, AnalyticsListener {
 
-    protected SimpleExoPlayer player;
+    protected ExoPlayer player;
 
     private long bitrateEstimate;
     private int lastHeight;
@@ -44,7 +46,7 @@ public NRTrackerExoPlayer() {}
      *
      * @param player ExoPlayer instance.
      */
-    public NRTrackerExoPlayer(SimpleExoPlayer player) {
+    public NRTrackerExoPlayer(ExoPlayer player) {
         setPlayer(player);
     }
 
@@ -55,7 +57,7 @@ public NRTrackerExoPlayer(SimpleExoPlayer player) {
      */
     @Override
     public void setPlayer(Object player) {
-        this.player = (SimpleExoPlayer) player;
+        this.player = (ExoPlayer) player;
         registerListeners();
         super.setPlayer(player);
     }
@@ -253,7 +255,7 @@ public Boolean getIsMuted() {
      *
      * @return Attribute.
      */
-    private SimpleExoPlayer getPlayer() {
+    private ExoPlayer getPlayer() {
         return player;
     }
 
@@ -343,7 +345,16 @@ public void sendDroppedFrame(int count, int elapsed) {
     // ExoPlayer Player.EventListener
 
     @Override
-    public void onPlayerStateChanged(boolean playWhenReady, int playbackState) {
+    public void onPlayWhenReadyChanged(boolean playWhenReady, int reason) {
+        logOnPlayerStateChanged(playWhenReady, player.getPlaybackState());
+    }
+
+    @Override
+    public void onPlaybackStateChanged(int playbackState) {
+        logOnPlayerStateChanged(player.getPlayWhenReady(), playbackState);
+    }
+
+    private void logOnPlayerStateChanged(boolean playWhenReady, int playbackState) {
 
         NRLog.d("onPlayerStateChanged, payback state = " + playbackState + " {");
 
@@ -418,24 +429,26 @@ else if (playWhenReady) {
     }
 
     @Override
-    public void onPlayerError(ExoPlaybackException error) {
+    public void onPlayerError(PlaybackException error) {
         NRLog.d("onPlayerError");
         sendError(error);
     }
 
     // ExoPlayer AnalyticsListener
 
     @Override
-    public void onSeekStarted(AnalyticsListener.EventTime eventTime) {
-        NRLog.d("onSeekStarted analytics");
+    public void onPositionDiscontinuity(Player.PositionInfo oldPosition, Player.PositionInfo newPosition, int reason) {
+        if (reason == Player.DISCONTINUITY_REASON_SEEK) {
+            NRLog.d("onSeekStarted analytics");
 
-        if (!getState().isSeeking) {
-            sendSeekStart();
+            if (!getState().isSeeking) {
+                sendSeekStart();
+            }
         }
     }
 
     @Override
-    public void onTracksChanged(AnalyticsListener.EventTime eventTime, TrackGroupArray trackGroups, TrackSelectionArray trackSelections) {
+    public void onTracksInfoChanged(EventTime eventTime, TracksInfo tracksInfo) {
         NRLog.d("onTracksChanged analytics");
 
         // Next track in the playlist
@@ -468,7 +481,9 @@ public void onDroppedVideoFrames(AnalyticsListener.EventTime eventTime, int drop
     }
 
     @Override
-    public void onVideoSizeChanged(AnalyticsListener.EventTime eventTime, int width, int height, int unappliedRotationDegrees, float pixelWidthHeightRatio) {
+    public void onVideoSizeChanged(VideoSize videoSize) {
+        int width = videoSize.width;
+        int height = videoSize.height;
         NRLog.d("onVideoSizeChanged analytics, H = " + height + " W = " + width);
 
         if (player.isPlayingAd()) return;

NRIMATracker/build.gradle

@@ -3,13 +3,13 @@ plugins {
 }
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 31
 
     defaultConfig {
         minSdkVersion 16
         targetSdkVersion 30
         versionCode 1
-        versionName "0.99.0"
+        versionName "0.99.6"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
@@ -44,4 +44,4 @@ dependencies {
     testImplementation 'junit:junit:4.+'
     androidTestImplementation 'androidx.test.ext:junit:1.1.2'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
-}
+}

NewRelicVideoCore/build.gradle

@@ -3,7 +3,7 @@ plugins {
 }
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 31
 
     defaultConfig {
         minSdkVersion 16
@@ -43,4 +43,4 @@ dependencies {
     testImplementation 'junit:junit:4.+'
     androidTestImplementation 'androidx.test.ext:junit:1.1.1'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
-}
+}

Test/app/build.gradle

@@ -4,7 +4,7 @@ plugins {
 }
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 31
 
     defaultConfig {
         applicationId "com.newrelic.coretest"
@@ -43,4 +43,4 @@ dependencies {
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
 
     implementation project(path: ':NewRelicVideoCore')
-}
+}

app/build.gradle

@@ -3,12 +3,12 @@ plugins {
 }
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 31
 
     defaultConfig {
         applicationId "com.newrelic.nrvideoproject"
         minSdkVersion 16
-        targetSdkVersion 29
+        targetSdkVersion 30
         versionCode 1
         versionName "1.0"
 
@@ -27,6 +27,10 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
+
+    packagingOptions {
+        exclude("META-INF/*.kotlin_module")
+    }
 }
 
 apply plugin: 'newrelic'
@@ -45,10 +49,10 @@ dependencies {
     androidTestImplementation 'androidx.test.ext:junit:1.1.1'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
 
-    implementation 'com.google.android.exoplayer:exoplayer:+'
+    implementation 'com.google.android.exoplayer:exoplayer:2.17.0'
     implementation 'com.google.android.exoplayer:extension-ima:+'
 
     implementation 'com.newrelic.agent.android:android-agent:+'
 
     implementation 'com.android.support:multidex:1.0.3'
-}
+}