Merge pull request #9705 from google/dev-v2-r2.16.1

r2.16.1

Author: tonihei

RELEASENOTES.md

@@ -1,5 +1,34 @@
 # Release notes
 
+### 2.16.1 (2021-11-18)
+
+*   Core Library:
+    *   Fix track selection issue where overriding one track group did not
+        disable other track groups of the same type
+        ([#9675](https://github.com/google/ExoPlayer/issues/9675)).
+    *   Fix track selection issue where a mixture of non-empty and empty track
+        overrides is not applied correctly
+        ([#9649](https://github.com/google/ExoPlayer/issues/9649)).
+    *   Add protected method `DefaultRenderersFactory.getCodecAdapterFactory()`
+        so that subclasses of `DefaultRenderersFactory` that override
+        `buildVideoRenderers()` or `buildAudioRenderers()` can access the codec
+        adapter factory and pass it to `MediaCodecRenderer` instances they
+        create.
+    *   Propagate ICY header fields `name` and `genre` to
+        `MediaMetadata.station` and `MediaMetadata.genre` respectively so that
+        they reach the app via `Player.Listener.onMediaMetadataChanged()`
+        ([#9677](https://github.com/google/ExoPlayer/issues/9677)).
+    *   Remove null keys from `DefaultHttpDataSource#getResponseHeaders`.
+*   Extractors:
+    *   WAV: Add support for RF64 streams
+        ([#9543](https://github.com/google/ExoPlayer/issues/9543)).
+*   DASH:
+    *   Add parsed essential and supplemental properties to the `Representation`
+        ([#9579](https://github.com/google/ExoPlayer/issues/9579)).
+*   HLS:
+    *   Correctly populate `Format.label` for audio only HLS streams
+        ([#9608](https://github.com/google/ExoPlayer/issues/9608)).
+
 ### 2.16.0 (2021-11-04)
 
 *   Core Library:

SECURITY.md

@@ -1,8 +1,9 @@
 # Security policy #
 
-To report a security issue, please email [email protected]
-with a description of the issue, the steps you took to create the issue,
-affected versions, and, if known, mitigations for the issue. Our vulnerability
-management team will respond within 3 working days of your email. If the issue
-is confirmed as a vulnerability, we will open a Security Advisory. This project
-follows a 90 day disclosure timeline.
+To report a security issue, please email
+[email protected] with a description of the issue, the
+steps you took to create the issue, affected versions, and, if known,
+mitigations for the issue. Our vulnerability management team will respond within
+3 working days of your email. If the issue is confirmed as a vulnerability, we
+will open a Security Advisory. This project follows a 90 day disclosure
+timeline.

constants.gradle

@@ -13,8 +13,8 @@
 // limitations under the License.
 project.ext {
     // ExoPlayer version and version code.
-    releaseVersion = '2.16.0'
-    releaseVersionCode = 2016000
+    releaseVersion = '2.16.1'
+    releaseVersionCode = 2016001
     minSdkVersion = 16
     appTargetSdkVersion = 29
     // Upgrading this requires [Internal ref: b/193254928] to be fixed, or some
@@ -26,33 +26,32 @@ project.ext {
     // Use the same Guava version as the Android repo:
     // https://cs.android.com/android/platform/superproject/+/master:external/guava/METADATA
     guavaVersion = '27.1-android'
-    mockitoVersion = '3.4.0'
-    mockWebServerVersion = '3.12.0'
+    mockitoVersion = '3.12.4'
     robolectricVersion = '4.6.1'
     // Keep this in sync with Google's internal Checker Framework version.
-    checkerframeworkVersion = '3.5.0'
-    checkerframeworkCompatVersion = '2.5.0'
-    errorProneVersion = '2.9.0'
+    checkerframeworkVersion = '3.13.0'
+    checkerframeworkCompatVersion = '2.5.5'
+    errorProneVersion = '2.10.0'
     jsr305Version = '3.0.2'
-    kotlinAnnotationsVersion = '1.5.20'
-    androidxAnnotationVersion = '1.2.0'
-    androidxAppCompatVersion = '1.3.0'
+    kotlinAnnotationsVersion = '1.5.31'
+    androidxAnnotationVersion = '1.3.0'
+    androidxAppCompatVersion = '1.3.1'
     androidxCollectionVersion = '1.1.0'
-    androidxCoreVersion = '1.6.0'
+    androidxCoreVersion = '1.7.0'
     androidxFuturesVersion = '1.1.0'
     androidxMediaVersion = '1.4.3'
-    androidxMedia2Version = '1.1.3'
+    androidxMedia2Version = '1.2.0'
     androidxMultidexVersion = '2.0.1'
     androidxRecyclerViewVersion = '1.2.1'
-    androidxMaterialVersion = '1.3.0'
-    androidxTestCoreVersion = '1.3.0'
-    androidxTestJUnitVersion = '1.1.2'
-    androidxTestRunnerVersion = '1.3.0'
-    androidxTestRulesVersion = '1.3.0'
-    androidxTestServicesStorageVersion = '1.3.0'
-    androidxTestTruthVersion = '1.3.0'
+    androidxMaterialVersion = '1.4.0'
+    androidxTestCoreVersion = '1.4.0'
+    androidxTestJUnitVersion = '1.1.3'
+    androidxTestRunnerVersion = '1.4.0'
+    androidxTestRulesVersion = '1.4.0'
+    androidxTestServicesStorageVersion = '1.4.0'
+    androidxTestTruthVersion = '1.4.0'
     truthVersion = '1.1.3'
-    okhttpVersion = '4.9.1'
+    okhttpVersion = '4.9.2'
     modulePrefix = ':'
     if (gradle.ext.has('exoplayerModulePrefix')) {
         modulePrefix += gradle.ext.exoplayerModulePrefix

demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/MainActivity.java

@@ -38,8 +38,7 @@
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.ExoPlayer;
 import com.google.android.exoplayer2.MediaItem;
-import com.google.android.exoplayer2.ui.PlayerControlView;
-import com.google.android.exoplayer2.ui.PlayerView;
+import com.google.android.exoplayer2.ui.StyledPlayerView;
 import com.google.android.exoplayer2.util.Assertions;
 import com.google.android.exoplayer2.util.Util;
 import com.google.android.gms.cast.framework.CastButtonFactory;
@@ -53,8 +52,7 @@
 public class MainActivity extends AppCompatActivity
     implements OnClickListener, PlayerManager.Listener {
 
-  private PlayerView localPlayerView;
-  private PlayerControlView castControlView;
+  private StyledPlayerView playerView;
   private PlayerManager playerManager;
   private RecyclerView mediaQueueList;
   private MediaQueueListAdapter mediaQueueListAdapter;
@@ -83,10 +81,8 @@ public void onCreate(Bundle savedInstanceState) {
 
     setContentView(R.layout.main_activity);
 
-    localPlayerView = findViewById(R.id.local_player_view);
-    localPlayerView.requestFocus();
-
-    castControlView = findViewById(R.id.cast_control_view);
+    playerView = findViewById(R.id.player_view);
+    playerView.requestFocus();
 
     mediaQueueList = findViewById(R.id.sample_list);
     ItemTouchHelper helper = new ItemTouchHelper(new RecyclerViewCallback());
@@ -114,12 +110,7 @@ public void onResume() {
       return;
     }
     playerManager =
-        new PlayerManager(
-            /* listener= */ this,
-            localPlayerView,
-            castControlView,
-            /* context= */ this,
-            castContext);
+        new PlayerManager(/* listener= */ this, this, playerView, /* context= */ castContext);
     mediaQueueList.setAdapter(mediaQueueListAdapter);
   }
 

demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/PlayerManager.java

@@ -17,7 +17,7 @@
 
 import android.content.Context;
 import android.view.KeyEvent;
-import android.view.View;
+import androidx.core.content.res.ResourcesCompat;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.ExoPlayer;
 import com.google.android.exoplayer2.MediaItem;
@@ -28,8 +28,9 @@
 import com.google.android.exoplayer2.TracksInfo;
 import com.google.android.exoplayer2.ext.cast.CastPlayer;
 import com.google.android.exoplayer2.ext.cast.SessionAvailabilityListener;
-import com.google.android.exoplayer2.ui.PlayerControlView;
 import com.google.android.exoplayer2.ui.PlayerView;
+import com.google.android.exoplayer2.ui.StyledPlayerControlView;
+import com.google.android.exoplayer2.ui.StyledPlayerView;
 import com.google.android.gms.cast.framework.CastContext;
 import java.util.ArrayList;
 
@@ -50,8 +51,8 @@ interface Listener {
     void onUnsupportedTrack(int trackType);
   }
 
-  private final PlayerView localPlayerView;
-  private final PlayerControlView castControlView;
+  private final Context context;
+  private final StyledPlayerView playerView;
   private final Player localPlayer;
   private final CastPlayer castPlayer;
   private final ArrayList<MediaItem> mediaQueue;
@@ -64,32 +65,25 @@ interface Listener {
   /**
    * Creates a new manager for {@link ExoPlayer} and {@link CastPlayer}.
    *
-   * @param listener A {@link Listener} for queue position changes.
-   * @param localPlayerView The {@link PlayerView} for local playback.
-   * @param castControlView The {@link PlayerControlView} to control remote playback.
    * @param context A {@link Context}.
+   * @param listener A {@link Listener} for queue position changes.
+   * @param playerView The {@link PlayerView} for playback.
    * @param castContext The {@link CastContext}.
    */
   public PlayerManager(
-      Listener listener,
-      PlayerView localPlayerView,
-      PlayerControlView castControlView,
-      Context context,
-      CastContext castContext) {
+      Context context, Listener listener, StyledPlayerView playerView, CastContext castContext) {
+    this.context = context;
     this.listener = listener;
-    this.localPlayerView = localPlayerView;
-    this.castControlView = castControlView;
+    this.playerView = playerView;
     mediaQueue = new ArrayList<>();
     currentItemIndex = C.INDEX_UNSET;
 
     localPlayer = new ExoPlayer.Builder(context).build();
     localPlayer.addListener(this);
-    localPlayerView.setPlayer(localPlayer);
 
     castPlayer = new CastPlayer(castContext);
     castPlayer.addListener(this);
     castPlayer.setSessionAvailabilityListener(this);
-    castControlView.setPlayer(castPlayer);
 
     setCurrentPlayer(castPlayer.isCastSessionAvailable() ? castPlayer : localPlayer);
   }
@@ -192,11 +186,7 @@ public boolean moveItem(MediaItem item, int newIndex) {
    * @return Whether the event was handled by the target view.
    */
   public boolean dispatchKeyEvent(KeyEvent event) {
-    if (currentPlayer == localPlayer) {
-      return localPlayerView.dispatchKeyEvent(event);
-    } else /* currentPlayer == castPlayer */ {
-      return castControlView.dispatchKeyEvent(event);
-    }
+    return playerView.dispatchKeyEvent(event);
   }
 
   /** Releases the manager and the players that it holds. */
@@ -205,7 +195,7 @@ public void release() {
     mediaQueue.clear();
     castPlayer.setSessionAvailabilityListener(null);
     castPlayer.release();
-    localPlayerView.setPlayer(null);
+    playerView.setPlayer(null);
     localPlayer.release();
   }
 
@@ -270,13 +260,19 @@ private void setCurrentPlayer(Player currentPlayer) {
       return;
     }
 
-    // View management.
-    if (currentPlayer == localPlayer) {
-      localPlayerView.setVisibility(View.VISIBLE);
-      castControlView.hide();
-    } else /* currentPlayer == castPlayer */ {
-      localPlayerView.setVisibility(View.GONE);
-      castControlView.show();
+    playerView.setPlayer(currentPlayer);
+    playerView.setControllerHideOnTouch(currentPlayer == localPlayer);
+    if (currentPlayer == castPlayer) {
+      playerView.setControllerShowTimeoutMs(0);
+      playerView.showController();
+      playerView.setDefaultArtwork(
+          ResourcesCompat.getDrawable(
+              context.getResources(),
+              R.drawable.ic_baseline_cast_connected_400,
+              /* theme= */ null));
+    } else { // currentPlayer == localPlayer
+      playerView.setControllerShowTimeoutMs(StyledPlayerControlView.DEFAULT_SHOW_TIMEOUT_MS);
+      playerView.setDefaultArtwork(null);
     }
 
     // Player state management.

demos/cast/src/main/res/drawable/ic_baseline_cast_connected_400.xml

@@ -0,0 +1,20 @@
+<!--
+  ~ Copyright 2021 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      https://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<vector android:height="400dp" android:tint="#FFFFFF"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="400dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M1,18v3h3c0,-1.66 -1.34,-3 -3,-3zM1,14v2c2.76,0 5,2.24 5,5h2c0,-3.87 -3.13,-7 -7,-7zM19,7L5,7v1.63c3.96,1.28 7.09,4.41 8.37,8.37L19,17L19,7zM1,10v2c4.97,0 9,4.03 9,9h2c0,-6.08 -4.93,-11 -11,-11zM21,3L3,3c-1.1,0 -2,0.9 -2,2v3h2L3,5h18v14h-7v2h7c1.1,0 2,-0.9 2,-2L23,5c0,-1.1 -0.9,-2 -2,-2z"/>
+</vector>

demos/cast/src/main/res/layout/main_activity.xml

@@ -20,7 +20,7 @@
     android:layout_height="match_parent"
     android:keepScreenOn="true">
 
-  <com.google.android.exoplayer2.ui.PlayerView android:id="@+id/local_player_view"
+  <com.google.android.exoplayer2.ui.StyledPlayerView android:id="@+id/player_view"
       android:layout_width="match_parent"
       android:layout_height="0dp"
       android:layout_weight="1"
@@ -50,11 +50,4 @@
 
   </RelativeLayout>
 
-  <com.google.android.exoplayer2.ui.PlayerControlView android:id="@+id/cast_control_view"
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:visibility="gone"
-      app:repeat_toggle_modes="all|one"
-      app:show_timeout="-1"/>
-
 </LinearLayout>

demos/gl/src/main/java/com/google/android/exoplayer2/gldemo/BitmapOverlayVideoProcessor.java

@@ -88,6 +88,7 @@ public void initialize() {
     } catch (IOException e) {
       throw new IllegalStateException(e);
     }
+    program.use();
     GlUtil.Attribute[] attributes = program.getAttributes();
     for (GlUtil.Attribute attribute : attributes) {
       if (attribute.name.equals("a_position")) {
@@ -142,7 +143,6 @@ public void draw(int frameTexture, long frameTimestampUs, float[] transformMatri
     // Run the shader program.
     GlUtil.Uniform[] uniforms = checkNotNull(this.uniforms);
     GlUtil.Attribute[] attributes = checkNotNull(this.attributes);
-    checkNotNull(program).use();
     for (GlUtil.Uniform uniform : uniforms) {
       switch (uniform.name) {
         case "tex_sampler_0":

demos/gl/src/main/java/com/google/android/exoplayer2/gldemo/MainActivity.java

@@ -179,18 +179,17 @@ private void initializePlayer() {
     player.play();
     VideoProcessingGLSurfaceView videoProcessingGLSurfaceView =
         Assertions.checkNotNull(this.videoProcessingGLSurfaceView);
-    videoProcessingGLSurfaceView.setVideoComponent(
-        Assertions.checkNotNull(player.getVideoComponent()));
+    videoProcessingGLSurfaceView.setPlayer(player);
     Assertions.checkNotNull(playerView).setPlayer(player);
     player.addAnalyticsListener(new EventLogger(/* trackSelector= */ null));
     this.player = player;
   }
 
   private void releasePlayer() {
     Assertions.checkNotNull(playerView).setPlayer(null);
+    Assertions.checkNotNull(videoProcessingGLSurfaceView).setPlayer(null);
     if (player != null) {
       player.release();
-      Assertions.checkNotNull(videoProcessingGLSurfaceView).setVideoComponent(null);
       player = null;
     }
   }