Merge pull request #8541 from google/dev-v2-r2.13.0

r2.13.0
google · Feb 4, 2021 · b100094 · b100094
2 parents 03263db + 77798e4
commit b100094
Show file tree

Hide file tree

Showing 778 changed files with 53,764 additions and 13,780 deletions.
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
diff --git a/build.gradle b/build.gradle
@@ -26,7 +26,6 @@ allprojects {
     repositories {
         google()
         jcenter()
-        maven { url "https://oss.sonatype.org/content/repositories/snapshots" }
     }
     project.ext {
         exoplayerPublishEnabled = false

diff --git a/constants.gradle b/constants.gradle
@@ -13,18 +13,18 @@
 // limitations under the License.
 project.ext {
     // ExoPlayer version and version code.
-    releaseVersion = '2.12.3'
-    releaseVersionCode = 2012003
+    releaseVersion = '2.13.0'
+    releaseVersionCode = 2013000
     minSdkVersion = 16
     appTargetSdkVersion = 29
     targetSdkVersion = 28 // TODO: Bump once b/143232359 is resolved. Also fix TODOs in UtilTest.
-    compileSdkVersion = 29
+    compileSdkVersion = 30
     dexmakerVersion = '2.21.0'
     junitVersion = '4.13-rc-2'
     guavaVersion = '27.1-android'
     mockitoVersion = '2.28.2'
     mockWebServerVersion = '3.12.0'
-    robolectricVersion = '4.4'
+    robolectricVersion = '4.5'
     checkerframeworkVersion = '3.3.0'
     checkerframeworkCompatVersion = '2.5.0'
     jsr305Version = '3.0.2'
@@ -33,14 +33,15 @@ project.ext {
     androidxAppCompatVersion = '1.1.0'
     androidxCollectionVersion = '1.1.0'
     androidxFuturesVersion = '1.1.0'
-    androidxMediaVersion = '1.0.1'
+    androidxMediaVersion = '1.2.1'
     androidxMedia2Version = '1.1.0'
     androidxMultidexVersion = '2.0.0'
     androidxRecyclerViewVersion = '1.1.0'
-    androidxTestCoreVersion = '1.2.0'
+    androidxTestCoreVersion = '1.3.0'
     androidxTestJUnitVersion = '1.1.1'
-    androidxTestRunnerVersion = '1.2.0'
-    androidxTestRulesVersion = '1.2.0'
+    androidxTestRunnerVersion = '1.3.0'
+    androidxTestRulesVersion = '1.3.0'
+    androidxTestServicesStorageVersion = '1.3.0'
     truthVersion = '1.0'
     modulePrefix = ':'
     if (gradle.ext.has('exoplayerModulePrefix')) {

diff --git a/core_settings.gradle b/core_settings.gradle
@@ -28,6 +28,7 @@ include modulePrefix + 'library-dash'
 include modulePrefix + 'library-extractor'
 include modulePrefix + 'library-hls'
 include modulePrefix + 'library-smoothstreaming'
+include modulePrefix + 'library-transformer'
 include modulePrefix + 'library-ui'
 include modulePrefix + 'robolectricutils'
 include modulePrefix + 'testutils'
@@ -56,6 +57,7 @@ project(modulePrefix + 'library-dash').projectDir = new File(rootDir, 'library/d
 project(modulePrefix + 'library-extractor').projectDir = new File(rootDir, 'library/extractor')
 project(modulePrefix + 'library-hls').projectDir = new File(rootDir, 'library/hls')
 project(modulePrefix + 'library-smoothstreaming').projectDir = new File(rootDir, 'library/smoothstreaming')
+project(modulePrefix + 'library-transformer').projectDir = new File(rootDir, 'library/transformer')
 project(modulePrefix + 'library-ui').projectDir = new File(rootDir, 'library/ui')
 project(modulePrefix + 'robolectricutils').projectDir = new File(rootDir, 'robolectricutils')
 project(modulePrefix + 'testutils').projectDir = new File(rootDir, 'testutils')

diff --git a/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/PlayerManager.java b/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/PlayerManager.java
@@ -312,7 +312,8 @@ private void setCurrentPlayer(Player currentPlayer) {
           windowIndex = currentItemIndex;
         }
       }
-      previousPlayer.stop(true);
+      previousPlayer.stop();
+      previousPlayer.clearMediaItems();
     }
 
     this.currentPlayer = currentPlayer;

diff --git a/demos/gl/src/main/java/com/google/android/exoplayer2/gldemo/MainActivity.java b/demos/gl/src/main/java/com/google/android/exoplayer2/gldemo/MainActivity.java
@@ -152,7 +152,7 @@ private void initializePlayer() {
               .setUuidAndExoMediaDrmProvider(drmSchemeUuid, FrameworkMediaDrm.DEFAULT_PROVIDER)
               .build(drmCallback);
     } else {
-      drmSessionManager = DrmSessionManager.getDummyDrmSessionManager();
+      drmSessionManager = DrmSessionManager.DRM_UNSUPPORTED;
     }
 
     DataSource.Factory dataSourceFactory = new DefaultDataSourceFactory(this);

diff --git a/demos/main/src/main/assets/media.exolist.json b/demos/main/src/main/assets/media.exolist.json
@@ -354,6 +354,23 @@
         "name": "VMAP midroll ad pod at 5 s with 10 skippable ads",
         "uri": "https://storage.googleapis.com/exoplayer-test-media-1/mp4/frame-counter-one-hour.mp4",
         "ad_tag_uri": "https://vastsynthesizer.appspot.com/midroll-10-skippable-ads"
+      },
+      {
+        "name": "Playlist with three ad tags",
+        "playlist": [
+          {
+            "uri": "https://storage.googleapis.com/exoplayer-test-media-1/mp4/android-screens-10s.mp4",
+            "ad_tag_uri": "https://pubads.g.doubleclick.net/gampad/ads?sz=640x480&iu=/124319096/external/single_ad_samples&ciu_szs=300x250&impl=s&gdfp_req=1&env=vp&output=vast&unviewed_position_start=1&cust_params=deployment%3Ddevsite%26sample_ct%3Dlinear&correlator="
+          },
+          {
+            "uri": "https://storage.googleapis.com/exoplayer-test-media-1/mp4/android-screens-25s.mp4",
+            "ad_tag_uri": "https://pubads.g.doubleclick.net/gampad/ads?sz=640x480&iu=/124319096/external/ad_rule_samples&ciu_szs=300x250&ad_rule=1&impl=s&gdfp_req=1&env=vp&output=vmap&unviewed_position_start=1&cust_params=deployment%3Ddevsite%26sample_ar%3Dpremidpost&cmsid=496&vid=short_onecue&correlator="
+          },
+          {
+            "uri": "https://storage.googleapis.com/exoplayer-test-media-1/mp4/frame-counter-one-hour.mp4",
+            "ad_tag_uri": "https://pubads.g.doubleclick.net/gampad/ads?sz=640x480&iu=/124319096/external/ad_rule_samples&ciu_szs=300x250&ad_rule=1&impl=s&gdfp_req=1&env=vp&output=vmap&unviewed_position_start=1&cust_params=deployment%3Ddevsite%26sample_ar%3Dpremidpostlongpod&cmsid=496&vid=short_tencue&correlator="
+          }
+        ]
       }
     ]
   },

diff --git a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DemoUtil.java b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DemoUtil.java
@@ -16,18 +16,21 @@
 package com.google.android.exoplayer2.demo;
 
 import android.content.Context;
+import android.os.Build;
 import com.google.android.exoplayer2.DefaultRenderersFactory;
+import com.google.android.exoplayer2.ExoPlayerLibraryInfo;
 import com.google.android.exoplayer2.RenderersFactory;
 import com.google.android.exoplayer2.database.DatabaseProvider;
 import com.google.android.exoplayer2.database.ExoDatabaseProvider;
-import com.google.android.exoplayer2.ext.cronet.CronetDataSourceFactory;
+import com.google.android.exoplayer2.ext.cronet.CronetDataSource;
 import com.google.android.exoplayer2.ext.cronet.CronetEngineWrapper;
 import com.google.android.exoplayer2.offline.ActionFileUpgradeUtil;
 import com.google.android.exoplayer2.offline.DefaultDownloadIndex;
 import com.google.android.exoplayer2.offline.DownloadManager;
 import com.google.android.exoplayer2.ui.DownloadNotificationHelper;
 import com.google.android.exoplayer2.upstream.DataSource;
 import com.google.android.exoplayer2.upstream.DefaultDataSourceFactory;
+import com.google.android.exoplayer2.upstream.DefaultHttpDataSource;
 import com.google.android.exoplayer2.upstream.HttpDataSource;
 import com.google.android.exoplayer2.upstream.cache.Cache;
 import com.google.android.exoplayer2.upstream.cache.CacheDataSource;
@@ -36,6 +39,9 @@
 import com.google.android.exoplayer2.util.Log;
 import java.io.File;
 import java.io.IOException;
+import java.net.CookieHandler;
+import java.net.CookieManager;
+import java.net.CookiePolicy;
 import java.util.concurrent.Executors;
 import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
 
@@ -44,6 +50,22 @@ public final class DemoUtil {
 
   public static final String DOWNLOAD_NOTIFICATION_CHANNEL_ID = "download_channel";
 
+  /**
+   * Whether the demo application uses Cronet for networking. Note that Cronet does not provide
+   * automatic support for cookies (https://github.com/google/ExoPlayer/issues/5975).
+   *
+   * <p>If set to false, the platform's default network stack is used with a {@link CookieManager}
+   * configured in {@link #getHttpDataSourceFactory}.
+   */
+  private static final boolean USE_CRONET_FOR_NETWORKING = true;
+
+  private static final String USER_AGENT =
+      "ExoPlayerDemo/"
+          + ExoPlayerLibraryInfo.VERSION
+          + " (Linux; Android "
+          + Build.VERSION.RELEASE
+          + ") "
+          + ExoPlayerLibraryInfo.VERSION_SLASHY;
   private static final String TAG = "DemoUtil";
   private static final String DOWNLOAD_ACTION_FILE = "actions";
   private static final String DOWNLOAD_TRACKER_ACTION_FILE = "tracked_actions";
@@ -78,10 +100,18 @@ public static RenderersFactory buildRenderersFactory(
 
   public static synchronized HttpDataSource.Factory getHttpDataSourceFactory(Context context) {
     if (httpDataSourceFactory == null) {
-      context = context.getApplicationContext();
-      CronetEngineWrapper cronetEngineWrapper = new CronetEngineWrapper(context);
-      httpDataSourceFactory =
-          new CronetDataSourceFactory(cronetEngineWrapper, Executors.newSingleThreadExecutor());
+      if (USE_CRONET_FOR_NETWORKING) {
+        context = context.getApplicationContext();
+        CronetEngineWrapper cronetEngineWrapper =
+            new CronetEngineWrapper(context, USER_AGENT, /* preferGMSCoreCronet= */ false);
+        httpDataSourceFactory =
+            new CronetDataSource.Factory(cronetEngineWrapper, Executors.newSingleThreadExecutor());
+      } else {
+        CookieManager cookieManager = new CookieManager();
+        cookieManager.setCookiePolicy(CookiePolicy.ACCEPT_ORIGINAL_SERVER);
+        CookieHandler.setDefault(cookieManager);
+        httpDataSourceFactory = new DefaultHttpDataSource.Factory().setUserAgent(USER_AGENT);
+      }
     }
     return httpDataSourceFactory;
   }

diff --git a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java
@@ -332,7 +332,7 @@ private void onDownloadPrepared(DownloadHelper helper) {
               /* titleId= */ R.string.exo_download_description,
               mappedTrackInfo,
               trackSelectorParameters,
-              /* allowAdaptiveSelections =*/ false,
+              /* allowAdaptiveSelections= */ false,
               /* allowMultipleOverrides= */ true,
               /* onClickListener= */ this,
               /* onDismissListener= */ this);

diff --git a/demos/main/src/main/java/com/google/android/exoplayer2/demo/IntentUtil.java b/demos/main/src/main/java/com/google/android/exoplayer2/demo/IntentUtil.java
@@ -173,7 +173,9 @@ private static void addPlaybackPropertiesToIntent(
         .putExtra(MIME_TYPE_EXTRA + extrasKeySuffix, playbackProperties.mimeType)
         .putExtra(
             AD_TAG_URI_EXTRA + extrasKeySuffix,
-            playbackProperties.adTagUri != null ? playbackProperties.adTagUri.toString() : null);
+            playbackProperties.adsConfiguration != null
+                ? playbackProperties.adsConfiguration.adTagUri.toString()
+                : null);
     if (playbackProperties.drmConfiguration != null) {
       addDrmConfigurationToIntent(playbackProperties.drmConfiguration, intent, extrasKeySuffix);
     }

diff --git a/demos/main/src/main/java/com/google/android/exoplayer2/demo/PlayerActivity.java b/demos/main/src/main/java/com/google/android/exoplayer2/demo/PlayerActivity.java
@@ -19,7 +19,6 @@
 
 import android.content.Intent;
 import android.content.pm.PackageManager;
-import android.net.Uri;
 import android.os.Bundle;
 import android.util.Pair;
 import android.view.KeyEvent;
@@ -59,9 +58,6 @@
 import com.google.android.exoplayer2.util.ErrorMessageProvider;
 import com.google.android.exoplayer2.util.EventLogger;
 import com.google.android.exoplayer2.util.Util;
-import java.net.CookieHandler;
-import java.net.CookieManager;
-import java.net.CookiePolicy;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -78,13 +74,6 @@ public class PlayerActivity extends AppCompatActivity
   private static final String KEY_POSITION = "position";
   private static final String KEY_AUTO_PLAY = "auto_play";
 
-  private static final CookieManager DEFAULT_COOKIE_MANAGER;
-
-  static {
-    DEFAULT_COOKIE_MANAGER = new CookieManager();
-    DEFAULT_COOKIE_MANAGER.setCookiePolicy(CookiePolicy.ACCEPT_ORIGINAL_SERVER);
-  }
-
   protected StyledPlayerView playerView;
   protected LinearLayout debugRootView;
   protected TextView debugTextView;
@@ -102,20 +91,16 @@ public class PlayerActivity extends AppCompatActivity
   private int startWindow;
   private long startPosition;
 
-  // Fields used only for ad playback.
+  // For ad playback only.
 
   private AdsLoader adsLoader;
-  private Uri loadedAdTagUri;
 
-  // Activity lifecycle
+  // Activity lifecycle.
 
   @Override
   public void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
     dataSourceFactory = DemoUtil.getDataSourceFactory(/* context= */ this);
-    if (CookieHandler.getDefault() != DEFAULT_COOKIE_MANAGER) {
-      CookieHandler.setDefault(DEFAULT_COOKIE_MANAGER);
-    }
 
     setContentView();
     debugRootView = findViewById(R.id.controls_root);
@@ -348,24 +333,15 @@ private List<MediaItem> createMediaItems(Intent intent) {
           return Collections.emptyList();
         }
       }
-      hasAds |= mediaItem.playbackProperties.adTagUri != null;
+      hasAds |= mediaItem.playbackProperties.adsConfiguration != null;
     }
     if (!hasAds) {
       releaseAdsLoader();
     }
     return mediaItems;
   }
 
