Dev v2

.gitignore

@@ -47,6 +47,7 @@ bazel-testlogs
 .DS_Store
 cmake-build-debug
 dist
+jacoco.exec
 tmp
 
 # External native builds

.hgignore

@@ -75,9 +75,3 @@ extensions/flac/src/main/jni/flac
 
 # FFmpeg extension
 extensions/ffmpeg/src/main/jni/ffmpeg
-
-# Cronet extension
-extensions/cronet/jniLibs/*
-!extensions/cronet/jniLibs/README.md
-extensions/cronet/libs/*
-!extensions/cronet/libs/README.md

README.md

@@ -22,35 +22,26 @@ and extend, and can be updated through Play Store application updates.
 
 ## Using ExoPlayer ##
 
-ExoPlayer modules can be obtained from JCenter. It's also possible to clone the
-repository and depend on the modules locally.
+ExoPlayer modules can be obtained from [the Google Maven repository][]. It's
+also possible to clone the repository and depend on the modules locally.
 
-### From JCenter ###
+### From the Google Maven repository
 
-#### 1. Add repositories ####
+#### 1. Add ExoPlayer module dependencies ####
 
 The easiest way to get started using ExoPlayer is to add it as a gradle
-dependency. You need to make sure you have the Google and JCenter repositories
-included in the `build.gradle` file in the root of your project:
-
-```gradle
-repositories {
- google()
- jcenter()
-}
-```
-
-#### 2. Add ExoPlayer module dependencies ####
-
-Next add a dependency in the `build.gradle` file of your app module. The
-following will add a dependency to the full library:
+dependency in the `build.gradle` file of your app module. The following will add
+a dependency to the full library:
 
 ```gradle
 implementation 'com.google.android.exoplayer:exoplayer:2.X.X'
 ```
 
 where `2.X.X` is your preferred version.
 
+Note: old versions of ExoPlayer are available via JCenter. To use them, you need
+to add `jcenter()` to your project's root build.gradle `repositories` block.
+
 As an alternative to the full library, you can depend on only the library
 modules that you actually need. For example the following will add dependencies
 on the Core, DASH and UI library modules, as might be required for an app that
@@ -72,18 +63,19 @@ individually.
 * `exoplayer-smoothstreaming`: Support for SmoothStreaming content.
 * `exoplayer-ui`: UI components and resources for use with ExoPlayer.
 
-In addition to library modules, ExoPlayer has multiple extension modules that
-depend on external libraries to provide additional functionality. Some
-extensions are available from JCenter, whereas others must be built manually.
+In addition to library modules, ExoPlayer has extension modules that depend on
+external libraries to provide additional functionality. Some extensions are
+available from the Maven repository, whereas others must be built manually.
 Browse the [extensions directory][] and their individual READMEs for details.
 
-More information on the library and extension modules that are available from
-JCenter can be found on [Bintray][].
+More information on the library and extension modules that are available can be
+found on the [Google Maven ExoPlayer page][].
 
 [extensions directory]: https:/google/ExoPlayer/tree/release-v2/extensions/
-[Bintray]: https://bintray.com/google/exoplayer
+[the Google Maven repository]: https://developer.android.com/studio/build/dependencies#google-maven
+[Google Maven ExoPlayer page]: https://maven.google.com/web/index.html#com.google.android.exoplayer
 
-#### 3. Turn on Java 8 support ####
+#### 2. Turn on Java 8 support ####
 
 If not enabled already, you also need to turn on Java 8 support in all
 `build.gradle` files depending on ExoPlayer, by adding the following to the

build.gradle

@@ -18,7 +18,6 @@ buildscript {
  }
  dependencies {
  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.1'
  }
 }
@@ -27,9 +26,6 @@ allprojects {
  google()
  jcenter()
  }
- project.ext {
- exoplayerPublishEnabled = false
- }
  if (it.hasProperty('externalBuildDir')) {
  if (!new File(externalBuildDir).isAbsolute()) {
  externalBuildDir = new File(rootDir, externalBuildDir)

constants.gradle

@@ -13,35 +13,37 @@
 // limitations under the License.
 project.ext {
  // ExoPlayer version and version code.
- releaseVersion = '2.12.3'
- releaseVersionCode = 2012003
+ releaseVersion = '2.13.3'
+ releaseVersionCode = 2013003
  minSdkVersion = 16
  appTargetSdkVersion = 29
  targetSdkVersion = 28 // TODO: Bump once b/143232359 is resolved. Also fix TODOs in UtilTest.
  compileSdkVersion = 30
  dexmakerVersion = '2.21.0'
- junitVersion = '4.13-rc-2'
+ junitVersion = '4.13.2'
  guavaVersion = '27.1-android'
  mockitoVersion = '2.28.2'
  mockWebServerVersion = '3.12.0'
- robolectricVersion = '4.5-alpha-3'
+ robolectricVersion = '4.5'
  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'
+ androidxCoreVersion = '1.3.2'
  androidxFuturesVersion = '1.1.0'
  androidxMediaVersion = '1.2.1'
- androidxMedia2Version = '1.1.0'
+ androidxMedia2Version = '1.1.2'
  androidxMultidexVersion = '2.0.0'
  androidxRecyclerViewVersion = '1.1.0'
  androidxTestCoreVersion = '1.3.0'
  androidxTestJUnitVersion = '1.1.1'
  androidxTestRunnerVersion = '1.3.0'
  androidxTestRulesVersion = '1.3.0'
  androidxTestServicesStorageVersion = '1.3.0'
+ androidxTestTruthVersion = '1.3.0'
  truthVersion = '1.0'
  modulePrefix = ':'
  if (gradle.ext.has('exoplayerModulePrefix')) {

core_settings.gradle

@@ -27,7 +27,9 @@ include modulePrefix + 'library-core'
 include modulePrefix + 'library-dash'
 include modulePrefix + 'library-extractor'
 include modulePrefix + 'library-hls'
+include modulePrefix + 'library-rtsp'
 include modulePrefix + 'library-smoothstreaming'
+include modulePrefix + 'library-transformer'
 include modulePrefix + 'library-ui'
 include modulePrefix + 'robolectricutils'
 include modulePrefix + 'testutils'
@@ -46,7 +48,6 @@ include modulePrefix + 'extension-opus'
 include modulePrefix + 'extension-vp9'
 include modulePrefix + 'extension-rtmp'
 include modulePrefix + 'extension-leanback'
-include modulePrefix + 'extension-jobdispatcher'
 include modulePrefix + 'extension-workmanager'
 
 project(modulePrefix + 'library').projectDir = new File(rootDir, 'library/all')
@@ -55,7 +56,9 @@ project(modulePrefix + 'library-core').projectDir = new File(rootDir, 'library/c
 project(modulePrefix + 'library-dash').projectDir = new File(rootDir, 'library/dash')
 project(modulePrefix + 'library-extractor').projectDir = new File(rootDir, 'library/extractor')
 project(modulePrefix + 'library-hls').projectDir = new File(rootDir, 'library/hls')
+project(modulePrefix + 'library-rtsp').projectDir = new File(rootDir, 'library/rtsp')
 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')
@@ -74,5 +77,4 @@ project(modulePrefix + 'extension-opus').projectDir = new File(rootDir, 'extensi
 project(modulePrefix + 'extension-vp9').projectDir = new File(rootDir, 'extensions/vp9')
 project(modulePrefix + 'extension-rtmp').projectDir = new File(rootDir, 'extensions/rtmp')
 project(modulePrefix + 'extension-leanback').projectDir = new File(rootDir, 'extensions/leanback')
-project(modulePrefix + 'extension-jobdispatcher').projectDir = new File(rootDir, 'extensions/jobdispatcher')
 project(modulePrefix + 'extension-workmanager').projectDir = new File(rootDir, 'extensions/workmanager')

demos/cast/build.gradle

@@ -38,6 +38,7 @@ android {
  "proguard-rules.txt",
  getDefaultProguardFile('proguard-android.txt')
  ]
+ signingConfig signingConfigs.debug
  }
  debug {
  jniDebuggable = true

demos/cast/src/main/AndroidManifest.xml

@@ -31,7 +31,8 @@
  <activity android:name="com.google.android.exoplayer2.castdemo.MainActivity"
  android:configChanges="keyboard|keyboardHidden|orientation|screenSize|screenLayout|smallestScreenSize|uiMode"
  android:launchMode="singleTop" android:label="@string/application_name"
- android:theme="@style/Theme.AppCompat">
+ android:theme="@style/Theme.AppCompat"
+ android:exported="true">
  <intent-filter>
  <action android:name="android.intent.action.MAIN"/>
  <category android:name="android.intent.category.LAUNCHER"/>

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

@@ -42,19 +42,21 @@
  samples.add(
  new MediaItem.Builder()
  .setUri("https://storage.googleapis.com/wvmedia/clear/h264/tears/tears.mpd")
- .setMediaMetadata(new MediaMetadata.Builder().setTitle("Clear DASH: Tears").build())
+ .setMediaMetadata(
+ new MediaMetadata.Builder().setTrackTitle("Clear DASH: Tears").build())
  .setMimeType(MIME_TYPE_DASH)
  .build());
  samples.add(
  new MediaItem.Builder()
  .setUri("https://storage.googleapis.com/shaka-demo-assets/angel-one-hls/hls.m3u8")
- .setMediaMetadata(new MediaMetadata.Builder().setTitle("Clear HLS: Angel one").build())
+ .setMediaMetadata(
+ new MediaMetadata.Builder().setTrackTitle("Clear HLS: Angel one").build())
  .setMimeType(MIME_TYPE_HLS)
  .build());
  samples.add(
  new MediaItem.Builder()
  .setUri("https://html5demos.com/assets/dizzy.mp4")
- .setMediaMetadata(new MediaMetadata.Builder().setTitle("Clear MP4: Dizzy").build())
+ .setMediaMetadata(new MediaMetadata.Builder().setTrackTitle("Clear MP4: Dizzy").build())
  .setMimeType(MIME_TYPE_VIDEO_MP4)
  .build());
 
@@ -63,7 +65,7 @@
  new MediaItem.Builder()
  .setUri(Uri.parse("https://storage.googleapis.com/wvmedia/cenc/h264/tears/tears.mpd"))
  .setMediaMetadata(
- new MediaMetadata.Builder().setTitle("Widevine DASH cenc: Tears").build())
+ new MediaMetadata.Builder().setTrackTitle("Widevine DASH cenc: Tears").build())
  .setMimeType(MIME_TYPE_DASH)
  .setDrmUuid(C.WIDEVINE_UUID)
  .setDrmLicenseUri("https://proxy.uat.widevine.com/proxy?provider=widevine_test")
@@ -72,7 +74,7 @@
  new MediaItem.Builder()
  .setUri("https://storage.googleapis.com/wvmedia/cbc1/h264/tears/tears_aes_cbc1.mpd")
  .setMediaMetadata(
- new MediaMetadata.Builder().setTitle("Widevine DASH cbc1: Tears").build())
+ new MediaMetadata.Builder().setTrackTitle("Widevine DASH cbc1: Tears").build())
  .setMimeType(MIME_TYPE_DASH)
  .setDrmUuid(C.WIDEVINE_UUID)
  .setDrmLicenseUri("https://proxy.uat.widevine.com/proxy?provider=widevine_test")
@@ -81,7 +83,7 @@
  new MediaItem.Builder()
  .setUri("https://storage.googleapis.com/wvmedia/cbcs/h264/tears/tears_aes_cbcs.mpd")
  .setMediaMetadata(
- new MediaMetadata.Builder().setTitle("Widevine DASH cbcs: Tears").build())
+ new MediaMetadata.Builder().setTrackTitle("Widevine DASH cbcs: Tears").build())
  .setMimeType(MIME_TYPE_DASH)
  .setDrmUuid(C.WIDEVINE_UUID)
  .setDrmLicenseUri("https://proxy.uat.widevine.com/proxy?provider=widevine_test")

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

@@ -211,7 +211,7 @@ public void onBindViewHolder(QueueItemViewHolder holder, int position) {
  holder.item = Assertions.checkNotNull(playerManager.getItem(position));
 
  TextView view = holder.textView;
- view.setText(holder.item.mediaMetadata.title);
+ view.setText(holder.item.mediaMetadata.trackTitle);
  // TODO: Solve coloring using the theme's ColorStateList.
  view.setTextColor(
  ColorUtils.setAlphaComponent(
@@ -308,7 +308,7 @@ public SampleListAdapter(Context context) {
  @NonNull
  public View getView(int position, @Nullable View convertView, @NonNull ViewGroup parent) {
  View view = super.getView(position, convertView, parent);
- ((TextView) view).setText(Util.castNonNull(getItem(position)).mediaMetadata.title);
+ ((TextView) view).setText(Util.castNonNull(getItem(position)).mediaMetadata.trackTitle);
  return view;
  }
  }

demos/gl/build.gradle

@@ -34,6 +34,7 @@ android {
  shrinkResources true
  minifyEnabled true
  proguardFiles getDefaultProguardFile('proguard-android.txt')
+ signingConfig signingConfigs.debug
  }
  }
 

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

@@ -140,6 +140,7 @@ public void draw(int frameTexture, long frameTimestampUs) {
  case "scaleY":
  uniform.setFloat(bitmapScaleY);
  break;
+ default: // fall out
  }
  }
  for (GlUtil.Attribute copyExternalAttribute : attributes) {

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);

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

@@ -25,8 +25,8 @@
 import android.view.Surface;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import com.google.android.exoplayer2.ExoPlayer;
 import com.google.android.exoplayer2.Format;
-import com.google.android.exoplayer2.Player;
 import com.google.android.exoplayer2.util.Assertions;
 import com.google.android.exoplayer2.util.GlUtil;
 import com.google.android.exoplayer2.util.TimedValueQueue;
@@ -72,7 +72,7 @@ public interface VideoProcessor {
 
  @Nullable private SurfaceTexture surfaceTexture;
  @Nullable private Surface surface;
- @Nullable private Player.VideoComponent videoComponent;
+ @Nullable private ExoPlayer.VideoComponent videoComponent;
 
  /**
  * Creates a new instance. Pass {@code true} for {@code requireSecureContext} if the {@link
@@ -151,7 +151,7 @@ public void destroySurface(EGL10 egl, EGLDisplay display, EGLSurface surface) {
  *
  * @param newVideoComponent The new video component, or {@code null} to detach this view.
  */
