Merge pull request #10001 from google/dev-v2-r2.17.0

r2.17.0

constants.gradle

@@ -13,8 +13,8 @@
 // limitations under the License.
 project.ext {
     // ExoPlayer version and version code.
-    releaseVersion = '2.16.1'
-    releaseVersionCode = 2016001
+    releaseVersion = '2.17.0'
+    releaseVersionCode = 2_017_000
     minSdkVersion = 16
     appTargetSdkVersion = 29
     // Upgrading this requires [Internal ref: b/193254928] to be fixed, or some
@@ -25,7 +25,7 @@ project.ext {
     junitVersion = '4.13.2'
     // Use the same Guava version as the Android repo:
     // https://cs.android.com/android/platform/superproject/+/master:external/guava/METADATA
-    guavaVersion = '27.1-android'
+    guavaVersion = '31.0.1-android'
     mockitoVersion = '3.12.4'
     robolectricVersion = '4.6.1'
     // Keep this in sync with Google's internal Checker Framework version.
@@ -37,6 +37,7 @@ project.ext {
     androidxAnnotationVersion = '1.3.0'
     androidxAppCompatVersion = '1.3.1'
     androidxCollectionVersion = '1.1.0'
+    androidxConstraintLayoutVersion = '2.0.4'
     androidxCoreVersion = '1.7.0'
     androidxFuturesVersion = '1.1.0'
     androidxMediaVersion = '1.4.3'

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

@@ -28,7 +28,6 @@
 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.PlayerView;
 import com.google.android.exoplayer2.ui.StyledPlayerControlView;
 import com.google.android.exoplayer2.ui.StyledPlayerView;
 import com.google.android.gms.cast.framework.CastContext;
@@ -67,7 +66,7 @@ interface Listener {
    *
    * @param context A {@link Context}.
    * @param listener A {@link Listener} for queue position changes.
-   * @param playerView The {@link PlayerView} for playback.
+   * @param playerView The {@link StyledPlayerView} for playback.
    * @param castContext The {@link CastContext}.
    */
   public PlayerManager(
@@ -224,10 +223,12 @@ public void onTracksInfoChanged(TracksInfo tracksInfo) {
     if (currentPlayer != localPlayer || tracksInfo == lastSeenTrackGroupInfo) {
       return;
     }
-    if (!tracksInfo.isTypeSupportedOrEmpty(C.TRACK_TYPE_VIDEO)) {
+    if (!tracksInfo.isTypeSupportedOrEmpty(
+        C.TRACK_TYPE_VIDEO, /* allowExceedsCapabilities= */ true)) {
       listener.onUnsupportedTrack(C.TRACK_TYPE_VIDEO);
     }
-    if (!tracksInfo.isTypeSupportedOrEmpty(C.TRACK_TYPE_AUDIO)) {
+    if (!tracksInfo.isTypeSupportedOrEmpty(
+        C.TRACK_TYPE_AUDIO, /* allowExceedsCapabilities= */ true)) {
       listener.onUnsupportedTrack(C.TRACK_TYPE_AUDIO);
     }
     lastSeenTrackGroupInfo = tracksInfo;

demos/gl/src/main/assets/bitmap_overlay_video_processor_fragment.glsl

@@ -15,19 +15,19 @@
 #extension GL_OES_EGL_image_external : require
 precision mediump float;
 // External texture containing video decoder output.
-uniform samplerExternalOES tex_sampler_0;
+uniform samplerExternalOES uTexSampler0;
 // Texture containing the overlap bitmap.
-uniform sampler2D tex_sampler_1;
+uniform sampler2D uTexSampler1;
 // Horizontal scaling factor for the overlap bitmap.
-uniform float scaleX;
+uniform float uScaleX;
 // Vertical scaling factory for the overlap bitmap.
-uniform float scaleY;
-varying vec2 v_texcoord;
+uniform float uScaleY;
+varying vec2 vTexCoords;
 void main() {
-  vec4 videoColor = texture2D(tex_sampler_0, v_texcoord);
-  vec4 overlayColor = texture2D(tex_sampler_1,
-                                vec2(v_texcoord.x * scaleX,
-                                     v_texcoord.y * scaleY));
+  vec4 videoColor = texture2D(uTexSampler0, vTexCoords);
+  vec4 overlayColor = texture2D(uTexSampler1,
+                                vec2(vTexCoords.x * uScaleX,
+                                     vTexCoords.y * uScaleY));
   // Blend the video decoder output and the overlay bitmap.
   gl_FragColor = videoColor * (1.0 - overlayColor.a)
       + overlayColor * overlayColor.a;

demos/gl/src/main/assets/bitmap_overlay_video_processor_vertex.glsl

@@ -11,11 +11,11 @@
 // 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.
-attribute vec4 a_position;
-attribute vec4 a_texcoord;
-uniform mat4 tex_transform;
-varying vec2 v_texcoord;
+attribute vec4 aFramePosition;
+attribute vec4 aTexCoords;
+uniform mat4 uTexTransform;
+varying vec2 vTexCoords;
 void main() {
- gl_Position = a_position;
- v_texcoord = (tex_transform * a_texcoord).xy;
+ gl_Position = aFramePosition;
+ vTexCoords = (uTexTransform * aTexCoords).xy;
 }

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

@@ -26,7 +26,6 @@
 import android.graphics.drawable.BitmapDrawable;
 import android.opengl.GLES20;
 import android.opengl.GLUtils;
-import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.util.GlUtil;
 import java.io.IOException;
@@ -52,8 +51,6 @@
   private final Canvas overlayCanvas;
 
   private GlUtil.@MonotonicNonNull Program program;
-  @Nullable private GlUtil.Attribute[] attributes;
-  @Nullable private GlUtil.Uniform[] uniforms;
 
   private float bitmapScaleX;
   private float bitmapScaleY;
@@ -88,31 +85,10 @@ 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")) {
-        attribute.setBuffer(
-            new float[] {
-              -1, -1, 0, 1,
-              1, -1, 0, 1,
-              -1, 1, 0, 1,
-              1, 1, 0, 1
-            },
-            4);
-      } else if (attribute.name.equals("a_texcoord")) {
-        attribute.setBuffer(
-            new float[] {
-              0, 0, 0, 1,
-              1, 0, 0, 1,
-              0, 1, 0, 1,
-              1, 1, 0, 1
-            },
-            4);
-      }
-    }
-    this.attributes = attributes;
-    this.uniforms = program.getUniforms();
+    program.setBufferAttribute(
+        "aFramePosition", GlUtil.getNormalizedCoordinateBounds(), GlUtil.RECTANGLE_VERTICES_COUNT);
+    program.setBufferAttribute(
+        "aTexCoords", GlUtil.getTextureCoordinateBounds(), GlUtil.RECTANGLE_VERTICES_COUNT);
     GLES20.glGenTextures(1, textures, 0);
     GLES20.glBindTexture(GL10.GL_TEXTURE_2D, textures[0]);
     GLES20.glTexParameterf(GL10.GL_TEXTURE_2D, GL10.GL_TEXTURE_MIN_FILTER, GL10.GL_NEAREST);
@@ -141,36 +117,22 @@ public void draw(int frameTexture, long frameTimestampUs, float[] transformMatri
     GlUtil.checkGlError();
 
     // Run the shader program.
-    GlUtil.Uniform[] uniforms = checkNotNull(this.uniforms);
-    GlUtil.Attribute[] attributes = checkNotNull(this.attributes);
-    for (GlUtil.Uniform uniform : uniforms) {
-      switch (uniform.name) {
-        case "tex_sampler_0":
-          uniform.setSamplerTexId(frameTexture, /* unit= */ 0);
-          break;
-        case "tex_sampler_1":
-          uniform.setSamplerTexId(textures[0], /* unit= */ 1);
-          break;
-        case "scaleX":
-          uniform.setFloat(bitmapScaleX);
-          break;
-        case "scaleY":
-          uniform.setFloat(bitmapScaleY);
-          break;
-        case "tex_transform":
-          uniform.setFloats(transformMatrix);
-          break;
-        default: // fall out
-      }
-    }
-    for (GlUtil.Attribute copyExternalAttribute : attributes) {
-      copyExternalAttribute.bind();
-    }
-    for (GlUtil.Uniform copyExternalUniform : uniforms) {
-      copyExternalUniform.bind();
-    }
+    GlUtil.Program program = checkNotNull(this.program);
+    program.setSamplerTexIdUniform("uTexSampler0", frameTexture, /* unit= */ 0);
+    program.setSamplerTexIdUniform("uTexSampler1", textures[0], /* unit= */ 1);
+    program.setFloatUniform("uScaleX", bitmapScaleX);
+    program.setFloatUniform("uScaleY", bitmapScaleY);
+    program.setFloatsUniform("uTexTransform", transformMatrix);
+    program.bindAttributesAndUniforms();
     GLES20.glClear(GLES20.GL_COLOR_BUFFER_BIT);
     GLES20.glDrawArrays(GLES20.GL_TRIANGLE_STRIP, /* first= */ 0, /* count= */ 4);
     GlUtil.checkGlError();
   }
+
+  @Override
+  public void release() {
+    if (program != null) {
+      program.delete();
+    }
+  }
 }

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

@@ -34,7 +34,7 @@
 import com.google.android.exoplayer2.source.MediaSource;
 import com.google.android.exoplayer2.source.ProgressiveMediaSource;
 import com.google.android.exoplayer2.source.dash.DashMediaSource;
-import com.google.android.exoplayer2.ui.PlayerView;
+import com.google.android.exoplayer2.ui.StyledPlayerView;
 import com.google.android.exoplayer2.upstream.DataSource;
 import com.google.android.exoplayer2.upstream.DefaultDataSource;
 import com.google.android.exoplayer2.upstream.DefaultHttpDataSource;
@@ -61,7 +61,7 @@ public final class MainActivity extends Activity {
   private static final String DRM_SCHEME_EXTRA = "drm_scheme";
   private static final String DRM_LICENSE_URL_EXTRA = "drm_license_url";
 
-  @Nullable private PlayerView playerView;
+  @Nullable private StyledPlayerView playerView;
   @Nullable private VideoProcessingGLSurfaceView videoProcessingGLSurfaceView;
 
   @Nullable private ExoPlayer player;
@@ -161,12 +161,12 @@ private void initializePlayer() {
     if (type == C.TYPE_DASH) {
       mediaSource =
           new DashMediaSource.Factory(dataSourceFactory)
-              .setDrmSessionManager(drmSessionManager)
+              .setDrmSessionManagerProvider(unusedMediaItem -> drmSessionManager)
               .createMediaSource(MediaItem.fromUri(uri));
     } else if (type == C.TYPE_OTHER) {
       mediaSource =
           new ProgressiveMediaSource.Factory(dataSourceFactory)
-              .setDrmSessionManager(drmSessionManager)
+              .setDrmSessionManagerProvider(unusedMediaItem -> drmSessionManager)
               .createMediaSource(MediaItem.fromUri(uri));
     } else {
       throw new IllegalStateException();

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

@@ -64,6 +64,9 @@ public interface VideoProcessor {
      * @param transformMatrix The 4 * 4 transform matrix to be applied to the texture.
      */
     void draw(int frameTexture, long frameTimestampUs, float[] transformMatrix);
+
+    /** Releases any resources associated with this {@link VideoProcessor}. */
+    void release();
   }
 
   private static final int EGL_PROTECTED_CONTENT_EXT = 0x32C0;

demos/gl/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
+  <com.google.android.exoplayer2.ui.StyledPlayerView
     android:id="@+id/player_view"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"

demos/main/src/main/AndroidManifest.xml

@@ -76,6 +76,7 @@
         <data android:scheme="content"/>
         <data android:scheme="asset"/>
         <data android:scheme="file"/>
+        <data android:scheme="ssai"/>
       </intent-filter>
       <intent-filter>
         <action android:name="com.google.android.exoplayer.demo.action.VIEW_LIST"/>