-  private AdsLoader getAdsLoader(Uri adTagUri) {
-    if (mediaItems.size() > 1) {
-      showToast(R.string.unsupported_ads_in_playlist);
-      releaseAdsLoader();
-      return null;
-    }
-    if (!adTagUri.equals(loadedAdTagUri)) {
-      releaseAdsLoader();
-      loadedAdTagUri = adTagUri;
-    }
+  private AdsLoader getAdsLoader(MediaItem.AdsConfiguration adsConfiguration) {
     // The ads loader is reused for multiple playbacks, so that ad playback can resume.
     if (adsLoader == null) {
       adsLoader = new ImaAdsLoader.Builder(/* context= */ this).build();
@@ -394,7 +370,6 @@ private void releaseAdsLoader() {
     if (adsLoader != null) {
       adsLoader.release();
       adsLoader = null;
-      loadedAdTagUri = null;
       playerView.getOverlayFrameLayout().removeAllViews();
     }
   }

diff --git a/demos/main/src/main/java/com/google/android/exoplayer2/demo/SampleChooserActivity.java b/demos/main/src/main/java/com/google/android/exoplayer2/demo/SampleChooserActivity.java
@@ -252,7 +252,7 @@ private int getDownloadUnsupportedStringId(PlaylistHolder playlistHolder) {
     }
     MediaItem.PlaybackProperties playbackProperties =
         checkNotNull(playlistHolder.mediaItems.get(0).playbackProperties);
-    if (playbackProperties.adTagUri != null) {
+    if (playbackProperties.adsConfiguration != null) {
       return R.string.download_ads_unsupported;
     }
     String scheme = playbackProperties.uri.getScheme();

diff --git a/demos/main/src/main/java/com/google/android/exoplayer2/demo/TrackSelectionDialog.java b/demos/main/src/main/java/com/google/android/exoplayer2/demo/TrackSelectionDialog.java
@@ -94,7 +94,7 @@ public static TrackSelectionDialog createForTrackSelector(
         /* titleId= */ R.string.track_selection_title,
         mappedTrackInfo,
         /* initialParameters = */ parameters,
-        /* allowAdaptiveSelections =*/ true,
+        /* allowAdaptiveSelections= */ true,
         /* allowMultipleOverrides= */ false,
         /* onClickListener= */ (dialog, which) -> {
           DefaultTrackSelector.ParametersBuilder builder = parameters.buildUpon();

diff --git a/demos/main/src/main/res/values/strings.xml b/demos/main/src/main/res/values/strings.xml
@@ -45,8 +45,6 @@
 
   <string name="sample_list_load_error">One or more sample lists failed to load</string>
 
-  <string name="unsupported_ads_in_playlist">Playing without ads, as ads are not supported in playlists</string>
-
   <string name="download_start_error">Failed to start download</string>
 
   <string name="download_start_error_offline_license">Failed to obtain offline license</string>

diff --git a/demos/surface/src/main/java/com/google/android/exoplayer2/surfacedemo/MainActivity.java b/demos/surface/src/main/java/com/google/android/exoplayer2/surfacedemo/MainActivity.java
@@ -197,7 +197,7 @@ private void initializePlayer() {
               .setUuidAndExoMediaDrmProvider(drmSchemeUuid, FrameworkMediaDrm.DEFAULT_PROVIDER)
               .build(drmCallback);
     } else {
-      drmSessionManager = DrmSessionManager.getDummyDrmSessionManager();
+      drmSessionManager = DrmSessionManager.DRM_UNSUPPORTED;
     }
 
     DataSource.Factory dataSourceFactory = new DefaultDataSourceFactory(this);

diff --git a/extensions/av1/proguard-rules.txt b/extensions/av1/proguard-rules.txt
@@ -5,3 +5,7 @@
     native <methods>;
 }
 
+# Some members of this class are being accessed from native methods. Keep them unobfuscated.
+-keep class com.google.android.exoplayer2.video.VideoDecoderOutputBuffer {
+  *;
+}
diff --git a/extensions/av1/src/main/java/com/google/android/exoplayer2/ext/av1/Gav1Decoder.java b/extensions/av1/src/main/java/com/google/android/exoplayer2/ext/av1/Gav1Decoder.java
@@ -15,10 +15,12 @@
  */
 package com.google.android.exoplayer2.ext.av1;
 
+import static androidx.annotation.VisibleForTesting.PACKAGE_PRIVATE;
 import static java.lang.Runtime.getRuntime;
 
 import android.view.Surface;
 import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.decoder.DecoderInputBuffer;
 import com.google.android.exoplayer2.decoder.SimpleDecoder;
@@ -28,7 +30,8 @@
 import java.nio.ByteBuffer;
 
 /** Gav1 decoder. */
-/* package */ final class Gav1Decoder
+@VisibleForTesting(otherwise = PACKAGE_PRIVATE)
+public final class Gav1Decoder
     extends SimpleDecoder<VideoDecoderInputBuffer, VideoDecoderOutputBuffer, Gav1DecoderException> {
 
   // LINT.IfChange