Merge branch 'dev-v2' into ffmpeg-video-renderer

.hgignore

@@ -65,6 +65,7 @@ extensions/vp9/src/main/jni/libyuv
 
 # AV1 extension
 extensions/av1/src/main/jni/libgav1
+extensions/av1/src/main/jni/cpu_features
 
 # Opus extension
 extensions/opus/src/main/jni/libopus

README.md

@@ -1,4 +1,4 @@
-# ExoPlayer #
+# ExoPlayer <img src="https://img.shields.io/github/v/release/google/ExoPlayer.svg?label=latest"/> #
 
 ExoPlayer is an application level media player for Android. It provides an
 alternative to Android’s MediaPlayer API for playing audio and video both

build.gradle

@@ -17,15 +17,16 @@ buildscript {
  jcenter()
  }
  dependencies {
- classpath 'com.android.tools.build:gradle:3.5.1'
+ classpath 'com.android.tools.build:gradle:4.0.1'
  classpath 'com.novoda:bintray-release:0.9.1'
- classpath 'com.google.android.gms:strict-version-matcher-plugin:1.2.0'
+ classpath 'com.google.android.gms:strict-version-matcher-plugin:1.2.1'
  }
 }
 allprojects {
  repositories {
  google()
  jcenter()
+ maven { url "https://oss.sonatype.org/content/repositories/snapshots" }
  }
  project.ext {
  exoplayerPublishEnabled = false

common_library_config.gradle

@@ -0,0 +1,34 @@
+// Copyright (C) 2020 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
+//
+// http: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.
+
+apply from: "$gradle.ext.exoplayerSettingsDir/constants.gradle"
+apply plugin: 'com.android.library'
+
+android {
+ compileSdkVersion project.ext.compileSdkVersion
+
+ defaultConfig {
+ minSdkVersion project.ext.minSdkVersion
+ targetSdkVersion project.ext.targetSdkVersion
+ consumerProguardFiles 'proguard-rules.txt'
+ testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
+ }
+
+ compileOptions {
+ sourceCompatibility JavaVersion.VERSION_1_8
+ targetCompatibility JavaVersion.VERSION_1_8
+ }
+
+ testOptions.unitTests.includeAndroidResources = true
+}

constants.gradle

@@ -13,24 +13,28 @@
 // limitations under the License.
 project.ext {
  // ExoPlayer version and version code.
- releaseVersion = '2.11.4'
- releaseVersionCode = 2011004
+ releaseVersion = '2.12.0'
+ releaseVersionCode = 2012000
  minSdkVersion = 16
  appTargetSdkVersion = 29
  targetSdkVersion = 28 // TODO: Bump once b/143232359 is resolved. Also fix TODOs in UtilTest.
  compileSdkVersion = 29
  dexmakerVersion = '2.21.0'
  junitVersion = '4.13-rc-2'
- guavaVersion = '28.2-android'
- mockitoVersion = '2.25.0'
- robolectricVersion = '4.3.1'
- checkerframeworkVersion = '2.5.0'
+ guavaVersion = '27.1-android'
+ mockitoVersion = '2.28.2'
+ mockWebServerVersion = '3.12.0'
+ robolectricVersion = '4.4'
+ checkerframeworkVersion = '3.3.0'
+ checkerframeworkCompatVersion = '2.5.0'
  jsr305Version = '3.0.2'
  kotlinAnnotationsVersion = '1.3.70'
  androidxAnnotationVersion = '1.1.0'
  androidxAppCompatVersion = '1.1.0'
  androidxCollectionVersion = '1.1.0'
  androidxMediaVersion = '1.0.1'
+ androidxMultidexVersion = '2.0.0'
+ androidxRecyclerViewVersion = '1.1.0'
  androidxTestCoreVersion = '1.2.0'
  androidxTestJUnitVersion = '1.1.1'
  androidxTestRunnerVersion = '1.2.0'

core_settings.gradle

@@ -12,6 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 def rootDir = gradle.ext.exoplayerRoot
+if (!gradle.ext.has('exoplayerSettingsDir')) {
+ gradle.ext.exoplayerSettingsDir =
+ new File(rootDir.toString()).getCanonicalPath()
+}
 def modulePrefix = ':'
 if (gradle.ext.has('exoplayerModulePrefix')) {
  modulePrefix += gradle.ext.exoplayerModulePrefix
@@ -35,6 +39,7 @@ include modulePrefix + 'extension-ima'
 include modulePrefix + 'extension-cast'
 include modulePrefix + 'extension-cronet'
 include modulePrefix + 'extension-mediasession'
+include modulePrefix + 'extension-media2'
 include modulePrefix + 'extension-okhttp'
 include modulePrefix + 'extension-opus'
 include modulePrefix + 'extension-vp9'
@@ -61,6 +66,7 @@ project(modulePrefix + 'extension-ima').projectDir = new File(rootDir, 'extensio
 project(modulePrefix + 'extension-cast').projectDir = new File(rootDir, 'extensions/cast')
 project(modulePrefix + 'extension-cronet').projectDir = new File(rootDir, 'extensions/cronet')
 project(modulePrefix + 'extension-mediasession').projectDir = new File(rootDir, 'extensions/mediasession')
+project(modulePrefix + 'extension-media2').projectDir = new File(rootDir, 'extensions/media2')
 project(modulePrefix + 'extension-okhttp').projectDir = new File(rootDir, 'extensions/okhttp')
 project(modulePrefix + 'extension-opus').projectDir = new File(rootDir, 'extensions/opus')
 project(modulePrefix + 'extension-vp9').projectDir = new File(rootDir, 'extensions/vp9')

demos/README.md

@@ -2,3 +2,24 @@
 
 This directory contains applications that demonstrate how to use ExoPlayer.
 Browse the individual demos and their READMEs to learn more.
+
+## Running a demo ##
+
+### From Android Studio ###
+
+* File -> New -> Import Project -> Specify the root ExoPlayer folder.
+* Choose the demo from the run configuration dropdown list.
+* Click Run.
+
+### Using gradle from the command line: ###
+
+* Open a Terminal window at the root ExoPlayer folder.
+* Run `./gradlew projects` to show all projects. Demo projects start with `demo`.
+* Run `./gradlew :<demo name>:tasks` to view the list of available tasks for
+the demo project. Choose an install option from the `Install tasks` section.
+* Run `./gradlew :<demo name>:<install task>`.
+
+**Example**:
+
+`./gradlew :demo:installNoExtensionsDebug` installs the main ExoPlayer demo app
+ in debug mode with no extensions.

demos/cast/README.md

@@ -2,3 +2,6 @@
 
 This folder contains a demo application that showcases ExoPlayer integration
 with Google Cast.
+
+Please see the [demos README](../README.md) for instructions on how to build and
+run this demo.

demos/cast/build.gradle

@@ -27,6 +27,7 @@ android {
  versionCode project.ext.releaseVersionCode
  minSdkVersion project.ext.minSdkVersion
  targetSdkVersion project.ext.appTargetSdkVersion
+ multiDexEnabled true
  }
 
  buildTypes {
@@ -57,8 +58,9 @@ dependencies {
  implementation project(modulePrefix + 'library-ui')
  implementation project(modulePrefix + 'extension-cast')
  implementation 'androidx.appcompat:appcompat:' + androidxAppCompatVersion
+ implementation 'androidx.multidex:multidex:' + androidxMultidexVersion
  implementation 'androidx.recyclerview:recyclerview:1.1.0'
- implementation 'com.google.android.material:material:1.1.0'
+ implementation 'com.google.android.material:material:1.2.1'
 }
 
 apply plugin: 'com.google.android.gms.strict-version-matcher-plugin'

library/common/src/main/java/com/google/android/exoplayer2/util/Function.java → demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/DemoApplication.java

@@ -13,21 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.android.exoplayer2.util;
+package com.google.android.exoplayer2.castdemo;
 
-/**
- * A functional interface representing a function taking one argument and returning a result.
- *
- * @param <T> The input type of the function.
- * @param <R> The output type of the function.
- */
-public interface Function<T, R> {
+import androidx.multidex.MultiDexApplication;
 
- /**
- * Applies this function to the given argument.
- *
- * @param t The function argument.
- * @return The function result, which may be {@code null}.
- */
- R apply(T t);
-}
+// Note: Multidex is enabled in code not AndroidManifest.xml because the internal build system
+// doesn't dejetify MultiDexApplication in AndroidManifest.xml.
+/** Application for multidex support. */
+public final class DemoApplication extends MultiDexApplication {}

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

@@ -41,28 +41,27 @@
  // Clear content.
  samples.add(
  new MediaItem.Builder()
- .setSourceUri("https://storage.googleapis.com/wvmedia/clear/h264/tears/tears.mpd")
+ .setUri("https://storage.googleapis.com/wvmedia/clear/h264/tears/tears.mpd")
  .setMediaMetadata(new MediaMetadata.Builder().setTitle("Clear DASH: Tears").build())
  .setMimeType(MIME_TYPE_DASH)
  .build());
  samples.add(
  new MediaItem.Builder()
- .setSourceUri("https://storage.googleapis.com/shaka-demo-assets/angel-one-hls/hls.m3u8")
+ .setUri("https://storage.googleapis.com/shaka-demo-assets/angel-one-hls/hls.m3u8")
  .setMediaMetadata(new MediaMetadata.Builder().setTitle("Clear HLS: Angel one").build())
  .setMimeType(MIME_TYPE_HLS)
  .build());
  samples.add(
  new MediaItem.Builder()
- .setSourceUri("https://html5demos.com/assets/dizzy.mp4")
+ .setUri("https://html5demos.com/assets/dizzy.mp4")
  .setMediaMetadata(new MediaMetadata.Builder().setTitle("Clear MP4: Dizzy").build())
  .setMimeType(MIME_TYPE_VIDEO_MP4)
  .build());
 
  // DRM content.
  samples.add(
  new MediaItem.Builder()
- .setSourceUri(
- Uri.parse("https://storage.googleapis.com/wvmedia/cenc/h264/tears/tears.mpd"))
+ .setUri(Uri.parse("https://storage.googleapis.com/wvmedia/cenc/h264/tears/tears.mpd"))
  .setMediaMetadata(
  new MediaMetadata.Builder().setTitle("Widevine DASH cenc: Tears").build())
  .setMimeType(MIME_TYPE_DASH)
@@ -71,8 +70,7 @@
  .build());
  samples.add(
  new MediaItem.Builder()
- .setSourceUri(
- "https://storage.googleapis.com/wvmedia/cbc1/h264/tears/tears_aes_cbc1.mpd")
+ .setUri("https://storage.googleapis.com/wvmedia/cbc1/h264/tears/tears_aes_cbc1.mpd")
  .setMediaMetadata(
  new MediaMetadata.Builder().setTitle("Widevine DASH cbc1: Tears").build())
  .setMimeType(MIME_TYPE_DASH)
@@ -81,8 +79,7 @@
  .build());
  samples.add(
  new MediaItem.Builder()
- .setSourceUri(
- "https://storage.googleapis.com/wvmedia/cbcs/h264/tears/tears_aes_cbcs.mpd")
+ .setUri("https://storage.googleapis.com/wvmedia/cbcs/h264/tears/tears_aes_cbcs.mpd")
  .setMediaMetadata(
  new MediaMetadata.Builder().setTitle("Widevine DASH cbcs: Tears").build())
  .setMimeType(MIME_TYPE_DASH)

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

@@ -29,7 +29,6 @@
 import com.google.android.exoplayer2.Timeline;
 import com.google.android.exoplayer2.ext.cast.CastPlayer;
 import com.google.android.exoplayer2.ext.cast.SessionAvailabilityListener;
-import com.google.android.exoplayer2.source.DefaultMediaSourceFactory;
 import com.google.android.exoplayer2.source.TrackGroupArray;
 import com.google.android.exoplayer2.trackselection.DefaultTrackSelector;
 import com.google.android.exoplayer2.trackselection.MappingTrackSelector;
@@ -61,7 +60,6 @@ interface Listener {
  private static final DefaultHttpDataSourceFactory DATA_SOURCE_FACTORY =
  new DefaultHttpDataSourceFactory(USER_AGENT);
 
- private final DefaultMediaSourceFactory defaultMediaSourceFactory;
  private final PlayerView localPlayerView;
  private final PlayerControlView castControlView;
  private final DefaultTrackSelector trackSelector;
@@ -97,7 +95,6 @@ public PlayerManager(
 
  trackSelector = new DefaultTrackSelector(context);
  exoPlayer = new SimpleExoPlayer.Builder(context).setTrackSelector(trackSelector).build();
- defaultMediaSourceFactory = DefaultMediaSourceFactory.newInstance(context, DATA_SOURCE_FACTORY);
  exoPlayer.addListener(this);
  localPlayerView.setPlayer(exoPlayer);
 

library/common/src/main/java/com/google/android/exoplayer2/util/Supplier.java → demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/package-info.java

@@ -13,16 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+@NonNullApi
+package com.google.android.exoplayer2.castdemo;
 
-package com.google.android.exoplayer2.util;
-
-/**
- * A functional interface representing a supplier of results.
- *
- * @param <T> The type of results supplied by this supplier.
- */
-public interface Supplier<T> {
-
- /** Gets a result. */
- T get();
-}
+import com.google.android.exoplayer2.util.NonNullApi;

demos/gl/README.md

@@ -8,4 +8,7 @@ drawn using an Android canvas, and includes the current frame's presentation
 timestamp, to show how to get the timestamp of the frame currently in the
 off-screen surface texture.
 
+Please see the [demos README](../README.md) for instructions on how to build and
+run this demo.
+
 [GLSurfaceView]: https://developer.android.com/reference/android/opengl/GLSurfaceView

demos/gl/build.gradle

@@ -49,5 +49,5 @@ dependencies {
  implementation project(modulePrefix + 'library-dash')
  implementation 'androidx.annotation:annotation:' + androidxAnnotationVersion
  compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion
- compileOnly 'org.checkerframework:checker-compat-qual:' + checkerframeworkVersion
+ compileOnly 'org.checkerframework:checker-compat-qual:' + checkerframeworkCompatVersion
 }

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

@@ -32,4 +32,3 @@ void main() {
  gl_FragColor = videoColor * (1.0 - overlayColor.a)
  + overlayColor * overlayColor.a;
 }
-

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

@@ -11,11 +11,10 @@
 // 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 vec3 a_texcoord;
+attribute vec2 a_position;
+attribute vec2 a_texcoord;
 varying vec2 v_texcoord;
 void main() {
- gl_Position = a_position;
- v_texcoord = a_texcoord.xy;
+ gl_Position = vec4(a_position.x, a_position.y, 0, 1);
+ v_texcoord = a_texcoord;
 }
-

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

@@ -88,18 +88,9 @@ public void initialize() {
  GlUtil.Uniform[] uniforms = GlUtil.getUniforms(program);
  for (GlUtil.Attribute attribute : attributes) {
  if (attribute.name.equals("a_position")) {
- attribute.setBuffer(
- new float[] {
- -1.0f, -1.0f, 0.0f, 1.0f, 1.0f, -1.0f, 0.0f, 1.0f, -1.0f, 1.0f, 0.0f, 1.0f, 1.0f,
- 1.0f, 0.0f, 1.0f,
- },
- 4);
+ attribute.setBuffer(new float[] {-1, -1, 1, -1, -1, 1, 1, 1}, 2);
  } else if (attribute.name.equals("a_texcoord")) {
- attribute.setBuffer(
- new float[] {
- 0.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 0.0f, 0.0f, 1.0f, 1.0f, 0.0f, 1.0f,
- },
- 3);
+ attribute.setBuffer(new float[] {0, 1, 1, 1, 0, 0, 1, 0}, 2);
  }
  }
  this.attributes = attributes;