- public void setVideoComponent(@Nullable Player.VideoComponent newVideoComponent) {
+ public void setVideoComponent(@Nullable ExoPlayer.VideoComponent newVideoComponent) {
  if (newVideoComponent == videoComponent) {
  return;
  }

demos/main/build.gradle

@@ -38,6 +38,7 @@ android {
  "proguard-rules.txt",
  getDefaultProguardFile('proguard-android.txt')
  ]
+ signingConfig signingConfigs.debug
  }
  debug {
  jniDebuggable = true

demos/main/src/main/AndroidManifest.xml

@@ -41,7 +41,8 @@
  <activity android:name="com.google.android.exoplayer2.demo.SampleChooserActivity"
  android:configChanges="keyboardHidden"
  android:label="@string/application_name"
- android:theme="@style/Theme.AppCompat">
+ android:theme="@style/Theme.AppCompat"
+ android:exported="true">
  <intent-filter>
  <action android:name="android.intent.action.MAIN"/>
  <category android:name="android.intent.category.LAUNCHER"/>
@@ -65,7 +66,8 @@
  android:configChanges="keyboard|keyboardHidden|orientation|screenSize|screenLayout|smallestScreenSize|uiMode"
  android:launchMode="singleTop"
  android:label="@string/application_name"
- android:theme="@style/PlayerTheme">
+ android:theme="@style/PlayerTheme"
+ android:exported="true">
  <intent-filter>
  <action android:name="com.google.android.exoplayer.demo.action.VIEW"/>
  <category android:name="android.intent.category.DEFAULT"/>

demos/main/src/main/assets/media.exolist.json

@@ -485,6 +485,13 @@
  "subtitle_mime_type": "application/ttml+xml",
  "subtitle_language": "ja"
  },
+ {
+ "name": "TTML Netflix Japanese examples (IMSC1.1)",
+ "uri": "https://storage.googleapis.com/exoplayer-test-media-1/gen-3/screens/dash-vod-single-segment/video-avc-baseline-480.mp4",
+ "subtitle_uri": "https://storage.googleapis.com/exoplayer-test-media-1/ttml/netflix_japanese_ttml.xml",
+ "subtitle_mime_type": "application/ttml+xml",
+ "subtitle_language": "ja"
+ },
  {
  "name": "WebVTT positioning",
  "uri": "https://html5demos.com/assets/dizzy.mp4",
@@ -506,6 +513,13 @@
  "subtitle_mime_type": "text/x-ssa",
  "subtitle_language": "en"
  },
+ {
+ "name": "SubStation Alpha styling",
+ "uri": "https://storage.googleapis.com/exoplayer-test-media-1/gen-3/screens/dash-vod-single-segment/video-avc-baseline-480.mp4",
+ "subtitle_uri": "https://storage.googleapis.com/exoplayer-test-media-1/ssa/test-subs-styling.ass",
+ "subtitle_mime_type": "text/x-ssa",
+ "subtitle_language": "en"
+ },
  {
  "name": "MPEG-4 Timed Text",
  "uri": "https://storage.googleapis.com/exoplayer-test-media-1/mp4/dizzy-with-tx3g.mp4"

demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java

@@ -363,7 +363,8 @@ private void startDownload(DownloadRequest downloadRequest) {
 
  private DownloadRequest buildDownloadRequest() {
  return downloadHelper
- .getDownloadRequest(Util.getUtf8Bytes(checkNotNull(mediaItem.mediaMetadata.title)))
+ .getDownloadRequest(
+ Util.getUtf8Bytes(checkNotNull(mediaItem.mediaMetadata.trackTitle.toString())))
  .copyWithKeySetId(keySetId);
  }
  }