Merge pull request #1 from google/dev-v2

Pull from google:dev-v2

.gitignore

@@ -39,9 +39,13 @@ proguard-project.txt
 
 
 # Other
 # Other
 .DS_Store
 .DS_Store
+cmake-build-debug
 dist
 dist
 tmp
 tmp
 
 
+# External native builds
+.externalNativeBuild
+
 # VP9 extension
 # VP9 extension
 extensions/vp9/src/main/jni/libvpx
 extensions/vp9/src/main/jni/libvpx
 extensions/vp9/src/main/jni/libvpx_android_configs
 extensions/vp9/src/main/jni/libvpx_android_configs
@@ -61,3 +65,4 @@ extensions/cronet/jniLibs/*
 !extensions/cronet/jniLibs/README.md
 !extensions/cronet/jniLibs/README.md
 extensions/cronet/libs/*
 extensions/cronet/libs/*
 !extensions/cronet/libs/README.md
 !extensions/cronet/libs/README.md
+

.hgignore

+# Mercurial's .hgignore files can only be used in the root directory.
+# You can still apply these rules by adding
+# include:path/to/this/directory/.hgignore to the top-level .hgignore file.
+
+# Ensure same syntax as in .gitignore can be used
+syntax:glob
+
+# Android generated
+bin
+gen
+libs
+obj
+lint.xml
+
+# IntelliJ IDEA
+.idea
+*.iml
+*.ipr
+*.iws
+classes
+gen-external-apklibs
+
+# Eclipse
+.project
+.classpath
+.settings
+.checkstyle
+.cproject
+
+# Gradle
+.gradle
+build
+buildout
+out
+
+# Maven
+target
+release.properties
+pom.xml.*
+
+# Ant
+ant.properties
+local.properties
+proguard.cfg
+proguard-project.txt
+
+# Other
+.DS_Store
+cmake-build-debug
+dist
+tmp
+
+# VP9 extension
+extensions/vp9/src/main/jni/libvpx
+extensions/vp9/src/main/jni/libvpx_android_configs
+extensions/vp9/src/main/jni/libyuv
+
+# Opus extension
+extensions/opus/src/main/jni/libopus
+
+# FLAC extension
+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

CONTRIBUTING.md

@@ -16,9 +16,8 @@ all of the information requested in the issue template.
 ## Pull requests ##
 ## Pull requests ##
 
 
 We will also consider high quality pull requests. These should normally merge
 We will also consider high quality pull requests. These should normally merge
-into the `dev-vX` branch with the highest major version number. Bug fixes may
-be suitable for merging into older `dev-vX` branches. Before a pull request can
-be accepted you must submit a Contributor License Agreement, as described below.
+into the `dev-v2` branch. Before a pull request can be accepted you must submit
+a Contributor License Agreement, as described below.
 
 
 [dev]: https://github.com/google/ExoPlayer/tree/dev
 [dev]: https://github.com/google/ExoPlayer/tree/dev
 
 

ISSUE_TEMPLATE

-*** ISSUES THAT IGNORE THIS TEMPLATE WILL BE CLOSED WITHOUT INVESTIGATION ***
-
 Before filing an issue:
 Before filing an issue:
 -----------------------
 -----------------------
 - Search existing issues, including issues that are closed.
 - Search existing issues, including issues that are closed.
@@ -26,7 +24,7 @@ Describe how the issue can be reproduced, ideally using the ExoPlayer demo app.
 ### Link to test content
 ### Link to test content
 Provide a link to media that reproduces the issue. If you don't wish to post it
 Provide a link to media that reproduces the issue. If you don't wish to post it
 publicly, please submit the issue, then email the link to
 publicly, please submit the issue, then email the link to
-dev.exoplayer@gmail.com including the issue number in the subject line.
+dev.exoplayer@gmail.com using a subject in the format "Issue #1234".
 
 
 ### Version of ExoPlayer being used
 ### Version of ExoPlayer being used
 Specify the absolute version number. Avoid using terms such as "latest".
 Specify the absolute version number. Avoid using terms such as "latest".
@@ -40,5 +38,6 @@ devices and Android versions.
 Capture a full bug report using "adb bugreport". Output from "adb logcat" or a
 Capture a full bug report using "adb bugreport". Output from "adb logcat" or a
 log snippet is NOT sufficient. Please attach the captured bug report as a file.
 log snippet is NOT sufficient. Please attach the captured bug report as a file.
 If you don't wish to post it publicly, please submit the issue, then email the
 If you don't wish to post it publicly, please submit the issue, then email the
-bug report to dev.exoplayer@gmail.com including the issue number in the subject
-line.
+bug report to dev.exoplayer@gmail.com using a subject in the format
+"Issue #1234".
+

README.md

@@ -9,52 +9,65 @@ and extend, and can be updated through Play Store application updates.
 
 
 ## Documentation ##
 ## Documentation ##
 
 
-* The [developer guide][] provides a wealth of information to help you get
-  started.
-* The [class reference][] documents the ExoPlayer library classes.
+* The [developer guide][] provides a wealth of information.
+* The [class reference][] documents ExoPlayer classes.
 * The [release notes][] document the major changes in each release.
 * The [release notes][] document the major changes in each release.
+* Follow our [developer blog][] to keep up to date with the latest ExoPlayer
+  developments!
 
 
 [developer guide]: https://google.github.io/ExoPlayer/guide.html
 [developer guide]: https://google.github.io/ExoPlayer/guide.html
 [class reference]: https://google.github.io/ExoPlayer/doc/reference
 [class reference]: https://google.github.io/ExoPlayer/doc/reference
-[release notes]: https://github.com/google/ExoPlayer/blob/dev-v2/RELEASENOTES.md
+[release notes]: https://github.com/google/ExoPlayer/blob/release-v2/RELEASENOTES.md
+[developer blog]: https://medium.com/google-exoplayer
 
 
 ## Using ExoPlayer ##
 ## Using ExoPlayer ##
 
 
-ExoPlayer modules can be obtained via jCenter. It's also possible to clone the
+ExoPlayer modules can be obtained from JCenter. It's also possible to clone the
 repository and depend on the modules locally.
 repository and depend on the modules locally.
 
 
-### Via jCenter ###
+### From JCenter ###
 
 
 The easiest way to get started using ExoPlayer is to add it as a gradle
 The easiest way to get started using ExoPlayer is to add it as a gradle
-dependency. You need to make sure you have the jcenter repository included in
-the `build.gradle` file in the root of your project:
+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
 ```gradle
 repositories {
 repositories {
+    google()
     jcenter()
     jcenter()
 }
 }
 ```
 ```
 
 
-Next add a gradle compile dependency to the `build.gradle` file of your app
-module. The following will add a dependency to the full ExoPlayer library:
+Next add a dependency in the `build.gradle` file of your app module. The
+following will add a dependency to the full library:
 
 
 ```gradle
 ```gradle
-compile 'com.google.android.exoplayer:exoplayer:r2.X.X'
+implementation 'com.google.android.exoplayer:exoplayer:2.X.X'
 ```
 ```
 
 
-where `r2.X.X` is your preferred version. Alternatively, 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 plays DASH content:
+where `2.X.X` is your preferred version. 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 `android` section:
 
 
 ```gradle
 ```gradle
-compile 'com.google.android.exoplayer:exoplayer-core:r2.X.X'
-compile 'com.google.android.exoplayer:exoplayer-dash:r2.X.X'
-compile 'com.google.android.exoplayer:exoplayer-ui:r2.X.X'
+compileOptions {
+    targetCompatibility JavaVersion.VERSION_1_8
+}
+```
+
+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
+plays DASH content:
+
+```gradle
+implementation 'com.google.android.exoplayer:exoplayer-core:2.X.X'
+implementation 'com.google.android.exoplayer:exoplayer-dash:2.X.X'
+implementation 'com.google.android.exoplayer:exoplayer-ui:2.X.X'
 ```
 ```
 
 
-The available modules are listed below. Adding a dependency to the full
-ExoPlayer library is equivalent to adding dependencies on all of the modules
+The available library modules are listed below. Adding a dependency to the full
+library is equivalent to adding dependencies on all of the library modules
 individually.
 individually.
 
 
 * `exoplayer-core`: Core functionality (required).
 * `exoplayer-core`: Core functionality (required).
@@ -63,11 +76,16 @@ individually.
 * `exoplayer-smoothstreaming`: Support for SmoothStreaming content.
 * `exoplayer-smoothstreaming`: Support for SmoothStreaming content.
 * `exoplayer-ui`: UI components and resources for use with ExoPlayer.
 * `exoplayer-ui`: UI components and resources for use with ExoPlayer.
 
 
-For more details, see the project on [Bintray][]. For information about the
-latest versions, see the [Release notes][].
+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.
+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][].
 
 
+[extensions directory]: https://github.com/google/ExoPlayer/tree/release-v2/extensions/
 [Bintray]: https://bintray.com/google/exoplayer
 [Bintray]: https://bintray.com/google/exoplayer
-[Release notes]: https://github.com/google/ExoPlayer/blob/release-v2/RELEASENOTES.md
 
 
 ### Locally ###
 ### Locally ###
 
 
@@ -97,24 +115,18 @@ You should now see the ExoPlayer modules appear as part of your project. You can
 depend on them as you would on any other local module, for example:
 depend on them as you would on any other local module, for example:
 
 
 ```gradle
 ```gradle
-compile project(':exoplayer-library-core')
-compile project(':exoplayer-library-dash')
-compile project(':exoplayer-library-ui)
+implementation project(':exoplayer-library-core')
+implementation project(':exoplayer-library-dash')
+implementation project(':exoplayer-library-ui')
 ```
 ```
 
 
 ## Developing ExoPlayer ##
 ## Developing ExoPlayer ##
 
 
 #### Project branches ####
 #### Project branches ####
 
 
-  * The project has `dev-vX` and `release-vX` branches, where `X` is the major
-    version number.
-  * Most development work happens on the `dev-vX` branch with the highest major
-    version number. Pull requests should normally be made to this branch.
-  * Bug fixes may be submitted to older `dev-vX` branches. When doing this, the
-    same (or an equivalent) fix should also be submitted to all subsequent
-    `dev-vX` branches.
-  * A `release-vX` branch holds the most recent stable release for major version
-    `X`.
+* Development work happens on the `dev-v2` branch. Pull requests should
+  normally be made to this branch.
+* The `release-v2` branch holds the most recent release.
 
 
 #### Using Android Studio ####
 #### Using Android Studio ####
 
 

build.gradle

@@ -13,11 +13,13 @@
 // limitations under the License.
 // limitations under the License.
 buildscript {
 buildscript {
     repositories {
     repositories {
+        google()
         jcenter()
         jcenter()
     }
     }
     dependencies {
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.3'
-        classpath 'com.novoda:bintray-release:0.5.0'
+        classpath 'com.android.tools.build:gradle:3.1.4'
+        classpath 'com.novoda:bintray-release:0.8.1'
+        classpath 'com.google.android.gms:strict-version-matcher-plugin:1.0.3'
     }
     }
     // Workaround for the following test coverage issue. Remove when fixed:
     // Workaround for the following test coverage issue. Remove when fixed:
     // https://code.google.com/p/android/issues/detail?id=226070
     // https://code.google.com/p/android/issues/detail?id=226070
@@ -30,10 +32,8 @@ buildscript {
 }
 }
 allprojects {
 allprojects {
     repositories {
     repositories {
+        google()
         jcenter()
         jcenter()
-        maven {
-            url "https://maven.google.com"
-        }
     }
     }
     project.ext {
     project.ext {
         exoplayerPublishEnabled = true
         exoplayerPublishEnabled = true

constants.gradle

@@ -12,19 +12,27 @@
 // See the License for the specific language governing permissions and
 // See the License for the specific language governing permissions and
 // limitations under the License.
 // limitations under the License.
 project.ext {
 project.ext {
-    // Important: ExoPlayer specifies a minSdkVersion of 9 because various
+    // ExoPlayer version and version code.
+    releaseVersion = '2.9.2'
+    releaseVersionCode = 2009002
+    // Important: ExoPlayer specifies a minSdkVersion of 14 because various
     // components provided by the library may be of use on older devices.
     // components provided by the library may be of use on older devices.
     // However, please note that the core media playback functionality provided
     // However, please note that the core media playback functionality provided
     // by the library requires API level 16 or greater.
     // by the library requires API level 16 or greater.
-    minSdkVersion = 9
-    compileSdkVersion = 25
-    targetSdkVersion = 25
-    buildToolsVersion = '25'
+    minSdkVersion = 14
+    targetSdkVersion = 28
+    compileSdkVersion = 28
+    buildToolsVersion = '28.0.2'
     testSupportLibraryVersion = '0.5'
     testSupportLibraryVersion = '0.5'
-    supportLibraryVersion = '25.4.0'
+    supportLibraryVersion = '27.1.1'
     dexmakerVersion = '1.2'
     dexmakerVersion = '1.2'
     mockitoVersion = '1.9.5'
     mockitoVersion = '1.9.5'
-    releaseVersion = 'r2.4.4'
+    junitVersion = '4.12'
+    truthVersion = '0.39'
+    robolectricVersion = '3.7.1'
+    autoValueVersion = '1.6'
+    checkerframeworkVersion = '2.5.0'
+    testRunnerVersion = '1.1.0-alpha3'
     modulePrefix = ':'
     modulePrefix = ':'
     if (gradle.ext.has('exoplayerModulePrefix')) {
     if (gradle.ext.has('exoplayerModulePrefix')) {
         modulePrefix += gradle.ext.exoplayerModulePrefix
         modulePrefix += gradle.ext.exoplayerModulePrefix

core_settings.gradle

@@ -24,15 +24,20 @@ include modulePrefix + 'library-hls'
 include modulePrefix + 'library-smoothstreaming'
 include modulePrefix + 'library-smoothstreaming'
 include modulePrefix + 'library-ui'
 include modulePrefix + 'library-ui'
 include modulePrefix + 'testutils'
 include modulePrefix + 'testutils'
+include modulePrefix + 'testutils-robolectric'
 include modulePrefix + 'extension-ffmpeg'
 include modulePrefix + 'extension-ffmpeg'
 include modulePrefix + 'extension-flac'
 include modulePrefix + 'extension-flac'
 include modulePrefix + 'extension-gvr'
 include modulePrefix + 'extension-gvr'
 include modulePrefix + 'extension-ima'
 include modulePrefix + 'extension-ima'
+include modulePrefix + 'extension-cast'
+include modulePrefix + 'extension-cronet'
 include modulePrefix + 'extension-mediasession'
 include modulePrefix + 'extension-mediasession'
 include modulePrefix + 'extension-okhttp'
 include modulePrefix + 'extension-okhttp'
 include modulePrefix + 'extension-opus'
 include modulePrefix + 'extension-opus'
 include modulePrefix + 'extension-vp9'
 include modulePrefix + 'extension-vp9'
 include modulePrefix + 'extension-rtmp'
 include modulePrefix + 'extension-rtmp'
+include modulePrefix + 'extension-leanback'
+include modulePrefix + 'extension-jobdispatcher'
 
 
 project(modulePrefix + 'library').projectDir = new File(rootDir, 'library/all')
 project(modulePrefix + 'library').projectDir = new File(rootDir, 'library/all')
 project(modulePrefix + 'library-core').projectDir = new File(rootDir, 'library/core')
 project(modulePrefix + 'library-core').projectDir = new File(rootDir, 'library/core')
@@ -41,18 +46,17 @@ project(modulePrefix + 'library-hls').projectDir = new File(rootDir, 'library/hl
 project(modulePrefix + 'library-smoothstreaming').projectDir = new File(rootDir, 'library/smoothstreaming')
 project(modulePrefix + 'library-smoothstreaming').projectDir = new File(rootDir, 'library/smoothstreaming')
 project(modulePrefix + 'library-ui').projectDir = new File(rootDir, 'library/ui')
 project(modulePrefix + 'library-ui').projectDir = new File(rootDir, 'library/ui')
 project(modulePrefix + 'testutils').projectDir = new File(rootDir, 'testutils')
 project(modulePrefix + 'testutils').projectDir = new File(rootDir, 'testutils')
+project(modulePrefix + 'testutils-robolectric').projectDir = new File(rootDir, 'testutils_robolectric')
 project(modulePrefix + 'extension-ffmpeg').projectDir = new File(rootDir, 'extensions/ffmpeg')
 project(modulePrefix + 'extension-ffmpeg').projectDir = new File(rootDir, 'extensions/ffmpeg')
 project(modulePrefix + 'extension-flac').projectDir = new File(rootDir, 'extensions/flac')
 project(modulePrefix + 'extension-flac').projectDir = new File(rootDir, 'extensions/flac')
 project(modulePrefix + 'extension-gvr').projectDir = new File(rootDir, 'extensions/gvr')
 project(modulePrefix + 'extension-gvr').projectDir = new File(rootDir, 'extensions/gvr')
 project(modulePrefix + 'extension-ima').projectDir = new File(rootDir, 'extensions/ima')
 project(modulePrefix + 'extension-ima').projectDir = new File(rootDir, 'extensions/ima')
+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-mediasession').projectDir = new File(rootDir, 'extensions/mediasession')
 project(modulePrefix + 'extension-okhttp').projectDir = new File(rootDir, 'extensions/okhttp')
 project(modulePrefix + 'extension-okhttp').projectDir = new File(rootDir, 'extensions/okhttp')
 project(modulePrefix + 'extension-opus').projectDir = new File(rootDir, 'extensions/opus')
 project(modulePrefix + 'extension-opus').projectDir = new File(rootDir, 'extensions/opus')
 project(modulePrefix + 'extension-vp9').projectDir = new File(rootDir, 'extensions/vp9')
 project(modulePrefix + 'extension-vp9').projectDir = new File(rootDir, 'extensions/vp9')
 project(modulePrefix + 'extension-rtmp').projectDir = new File(rootDir, 'extensions/rtmp')
 project(modulePrefix + 'extension-rtmp').projectDir = new File(rootDir, 'extensions/rtmp')
-
-if (gradle.ext.has('exoplayerIncludeCronetExtension')
-        && gradle.ext.exoplayerIncludeCronetExtension) {
-    include modulePrefix + 'extension-cronet'
-    project(modulePrefix + 'extension-cronet').projectDir = new File(rootDir, 'extensions/cronet')
-}
+project(modulePrefix + 'extension-leanback').projectDir = new File(rootDir, 'extensions/leanback')
+project(modulePrefix + 'extension-jobdispatcher').projectDir = new File(rootDir, 'extensions/jobdispatcher')

demo/src/main/java/com/google/android/exoplayer2/demo/DemoApplication.java

-/*
- * Copyright (C) 2016 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://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.
- */
-package com.google.android.exoplayer2.demo;
-
-import android.app.Application;
-import com.google.android.exoplayer2.upstream.DataSource;
-import com.google.android.exoplayer2.upstream.DefaultBandwidthMeter;
-import com.google.android.exoplayer2.upstream.DefaultDataSourceFactory;
-import com.google.android.exoplayer2.upstream.DefaultHttpDataSourceFactory;
-import com.google.android.exoplayer2.upstream.HttpDataSource;
-import com.google.android.exoplayer2.util.Util;
-
-/**
- * Placeholder application to facilitate overriding Application methods for debugging and testing.
- */
-public class DemoApplication extends Application {
-
-  protected String userAgent;
-
-  @Override
-  public void onCreate() {
-    super.onCreate();
-    userAgent = Util.getUserAgent(this, "ExoPlayerDemo");
-  }
-
-  public DataSource.Factory buildDataSourceFactory(DefaultBandwidthMeter bandwidthMeter) {
-    return new DefaultDataSourceFactory(this, bandwidthMeter,
-        buildHttpDataSourceFactory(bandwidthMeter));
-  }
-
-  public HttpDataSource.Factory buildHttpDataSourceFactory(DefaultBandwidthMeter bandwidthMeter) {
-    return new DefaultHttpDataSourceFactory(userAgent, bandwidthMeter);
-  }
-
-  public boolean useExtensionRenderers() {
-    return BuildConfig.FLAVOR.equals("withExtensions");
-  }
-
-}

demo/src/main/java/com/google/android/exoplayer2/demo/DemoUtil.java

-/*
- * Copyright (C) 2017 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://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.
- */
-package com.google.android.exoplayer2.demo;
-
-import android.text.TextUtils;
-import com.google.android.exoplayer2.Format;
-import com.google.android.exoplayer2.util.MimeTypes;
-import java.util.Locale;
-
-/**
- * Utility methods for demo application.
- */
-/*package*/ final class DemoUtil {
-
-  /**
-   * Builds a track name for display.
-   *
-   * @param format {@link Format} of the track.
-   * @return a generated name specific to the track.
-   */
-  public static String buildTrackName(Format format) {
-    String trackName;
-    if (MimeTypes.isVideo(format.sampleMimeType)) {
-      trackName = joinWithSeparator(joinWithSeparator(joinWithSeparator(
-          buildResolutionString(format), buildBitrateString(format)), buildTrackIdString(format)),
-          buildSampleMimeTypeString(format));
-    } else if (MimeTypes.isAudio(format.sampleMimeType)) {
-      trackName = joinWithSeparator(joinWithSeparator(joinWithSeparator(joinWithSeparator(
-          buildLanguageString(format), buildAudioPropertyString(format)),
-          buildBitrateString(format)), buildTrackIdString(format)),
-          buildSampleMimeTypeString(format));
-    } else {
-      trackName = joinWithSeparator(joinWithSeparator(joinWithSeparator(buildLanguageString(format),
-          buildBitrateString(format)), buildTrackIdString(format)),
-          buildSampleMimeTypeString(format));
-    }
-    return trackName.length() == 0 ? "unknown" : trackName;
-  }
-
-  private static String buildResolutionString(Format format) {
-    return format.width == Format.NO_VALUE || format.height == Format.NO_VALUE
-        ? "" : format.width + "x" + format.height;
-  }
-
-  private static String buildAudioPropertyString(Format format) {
-    return format.channelCount == Format.NO_VALUE || format.sampleRate == Format.NO_VALUE
-        ? "" : format.channelCount + "ch, " + format.sampleRate + "Hz";
-  }
-
-  private static String buildLanguageString(Format format) {
-    return TextUtils.isEmpty(format.language) || "und".equals(format.language) ? ""
-        : format.language;
-  }
-
-  private static String buildBitrateString(Format format) {
-    return format.bitrate == Format.NO_VALUE ? ""
-        : String.format(Locale.US, "%.2fMbit", format.bitrate / 1000000f);
-  }
-
-  private static String joinWithSeparator(String first, String second) {
-    return first.length() == 0 ? second : (second.length() == 0 ? first : first + ", " + second);
-  }
-
-  private static String buildTrackIdString(Format format) {
-    return format.id == null ? "" : ("id:" + format.id);
-  }
-
-  private static String buildSampleMimeTypeString(Format format) {
-    return format.sampleMimeType == null ? "" : format.sampleMimeType;
-  }
-
-  private DemoUtil() {}
-}

demos/README.md

+# ExoPlayer demos #
+
+This directory contains applications that demonstrate how to use ExoPlayer.
+Browse the individual demos and their READMEs to learn more.

demos/cast/README.md

+# Cast demo application #
+
+This folder contains a demo application that showcases ExoPlayer integration
+with Google Cast.

demos/cast/build.gradle

+// Copyright (C) 2017 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://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: '../../constants.gradle'
+apply plugin: 'com.android.application'
+
+android {
+    compileSdkVersion project.ext.compileSdkVersion
+    buildToolsVersion project.ext.buildToolsVersion
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
+    defaultConfig {
+        versionName project.ext.releaseVersion
+        versionCode project.ext.releaseVersionCode
+        minSdkVersion 16
+        targetSdkVersion project.ext.targetSdkVersion
+    }
+
+    buildTypes {
+        release {
+            shrinkResources true
+            minifyEnabled true
+            proguardFiles = [
+                "proguard-rules.txt",
+                getDefaultProguardFile('proguard-android.txt')
+            ]
+        }
+        debug {
+            jniDebuggable = true
+        }
+    }
+
+    lintOptions {
+        // The demo app does not have translations.
+        disable 'MissingTranslation'
+    }
+
+}
+
+dependencies {
+    implementation project(modulePrefix + 'library-core')
+    implementation project(modulePrefix + 'library-dash')
+    implementation project(modulePrefix + 'library-hls')
+    implementation project(modulePrefix + 'library-smoothstreaming')
+    implementation project(modulePrefix + 'library-ui')
+    implementation project(modulePrefix + 'extension-cast')
+    implementation 'com.android.support:support-v4:' + supportLibraryVersion
+    implementation 'com.android.support:appcompat-v7:' + supportLibraryVersion
+    implementation 'com.android.support:recyclerview-v7:' + supportLibraryVersion
+}
+
+apply plugin: 'com.google.android.gms.strict-version-matcher-plugin'

demos/cast/proguard-rules.txt

+# Proguard rules specific to the Cast demo app.
+
+# Accessed via menu.xml
+-keep class android.support.v7.app.MediaRouteActionProvider {
+  *;
+}

demos/cast/src/main/AndroidManifest.xml

+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2017 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://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.
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.google.android.exoplayer2.castdemo">
+
+  <uses-permission android:name="android.permission.INTERNET"/>
+  <uses-sdk/>
+
+  <application android:label="@string/application_name" android:icon="@mipmap/ic_launcher"
+      android:largeHeap="true" android:allowBackup="false">
+
+    <meta-data android:name="com.google.android.gms.cast.framework.OPTIONS_PROVIDER_CLASS_NAME"
+        android:value="com.google.android.exoplayer2.ext.cast.DefaultCastOptionsProvider" />
+
+    <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">
+      <intent-filter>
+        <action android:name="android.intent.action.MAIN"/>
+        <category android:name="android.intent.category.LAUNCHER"/>
+      </intent-filter>
+    </activity>
+
+  </application>
+
+</manifest>

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

+/*
+ * Copyright (C) 2017 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://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.
+ */
+package com.google.android.exoplayer2.castdemo;
+
+import com.google.android.exoplayer2.ext.cast.MediaItem;
+import com.google.android.exoplayer2.util.MimeTypes;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+/** Utility methods and constants for the Cast demo application. */
+/* package */ final class DemoUtil {
+
+  public static final String MIME_TYPE_DASH = MimeTypes.APPLICATION_MPD;
+  public static final String MIME_TYPE_HLS = MimeTypes.APPLICATION_M3U8;
+  public static final String MIME_TYPE_SS = MimeTypes.APPLICATION_SS;
+  public static final String MIME_TYPE_VIDEO_MP4 = MimeTypes.VIDEO_MP4;
+
+  /** The list of samples available in the cast demo app. */
+  public static final List<MediaItem> SAMPLES;
+
+  static {
+    // App samples.
+    ArrayList<MediaItem> samples = new ArrayList<>();
+    MediaItem.Builder sampleBuilder = new MediaItem.Builder();
+
+    samples.add(
+        sampleBuilder
+            .setTitle("DASH (clear,MP4,H264)")
+            .setMimeType(MIME_TYPE_DASH)
+            .setMedia("https://storage.googleapis.com/wvmedia/clear/h264/tears/tears.mpd")
+            .buildAndClear());
+
+    samples.add(
+        sampleBuilder
+            .setTitle("Tears of Steel (HLS)")
+            .setMimeType(MIME_TYPE_HLS)
+            .setMedia(
+                "https://commondatastorage.googleapis.com/gtv-videos-bucket/CastVideos/"
+                    + "hls/TearsOfSteel.m3u8")
+            .buildAndClear());
+
+    samples.add(
+        sampleBuilder
+            .setTitle("HLS Basic (TS)")
+            .setMimeType(MIME_TYPE_HLS)
+            .setMedia(
+                "https://devstreaming-cdn.apple.com/videos/streaming/examples/bipbop_4x3"
+                    + "/bipbop_4x3_variant.m3u8")
+            .buildAndClear());
+
+    samples.add(
+        sampleBuilder
+            .setTitle("Dizzy (MP4)")
+            .setMimeType(MIME_TYPE_VIDEO_MP4)
+            .setMedia("https://html5demos.com/assets/dizzy.mp4")
+            .buildAndClear());
+    SAMPLES = Collections.unmodifiableList(samples);
+  }
+
+  private DemoUtil() {}
+}

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

+/*
+ * Copyright (C) 2017 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://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.
+ */
+package com.google.android.exoplayer2.castdemo;
+
+import android.content.Context;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v4.graphics.ColorUtils;
+import android.support.v7.app.AlertDialog;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.support.v7.widget.RecyclerView.ViewHolder;
+import android.support.v7.widget.helper.ItemTouchHelper;
+import android.view.KeyEvent;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.view.ViewGroup;
+import android.widget.ArrayAdapter;
+import android.widget.ListView;
+import android.widget.TextView;
+import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.SimpleExoPlayer;
+import com.google.android.exoplayer2.ext.cast.MediaItem;
+import com.google.android.exoplayer2.ui.PlayerControlView;
+import com.google.android.exoplayer2.ui.PlayerView;
+import com.google.android.gms.cast.CastMediaControlIntent;
+import com.google.android.gms.cast.framework.CastButtonFactory;
+import com.google.android.gms.cast.framework.CastContext;
+
+/**
+ * An activity that plays video using {@link SimpleExoPlayer} and supports casting using ExoPlayer's
+ * Cast extension.
+ */
+public class MainActivity extends AppCompatActivity
+    implements OnClickListener, PlayerManager.QueuePositionListener {
+
+  private PlayerView localPlayerView;
+  private PlayerControlView castControlView;
+  private PlayerManager playerManager;
+  private RecyclerView mediaQueueList;
+  private MediaQueueListAdapter mediaQueueListAdapter;
+  private CastContext castContext;
+
+  // Activity lifecycle methods.
+
+  @Override
+  public void onCreate(Bundle savedInstanceState) {
+    super.onCreate(savedInstanceState);
+    // Getting the cast context later than onStart can cause device discovery not to take place.
+    castContext = CastContext.getSharedInstance(this);
+
+    setContentView(R.layout.main_activity);
+
+    localPlayerView = findViewById(R.id.local_player_view);
+    localPlayerView.requestFocus();
+
+    castControlView = findViewById(R.id.cast_control_view);
+
+    mediaQueueList = findViewById(R.id.sample_list);
+    ItemTouchHelper helper = new ItemTouchHelper(new RecyclerViewCallback());
+    helper.attachToRecyclerView(mediaQueueList);
+    mediaQueueList.setLayoutManager(new LinearLayoutManager(this));
+    mediaQueueList.setHasFixedSize(true);
+    mediaQueueListAdapter = new MediaQueueListAdapter();
+
+    findViewById(R.id.add_sample_button).setOnClickListener(this);
+  }
+
+  @Override
+  public boolean onCreateOptionsMenu(Menu menu) {
+    super.onCreateOptionsMenu(menu);
+    getMenuInflater().inflate(R.menu.menu, menu);
+    CastButtonFactory.setUpMediaRouteButton(this, menu, R.id.media_route_menu_item);
+    return true;
+  }
+
+  @Override
+  public void onResume() {
+    super.onResume();
+    String applicationId = castContext.getCastOptions().getReceiverApplicationId();
+    switch (applicationId) {
+      case CastMediaControlIntent.DEFAULT_MEDIA_RECEIVER_APPLICATION_ID:
+        playerManager =
+            DefaultReceiverPlayerManager.createPlayerManager(
+                /* queuePositionListener= */ this,
+                localPlayerView,
+                castControlView,
+                /* context= */ this,
+                castContext);
+        break;
+      default:
+        throw new IllegalStateException("Illegal receiver app id: " + applicationId);
+    }
+    mediaQueueList.setAdapter(mediaQueueListAdapter);
+  }
+
+  @Override
+  public void onPause() {
+    super.onPause();
+    mediaQueueListAdapter.notifyItemRangeRemoved(0, mediaQueueListAdapter.getItemCount());
+    mediaQueueList.setAdapter(null);
+    playerManager.release();
+    playerManager = null;
+  }
+
+  // Activity input.
+
+  @Override
+  public boolean dispatchKeyEvent(KeyEvent event) {
+    // If the event was not handled then see if the player view can handle it.
+    return super.dispatchKeyEvent(event) || playerManager.dispatchKeyEvent(event);
+  }
+
+  @Override
+  public void onClick(View view) {
+    new AlertDialog.Builder(this).setTitle(R.string.sample_list_dialog_title)
+        .setView(buildSampleListView()).setPositiveButton(android.R.string.ok, null).create()
+        .show();
+  }
+
+  // PlayerManager.QueuePositionListener implementation.
+
+  @Override
+  public void onQueuePositionChanged(int previousIndex, int newIndex) {
+    if (previousIndex != C.INDEX_UNSET) {
+      mediaQueueListAdapter.notifyItemChanged(previousIndex);
+    }
+    if (newIndex != C.INDEX_UNSET) {
+      mediaQueueListAdapter.notifyItemChanged(newIndex);
+    }
+  }
+
+  // Internal methods.
+
+  private View buildSampleListView() {
+    View dialogList = getLayoutInflater().inflate(R.layout.sample_list, null);
+    ListView sampleList = dialogList.findViewById(R.id.sample_list);
+    sampleList.setAdapter(new SampleListAdapter(this));
+    sampleList.setOnItemClickListener(
+        (parent, view, position, id) -> {
+          playerManager.addItem(DemoUtil.SAMPLES.get(position));
+          mediaQueueListAdapter.notifyItemInserted(playerManager.getMediaQueueSize() - 1);
+        });
+    return dialogList;
+  }
+
+  // Internal classes.
+
+  private class QueueItemViewHolder extends RecyclerView.ViewHolder implements OnClickListener {
+
+    public final TextView textView;
+
+    public QueueItemViewHolder(TextView textView) {
+      super(textView);
+      this.textView = textView;
+      textView.setOnClickListener(this);
+    }
+
+    @Override
+    public void onClick(View v) {
+      playerManager.selectQueueItem(getAdapterPosition());
+    }
+
+  }
+
+  private class MediaQueueListAdapter extends RecyclerView.Adapter<QueueItemViewHolder> {
+
+    @Override
+    public QueueItemViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+      TextView v = (TextView) LayoutInflater.from(parent.getContext())
+          .inflate(android.R.layout.simple_list_item_1, parent, false);
+      return new QueueItemViewHolder(v);
+    }
+
+    @Override
+    public void onBindViewHolder(QueueItemViewHolder holder, int position) {
+      TextView view = holder.textView;
+      view.setText(playerManager.getItem(position).title);
+      // TODO: Solve coloring using the theme's ColorStateList.
+      view.setTextColor(ColorUtils.setAlphaComponent(view.getCurrentTextColor(),
+           position == playerManager.getCurrentItemIndex() ? 255 : 100));
+    }
+
+    @Override
+    public int getItemCount() {
+      return playerManager.getMediaQueueSize();
+    }
+
+  }
+
+  private class RecyclerViewCallback extends ItemTouchHelper.SimpleCallback {
+
+    private int draggingFromPosition;
+    private int draggingToPosition;
+
+    public RecyclerViewCallback() {
+      super(ItemTouchHelper.UP | ItemTouchHelper.DOWN, ItemTouchHelper.START | ItemTouchHelper.END);
+      draggingFromPosition = C.INDEX_UNSET;
+      draggingToPosition = C.INDEX_UNSET;
+    }
+
+    @Override
+    public boolean onMove(RecyclerView list, RecyclerView.ViewHolder origin,
+        RecyclerView.ViewHolder target) {
+      int fromPosition = origin.getAdapterPosition();
+      int toPosition = target.getAdapterPosition();
+      if (draggingFromPosition == C.INDEX_UNSET) {
+        // A drag has started, but changes to the media queue will be reflected in clearView().
+        draggingFromPosition = fromPosition;
+      }
+      draggingToPosition = toPosition;
+      mediaQueueListAdapter.notifyItemMoved(fromPosition, toPosition);
+      return true;
+    }
+
+    @Override
+    public void onSwiped(RecyclerView.ViewHolder viewHolder, int direction) {
+      int position = viewHolder.getAdapterPosition();
+      if (playerManager.removeItem(position)) {
+        mediaQueueListAdapter.notifyItemRemoved(position);
+      }
+    }
+
+    @Override
+    public void clearView(RecyclerView recyclerView, ViewHolder viewHolder) {
+      super.clearView(recyclerView, viewHolder);
+      if (draggingFromPosition != C.INDEX_UNSET) {
+        // A drag has ended. We reflect the media queue change in the player.
+        if (!playerManager.moveItem(draggingFromPosition, draggingToPosition)) {
+          // The move failed. The entire sequence of onMove calls since the drag started needs to be
+          // invalidated.
+          mediaQueueListAdapter.notifyDataSetChanged();
+        }
+      }
+      draggingFromPosition = C.INDEX_UNSET;
+      draggingToPosition = C.INDEX_UNSET;
+    }
+
+  }
+
+  private static final class SampleListAdapter extends ArrayAdapter<MediaItem> {
+
+    public SampleListAdapter(Context context) {
+      super(context, android.R.layout.simple_list_item_1, DemoUtil.SAMPLES);
+    }
+
+    @Override
+    public View getView(int position, @Nullable View convertView, ViewGroup parent) {
+      TextView view = (TextView) super.getView(position, convertView, parent);
+      MediaItem sample = DemoUtil.SAMPLES.get(position);
+      view.setText(sample.title);
+      return view;
+    }
+  }
+
+}

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

+/*
+ * Copyright (C) 2018 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://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.
+ */
+package com.google.android.exoplayer2.castdemo;
+
+import android.view.KeyEvent;
+import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.ext.cast.MediaItem;
+
+/** Manages the players in the Cast demo app. */
+interface PlayerManager {
+
+  /** Listener for changes in the media queue playback position. */
+  interface QueuePositionListener {
+
+    /**
+     * Called when the currently played item of the media queue changes.
+     */
+    void onQueuePositionChanged(int previousIndex, int newIndex);
+
+  }
+
+  /** Redirects the given {@code keyEvent} to the active player. */
+  boolean dispatchKeyEvent(KeyEvent keyEvent);
+
+  /** Appends the given {@link MediaItem} to the media queue. */
+  void addItem(MediaItem mediaItem);
+
+  /** Returns the number of items in the media queue. */
+  int getMediaQueueSize();
+
+  /** Selects the item at the given position for playback. */
+  void selectQueueItem(int position);
+
+  /**
+   * Returns the position of the item currently being played, or {@link C#INDEX_UNSET} if no item is
+   * being played.
+   */
+  int getCurrentItemIndex();
+
+  /** Returns the {@link MediaItem} at the given {@code position}. */
+  MediaItem getItem(int position);
+
+  /** Moves the item at position {@code from} to position {@code to}. */
+  boolean moveItem(int from, int to);
+
+  /** Removes the item at position {@code index}. */
+  boolean removeItem(int index);
+
+  /** Releases any acquired resources. */
+  void release();
+}

extensions/mediasession/src/main/res/values-kn-rIN/strings.xml → demos/cast/src/main/res/drawable/ic_add_circle_white_24dp.xml

-<?xml version="1.0"?>
-<!--
-     Copyright (C) 2016 The Android Open Source Project
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2017 The Android Open Source Project
 
 
      Licensed under the Apache License, Version 2.0 (the "License");
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
      you may not use this file except in compliance with the License.
@@ -14,8 +13,8 @@
      See the License for the specific language governing permissions and
      See the License for the specific language governing permissions and
      limitations under the License.
      limitations under the License.
 -->
 -->
-<resources>
-  <string name="exo_media_action_repeat_all_description">"ಎಲ್ಲವನ್ನು ಪುನರಾವರ್ತಿಸಿ"</string>
-  <string name="exo_media_action_repeat_off_description">"ಯಾವುದನ್ನೂ ಪುನರಾವರ್ತಿಸಬೇಡಿ"</string>
-  <string name="exo_media_action_repeat_one_description">"ಒಂದನ್ನು ಪುನರಾವರ್ತಿಸಿ"</string>
-</resources>
+<vector android:alpha="0.8" android:height="24dp" android:viewportHeight="24.0"
+    android:viewportWidth="24.0" android:width="24dp"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+  <path android:fillColor="#FFFFFF" android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM17,13h-4v4h-2v-4L7,13v-2h4L11,7h2v4h4v2z"/>
+</vector>

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

+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2017 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://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.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:keepScreenOn="true">
+  <com.google.android.exoplayer2.ui.PlayerView android:id="@+id/local_player_view"
+      android:layout_width="match_parent"
+      android:layout_height="0dp"
+      android:layout_weight="12"
+      app:repeat_toggle_modes="all|one"/>
+  <RelativeLayout android:layout_width="match_parent"
+      android:layout_height="0dp"
+      android:layout_weight="12">
+    <android.support.v7.widget.RecyclerView android:id="@+id/sample_list"
+        android:choiceMode="singleChoice"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:scrollbars="vertical"
+        android:fadeScrollbars="false"/>
+    <ImageButton android:id="@+id/add_sample_button"
+        android:background="@drawable/ic_add_circle_white_24dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentBottom="true"
+        android:padding="30dp"/>
+  </RelativeLayout>
+  <com.google.android.exoplayer2.ui.PlayerControlView android:id="@+id/cast_control_view"
+      android:layout_width="match_parent"
+      android:layout_height="0dp"
+      android:layout_weight="2"
+      android:visibility="gone"
+      app:repeat_toggle_modes="all|one"
+      app:show_timeout="-1"/>
+</LinearLayout>

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

+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2017 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://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.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent">
+
+  <ListView android:id="@+id/sample_list"
+      android:layout_width="match_parent"
+      android:layout_height="250dp"
+      android:fadeScrollbars="false"/>
+
+</LinearLayout>

demos/cast/src/main/res/menu/menu.xml

+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2017 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://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.
+-->
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+      xmlns:app="http://schemas.android.com/apk/res-auto">
+
+  <item
+      android:id="@+id/media_route_menu_item"
+      android:title="@string/media_route_menu_title"
+      app:actionProviderClass="android.support.v7.app.MediaRouteActionProvider"
+      app:showAsAction="always" />
+
+</menu>

extensions/mediasession/src/main/res/values-gl-rES/strings.xml → demos/cast/src/main/res/values/strings.xml

-<?xml version="1.0"?>
-<!--
-     Copyright (C) 2016 The Android Open Source Project
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2017 The Android Open Source Project
 
 
      Licensed under the Apache License, Version 2.0 (the "License");
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
      you may not use this file except in compliance with the License.
@@ -14,8 +13,13 @@
      See the License for the specific language governing permissions and
      See the License for the specific language governing permissions and
      limitations under the License.
      limitations under the License.
 -->
 -->
+
 <resources>
 <resources>
-  <string name="exo_media_action_repeat_all_description">"Repetir todo"</string>
-  <string name="exo_media_action_repeat_off_description">"Non repetir"</string>
-  <string name="exo_media_action_repeat_one_description">"Repetir un"</string>
+
+  <string name="application_name">Exo Cast Demo</string>
+
+  <string name="media_route_menu_title">Cast</string>
+
+  <string name="sample_list_dialog_title">Add samples</string>
+
 </resources>
 </resources>

demos/ima/README.md

+# IMA demo application #
+
+This folder contains a demo application that showcases ExoPlayer integration
+with the IMA SDK.

demo/build.gradle → demos/ima/build.gradle

-// Copyright (C) 2016 The Android Open Source Project
+// Copyright (C) 2017 The Android Open Source Project
 //
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // you may not use this file except in compliance with the License.
@@ -11,14 +11,21 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // See the License for the specific language governing permissions and
 // limitations under the License.
 // limitations under the License.
-apply from: '../constants.gradle'
+apply from: '../../constants.gradle'
 apply plugin: 'com.android.application'
 apply plugin: 'com.android.application'
 
 
 android {
 android {
     compileSdkVersion project.ext.compileSdkVersion
     compileSdkVersion project.ext.compileSdkVersion
     buildToolsVersion project.ext.buildToolsVersion
     buildToolsVersion project.ext.buildToolsVersion
 
 
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
     defaultConfig {
     defaultConfig {
+        versionName project.ext.releaseVersion
+        versionCode project.ext.releaseVersionCode
         minSdkVersion 16
         minSdkVersion 16
         targetSdkVersion project.ext.targetSdkVersion
         targetSdkVersion project.ext.targetSdkVersion
     }
     }
@@ -38,22 +45,16 @@ android {
         // The demo app does not have translations.
         // The demo app does not have translations.
         disable 'MissingTranslation'
         disable 'MissingTranslation'
     }
     }
-
-    productFlavors {
-        noExtensions
-        withExtensions
-    }
 }
 }
 
 
 dependencies {
 dependencies {
-    compile project(modulePrefix + 'library-core')
-    compile project(modulePrefix + 'library-dash')
-    compile project(modulePrefix + 'library-hls')
-    compile project(modulePrefix + 'library-smoothstreaming')
-    compile project(modulePrefix + 'library-ui')
-    withExtensionsCompile project(path: modulePrefix + 'extension-ffmpeg')
-    withExtensionsCompile project(path: modulePrefix + 'extension-flac')
-    withExtensionsCompile project(path: modulePrefix + 'extension-ima')
-    withExtensionsCompile project(path: modulePrefix + 'extension-opus')
-    withExtensionsCompile project(path: modulePrefix + 'extension-vp9')
+    implementation project(modulePrefix + 'library-core')
+    implementation project(modulePrefix + 'library-ui')
+    implementation project(modulePrefix + 'library-dash')
+    implementation project(modulePrefix + 'library-hls')
+    implementation project(modulePrefix + 'library-smoothstreaming')
+    implementation project(modulePrefix + 'extension-ima')
+    implementation 'com.android.support:support-annotations:' + supportLibraryVersion
 }
 }
+
+apply plugin: 'com.google.android.gms.strict-version-matcher-plugin'

demos/ima/src/main/AndroidManifest.xml

+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2017 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://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.
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.google.android.exoplayer2.imademo">
+
+  <uses-permission android:name="android.permission.INTERNET"/>
+  <uses-sdk/>
+
+  <application android:label="@string/application_name" android:icon="@mipmap/ic_launcher"
+      android:largeHeap="true" android:allowBackup="false">
+
+    <activity android:name="com.google.android.exoplayer2.imademo.MainActivity"
+        android:configChanges="keyboard|keyboardHidden|orientation|screenSize|screenLayout|smallestScreenSize|uiMode"
+        android:label="@string/application_name"
+        android:theme="@style/PlayerTheme">
+      <intent-filter>
+        <action android:name="android.intent.action.MAIN"/>
+        <category android:name="android.intent.category.LAUNCHER"/>
+      </intent-filter>
+    </activity>
+
+  </application>
+
+</manifest>

demos/ima/src/main/java/com/google/android/exoplayer2/imademo/MainActivity.java

+/*
+ * Copyright (C) 2017 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://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.
+ */
+package com.google.android.exoplayer2.imademo;
+
+import android.app.Activity;
+import android.os.Bundle;
+import com.google.android.exoplayer2.ExoPlayer;
+import com.google.android.exoplayer2.ui.PlayerView;
+
+/**
+ * Main Activity for the IMA plugin demo. {@link ExoPlayer} objects are created by
+ * {@link PlayerManager}, which this class instantiates.
+ */
+public final class MainActivity extends Activity {
+
+  private PlayerView playerView;
+  private PlayerManager player;
+
+  @Override
+  protected void onCreate(Bundle savedInstanceState) {
+    super.onCreate(savedInstanceState);
+    setContentView(R.layout.main_activity);
+    playerView = findViewById(R.id.player_view);
+    player = new PlayerManager(this);
+  }
+
+  @Override
+  public void onResume() {
+    super.onResume();
+    player.init(this, playerView);
+  }
+
+  @Override
+  public void onPause() {
+    super.onPause();
+    player.reset();
+  }
+
+  @Override
+  public void onDestroy() {
+    player.release();
+    super.onDestroy();
+  }
+
+}

demos/ima/src/main/java/com/google/android/exoplayer2/imademo/PlayerManager.java

+/*
+ * Copyright (C) 2017 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://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.
+ */
+package com.google.android.exoplayer2.imademo;
+
+import android.content.Context;
+import android.net.Uri;
+import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.C.ContentType;
+import com.google.android.exoplayer2.ExoPlayer;
+import com.google.android.exoplayer2.ExoPlayerFactory;
+import com.google.android.exoplayer2.SimpleExoPlayer;
+import com.google.android.exoplayer2.ext.ima.ImaAdsLoader;
+import com.google.android.exoplayer2.source.ExtractorMediaSource;
+import com.google.android.exoplayer2.source.MediaSource;
+import com.google.android.exoplayer2.source.ads.AdsMediaSource;
+import com.google.android.exoplayer2.source.dash.DashMediaSource;
+import com.google.android.exoplayer2.source.hls.HlsMediaSource;
+import com.google.android.exoplayer2.source.smoothstreaming.SsMediaSource;
+import com.google.android.exoplayer2.trackselection.AdaptiveTrackSelection;
+import com.google.android.exoplayer2.trackselection.DefaultTrackSelector;
+import com.google.android.exoplayer2.trackselection.TrackSelection;
+import com.google.android.exoplayer2.trackselection.TrackSelector;
+import com.google.android.exoplayer2.ui.PlayerView;
+import com.google.android.exoplayer2.upstream.DataSource;
+import com.google.android.exoplayer2.upstream.DefaultDataSourceFactory;
+import com.google.android.exoplayer2.util.Util;
+
+/** Manages the {@link ExoPlayer}, the IMA plugin and all video playback. */
+/* package */ final class PlayerManager implements AdsMediaSource.MediaSourceFactory {
+
+  private final ImaAdsLoader adsLoader;
+  private final DataSource.Factory dataSourceFactory;
+
+  private SimpleExoPlayer player;
+  private long contentPosition;
+
+  public PlayerManager(Context context) {
+    String adTag = context.getString(R.string.ad_tag_url);
+    adsLoader = new ImaAdsLoader(context, Uri.parse(adTag));
+    dataSourceFactory =
+        new DefaultDataSourceFactory(
+            context, Util.getUserAgent(context, context.getString(R.string.application_name)));
+  }
+
+  public void init(Context context, PlayerView playerView) {
+    // Create a default track selector.
+    TrackSelection.Factory videoTrackSelectionFactory = new AdaptiveTrackSelection.Factory();
+    TrackSelector trackSelector = new DefaultTrackSelector(videoTrackSelectionFactory);
+
+    // Create a player instance.
+    player = ExoPlayerFactory.newSimpleInstance(context, trackSelector);
+
+    // Bind the player to the view.
+    playerView.setPlayer(player);
+
+    // This is the MediaSource representing the content media (i.e. not the ad).
+    String contentUrl = context.getString(R.string.content_url);
+    MediaSource contentMediaSource = buildMediaSource(Uri.parse(contentUrl));
+
+    // Compose the content media source into a new AdsMediaSource with both ads and content.
+    MediaSource mediaSourceWithAds =
+        new AdsMediaSource(
+            contentMediaSource,
+            /* adMediaSourceFactory= */ this,
+            adsLoader,
+            playerView.getOverlayFrameLayout());
+
+    // Prepare the player with the source.
+    player.seekTo(contentPosition);
+    player.prepare(mediaSourceWithAds);
+    player.setPlayWhenReady(true);
+  }
+
+  public void reset() {
+    if (player != null) {
+      contentPosition = player.getContentPosition();
+      player.release();
+      player = null;
+    }
+  }
+
+  public void release() {
+    if (player != null) {
+      player.release();
+      player = null;
+    }
+    adsLoader.release();
+  }
+
+  // AdsMediaSource.MediaSourceFactory implementation.
+
+  @Override
+  public MediaSource createMediaSource(Uri uri) {
+    return buildMediaSource(uri);
+  }
+
+  @Override
+  public int[] getSupportedTypes() {
+    // IMA does not support Smooth Streaming ads.
+    return new int[] {C.TYPE_DASH, C.TYPE_HLS, C.TYPE_OTHER};
+  }
+
+  // Internal methods.
+
+  private MediaSource buildMediaSource(Uri uri) {
+    @ContentType int type = Util.inferContentType(uri);
+    switch (type) {
+      case C.TYPE_DASH:
+        return new DashMediaSource.Factory(dataSourceFactory).createMediaSource(uri);
+      case C.TYPE_SS:
+        return new SsMediaSource.Factory(dataSourceFactory).createMediaSource(uri);
+      case C.TYPE_HLS:
+        return new HlsMediaSource.Factory(dataSourceFactory).createMediaSource(uri);
+      case C.TYPE_OTHER:
+        return new ExtractorMediaSource.Factory(dataSourceFactory).createMediaSource(uri);
+      default:
+        throw new IllegalStateException("Unsupported type: " + type);
+    }
+  }
+
+}

extensions/mediasession/src/main/res/values-km-rKH/strings.xml → demos/ima/src/main/res/layout/main_activity.xml

-<?xml version="1.0"?>
-<!--
-     Copyright (C) 2016 The Android Open Source Project
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2017 The Android Open Source Project
 
 
      Licensed under the Apache License, Version 2.0 (the "License");
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
      you may not use this file except in compliance with the License.
@@ -14,8 +13,9 @@
      See the License for the specific language governing permissions and
      See the License for the specific language governing permissions and
      limitations under the License.
      limitations under the License.
 -->
 -->
-<resources>
-  <string name="exo_media_action_repeat_all_description">"ធ្វើ​ម្ដង​ទៀត​ទាំងអស់"</string>
-  <string name="exo_media_action_repeat_off_description">"មិន​ធ្វើ​ឡើង​វិញ"</string>
-  <string name="exo_media_action_repeat_one_description">"ធ្វើ​​ឡើងវិញ​ម្ដង"</string>
-</resources>
+<com.google.android.exoplayer2.ui.PlayerView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/player_view"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:keepScreenOn="true"/>

extensions/mediasession/src/main/res/values-az-rAZ/strings.xml → demos/ima/src/main/res/values/strings.xml

-<?xml version="1.0"?>
-<!--
-     Copyright (C) 2016 The Android Open Source Project
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2017 The Android Open Source Project
 
 
      Licensed under the Apache License, Version 2.0 (the "License");
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
      you may not use this file except in compliance with the License.
@@ -15,7 +14,11 @@
      limitations under the License.
      limitations under the License.
 -->
 -->
 <resources>
 <resources>
-  <string name="exo_media_action_repeat_all_description">"Bütün təkrarlayın"</string>
-  <string name="exo_media_action_repeat_one_description">"Təkrar bir"</string>
-  <string name="exo_media_action_repeat_off_description">"Heç bir təkrar"</string>
+
+  <string name="application_name">Exo IMA Demo</string>
+
+  <string name="content_url"><![CDATA[https://storage.googleapis.com/exoplayer-test-media-1/mkv/android-screens-lavf-56.36.100-aac-avc-main-1280x720.mkv]]></string>
+
+  <string name="ad_tag_url"><![CDATA[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=]]></string>
+
 </resources>
 </resources>

demo/src/main/res/values/styles.xml → demos/ima/src/main/res/values/styles.xml

 <?xml version="1.0" encoding="utf-8"?>
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
+<!-- Copyright (C) 2017 The Android Open Source Project
 
 
      Licensed under the Apache License, Version 2.0 (the "License");
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
      you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
      See the License for the specific language governing permissions and
      See the License for the specific language governing permissions and
      limitations under the License.
      limitations under the License.
 -->
 -->
-
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
 
 
   <style name="PlayerTheme" parent="android:Theme.Holo">
   <style name="PlayerTheme" parent="android:Theme.Holo">

demo/README.md → demos/main/README.md

-# Demo application #
+# ExoPlayer main demo #
 
 
-This folder contains a demo application that uses ExoPlayer to play a number
+This is the main ExoPlayer demo application. It uses ExoPlayer to play a number
 of test streams. It can be used as a starting point or reference project when
 of test streams. It can be used as a starting point or reference project when
 developing other applications that make use of the ExoPlayer library.
 developing other applications that make use of the ExoPlayer library.

demos/main/build.gradle

+// Copyright (C) 2016 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://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: '../../constants.gradle'
+apply plugin: 'com.android.application'
+
+android {
+    compileSdkVersion project.ext.compileSdkVersion
+    buildToolsVersion project.ext.buildToolsVersion
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
+    defaultConfig {
+        versionName project.ext.releaseVersion
+        versionCode project.ext.releaseVersionCode
+        minSdkVersion 16
+        targetSdkVersion project.ext.targetSdkVersion
+    }
+
+    buildTypes {
+        release {
+            shrinkResources true
+            minifyEnabled true
+            proguardFiles = [
+                "proguard-rules.txt",
+                getDefaultProguardFile('proguard-android.txt')
+            ]
+        }
+        debug {
+            jniDebuggable = true
+        }
+    }
+
+    lintOptions {
+        // The demo app does not have translations.
+        disable 'MissingTranslation'
+    }
+
+    flavorDimensions "extensions"
+
+    productFlavors {
+        noExtensions {
+            dimension "extensions"
+        }
+        withExtensions {
+            dimension "extensions"
+        }
+    }
+}
+
+dependencies {
+    implementation 'com.android.support:support-annotations:' + supportLibraryVersion
+    implementation project(modulePrefix + 'library-core')
+    implementation project(modulePrefix + 'library-dash')
+    implementation project(modulePrefix + 'library-hls')
+    implementation project(modulePrefix + 'library-smoothstreaming')
+    implementation project(modulePrefix + 'library-ui')
+    withExtensionsImplementation project(path: modulePrefix + 'extension-ffmpeg')
+    withExtensionsImplementation project(path: modulePrefix + 'extension-flac')
+    withExtensionsImplementation project(path: modulePrefix + 'extension-ima')
+    withExtensionsImplementation project(path: modulePrefix + 'extension-opus')
+    withExtensionsImplementation project(path: modulePrefix + 'extension-vp9')
+    withExtensionsImplementation project(path: modulePrefix + 'extension-rtmp')
+}
+
+apply plugin: 'com.google.android.gms.strict-version-matcher-plugin'

demos/main/proguard-rules.txt

+# Proguard rules specific to the main demo app.
+
+# Constructor accessed via reflection in PlayerActivity
+-dontnote com.google.android.exoplayer2.ext.ima.ImaAdsLoader
+-keepclassmembers class com.google.android.exoplayer2.ext.ima.ImaAdsLoader {
+  <init>(android.content.Context, android.net.Uri);
+}

demo/src/main/AndroidManifest.xml → demos/main/src/main/AndroidManifest.xml

@@ -15,15 +15,17 @@
 -->
 -->
 
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.google.android.exoplayer2.demo"
-    android:versionCode="2404"
-    android:versionName="2.4.4">
+    package="com.google.android.exoplayer2.demo">
 
 
   <uses-permission android:name="android.permission.INTERNET"/>
   <uses-permission android:name="android.permission.INTERNET"/>
+  <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
   <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
   <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+  <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
+  <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
+
   <uses-feature android:name="android.software.leanback" android:required="false"/>
   <uses-feature android:name="android.software.leanback" android:required="false"/>
   <uses-feature android:name="android.hardware.touchscreen" android:required="false"/>
   <uses-feature android:name="android.hardware.touchscreen" android:required="false"/>
-  <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="24"/>
+  <uses-sdk/>
 
 
   <application
   <application
       android:label="@string/application_name"
       android:label="@string/application_name"
@@ -75,6 +77,18 @@
       </intent-filter>
       </intent-filter>
     </activity>
     </activity>
 
 
+    <service android:name="com.google.android.exoplayer2.demo.DemoDownloadService"
+        android:exported="false">
+      <intent-filter>
+        <action android:name="com.google.android.exoplayer.downloadService.action.RESTART"/>
+        <category android:name="android.intent.category.DEFAULT"/>
+      </intent-filter>
+    </service>
+
+    <service android:name="com.google.android.exoplayer2.scheduler.PlatformScheduler$PlatformSchedulerService"
+        android:permission="android.permission.BIND_JOB_SERVICE"
+        android:exported="true"/>
+
   </application>
   </application>
 
 
 </manifest>
 </manifest>

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

+/*
+ * Copyright (C) 2016 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://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.
+ */
+package com.google.android.exoplayer2.demo;
+
+import android.app.Application;
+import com.google.android.exoplayer2.offline.DefaultDownloaderFactory;
+import com.google.android.exoplayer2.offline.DownloadManager;
+import com.google.android.exoplayer2.offline.DownloaderConstructorHelper;
+import com.google.android.exoplayer2.upstream.DataSource;
+import com.google.android.exoplayer2.upstream.DefaultDataSourceFactory;
+import com.google.android.exoplayer2.upstream.DefaultHttpDataSourceFactory;
+import com.google.android.exoplayer2.upstream.FileDataSourceFactory;
+import com.google.android.exoplayer2.upstream.HttpDataSource;
+import com.google.android.exoplayer2.upstream.cache.Cache;
+import com.google.android.exoplayer2.upstream.cache.CacheDataSource;
+import com.google.android.exoplayer2.upstream.cache.CacheDataSourceFactory;
+import com.google.android.exoplayer2.upstream.cache.NoOpCacheEvictor;
+import com.google.android.exoplayer2.upstream.cache.SimpleCache;
+import com.google.android.exoplayer2.util.Util;
+import java.io.File;
+
+/**
+ * Placeholder application to facilitate overriding Application methods for debugging and testing.
+ */
+public class DemoApplication extends Application {
+
+  private static final String DOWNLOAD_ACTION_FILE = "actions";
+  private static final String DOWNLOAD_TRACKER_ACTION_FILE = "tracked_actions";
+  private static final String DOWNLOAD_CONTENT_DIRECTORY = "downloads";
+  private static final int MAX_SIMULTANEOUS_DOWNLOADS = 2;
+
+  protected String userAgent;
+
+  private File downloadDirectory;
+  private Cache downloadCache;
+  private DownloadManager downloadManager;
+  private DownloadTracker downloadTracker;
+
+  @Override
+  public void onCreate() {
+    super.onCreate();
+    userAgent = Util.getUserAgent(this, "ExoPlayerDemo");
+  }
+
+  /** Returns a {@link DataSource.Factory}. */
+  public DataSource.Factory buildDataSourceFactory() {
+    DefaultDataSourceFactory upstreamFactory =
+        new DefaultDataSourceFactory(this, buildHttpDataSourceFactory());
+    return buildReadOnlyCacheDataSource(upstreamFactory, getDownloadCache());
+  }
+
+  /** Returns a {@link HttpDataSource.Factory}. */
+  public HttpDataSource.Factory buildHttpDataSourceFactory() {
+    return new DefaultHttpDataSourceFactory(userAgent);
+  }
+
+  /** Returns whether extension renderers should be used. */
+  public boolean useExtensionRenderers() {
+    return "withExtensions".equals(BuildConfig.FLAVOR);
+  }
+
+  public DownloadManager getDownloadManager() {
+    initDownloadManager();
+    return downloadManager;
+  }
+
+  public DownloadTracker getDownloadTracker() {
+    initDownloadManager();
+    return downloadTracker;
+  }
+
+  private synchronized void initDownloadManager() {
+    if (downloadManager == null) {
+      DownloaderConstructorHelper downloaderConstructorHelper =
+          new DownloaderConstructorHelper(getDownloadCache(), buildHttpDataSourceFactory());
+      downloadManager =
+          new DownloadManager(
+              new File(getDownloadDirectory(), DOWNLOAD_ACTION_FILE),
+              new DefaultDownloaderFactory(downloaderConstructorHelper),
+              MAX_SIMULTANEOUS_DOWNLOADS,
+              DownloadManager.DEFAULT_MIN_RETRY_COUNT);
+      downloadTracker =
+          new DownloadTracker(
+              /* context= */ this,
+              buildDataSourceFactory(),
+              new File(getDownloadDirectory(), DOWNLOAD_TRACKER_ACTION_FILE));
+      downloadManager.addListener(downloadTracker);
+    }
+  }
+
+  private synchronized Cache getDownloadCache() {
+    if (downloadCache == null) {
+      File downloadContentDirectory = new File(getDownloadDirectory(), DOWNLOAD_CONTENT_DIRECTORY);
+      downloadCache = new SimpleCache(downloadContentDirectory, new NoOpCacheEvictor());
+    }
+    return downloadCache;
+  }
+
+  private File getDownloadDirectory() {
+    if (downloadDirectory == null) {
+      downloadDirectory = getExternalFilesDir(null);
+      if (downloadDirectory == null) {
+        downloadDirectory = getFilesDir();
+      }
+    }
+    return downloadDirectory;
+  }
+
+  private static CacheDataSourceFactory buildReadOnlyCacheDataSource(
+      DefaultDataSourceFactory upstreamFactory, Cache cache) {
+    return new CacheDataSourceFactory(
+        cache,
+        upstreamFactory,
+        new FileDataSourceFactory(),
+        /* cacheWriteDataSinkFactory= */ null,
+        CacheDataSource.FLAG_IGNORE_CACHE_ON_ERROR,
+        /* eventListener= */ null);
+  }
+}

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

+/*
+ * Copyright (C) 2017 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://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.
+ */
+package com.google.android.exoplayer2.demo;
+
+import android.app.Notification;
+import com.google.android.exoplayer2.offline.DownloadManager;
+import com.google.android.exoplayer2.offline.DownloadManager.TaskState;
+import com.google.android.exoplayer2.offline.DownloadService;
+import com.google.android.exoplayer2.scheduler.PlatformScheduler;
+import com.google.android.exoplayer2.ui.DownloadNotificationUtil;
+import com.google.android.exoplayer2.util.NotificationUtil;
+import com.google.android.exoplayer2.util.Util;
+
+/** A service for downloading media. */
+public class DemoDownloadService extends DownloadService {
+
+  private static final String CHANNEL_ID = "download_channel";
+  private static final int JOB_ID = 1;
+  private static final int FOREGROUND_NOTIFICATION_ID = 1;
+
+  public DemoDownloadService() {
+    super(
+        FOREGROUND_NOTIFICATION_ID,
+        DEFAULT_FOREGROUND_NOTIFICATION_UPDATE_INTERVAL,
+        CHANNEL_ID,
+        R.string.exo_download_notification_channel_name);
+  }
+
+  @Override
+  protected DownloadManager getDownloadManager() {
+    return ((DemoApplication) getApplication()).getDownloadManager();
+  }
+
+  @Override
+  protected PlatformScheduler getScheduler() {
+    return Util.SDK_INT >= 21 ? new PlatformScheduler(this, JOB_ID) : null;
+  }
+
+  @Override
+  protected Notification getForegroundNotification(TaskState[] taskStates) {
+    return DownloadNotificationUtil.buildProgressNotification(
+        /* context= */ this,
+        R.drawable.exo_controls_play,
+        CHANNEL_ID,
+        /* contentIntent= */ null,
+        /* message= */ null,
+        taskStates);
+  }
+
+  @Override
+  protected void onTaskStateChanged(TaskState taskState) {
+    if (taskState.action.isRemoveAction) {
+      return;
+    }
+    Notification notification = null;
+    if (taskState.state == TaskState.STATE_COMPLETED) {
+      notification =
+          DownloadNotificationUtil.buildDownloadCompletedNotification(
+              /* context= */ this,
+              R.drawable.exo_controls_play,
+              CHANNEL_ID,
+              /* contentIntent= */ null,
+              Util.fromUtf8Bytes(taskState.action.data));
+    } else if (taskState.state == TaskState.STATE_FAILED) {
+      notification =
+          DownloadNotificationUtil.buildDownloadFailedNotification(
+              /* context= */ this,
+              R.drawable.exo_controls_play,
+              CHANNEL_ID,
+              /* contentIntent= */ null,
+              Util.fromUtf8Bytes(taskState.action.data));
+    }
+    int notificationId = FOREGROUND_NOTIFICATION_ID + 1 + taskState.taskId;
+    NotificationUtil.setNotification(this, notificationId, notification);
+  }
+}

demo/src/main/res/layout/player_activity.xml → demos/main/src/main/res/layout/player_activity.xml

@@ -20,7 +20,7 @@
     android:layout_height="match_parent"
     android:layout_height="match_parent"
     android:keepScreenOn="true">
     android:keepScreenOn="true">
 
 
-  <com.google.android.exoplayer2.ui.SimpleExoPlayerView android:id="@+id/player_view"
+  <com.google.android.exoplayer2.ui.PlayerView android:id="@+id/player_view"
       android:layout_width="match_parent"
       android:layout_width="match_parent"
       android:layout_height="match_parent"/>
       android:layout_height="match_parent"/>
 
 
@@ -42,15 +42,7 @@
         android:layout_width="match_parent"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
         android:orientation="horizontal"
-        android:visibility="gone">
-
-      <Button android:id="@+id/retry_button"
-          android:layout_width="wrap_content"
-          android:layout_height="wrap_content"
-          android:text="@string/retry"
-          android:visibility="gone"/>
-
-    </LinearLayout>
+        android:visibility="gone"/>
 
 
   </LinearLayout>
   </LinearLayout>
 
 

demos/main/src/main/res/layout/sample_list_item.xml

+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2018 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://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.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingStart="12dp"
+    android:paddingEnd="12dp"
+    android:gravity="center_vertical"
+    android:orientation="horizontal">
+
+  <TextView android:id="@+id/sample_title"
+      android:layout_width="0dp"
+      android:layout_height="wrap_content"
+      android:layout_weight="1"
+      android:gravity="center_vertical"
+      android:minHeight="?android:attr/listPreferredItemHeightSmall"
+      android:textAppearance="?android:attr/textAppearanceListItemSmall"/>
+
+  <ImageButton android:id="@+id/download_button"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:contentDescription="@string/exo_download_description"
+      android:background="@android:color/transparent"/>
+
+</LinearLayout>

extensions/mediasession/src/main/res/values-ka-rGE/strings.xml → demos/main/src/main/res/layout/start_download_dialog.xml

-<?xml version="1.0"?>
-<!--
-     Copyright (C) 2016 The Android Open Source Project
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2018 The Android Open Source Project
 
 
      Licensed under the Apache License, Version 2.0 (the "License");
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
      you may not use this file except in compliance with the License.
@@ -14,8 +13,7 @@
      See the License for the specific language governing permissions and
      See the License for the specific language governing permissions and
      limitations under the License.
      limitations under the License.
 -->
 -->
-<resources>
-  <string name="exo_media_action_repeat_all_description">"გამეორება ყველა"</string>
-  <string name="exo_media_action_repeat_off_description">"გაიმეორეთ არცერთი"</string>
-  <string name="exo_media_action_repeat_one_description">"გაიმეორეთ ერთი"</string>
-</resources>
+<ListView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/representation_list"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"/>

demos/main/src/main/res/menu/sample_chooser_menu.xml

+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2018 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://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.
+-->
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+  <item android:id="@+id/prefer_extension_decoders"
+    android:title="@string/prefer_extension_decoders"
+    android:showAsAction="never"
+    android:checkable="true"/>
+  <item android:id="@+id/random_abr"
+    android:title="@string/random_abr"
+    android:showAsAction="never"
+    android:checkable="true"/>
+</menu>

demo/src/main/res/values/strings.xml → demos/main/src/main/res/values/strings.xml

@@ -13,26 +13,19 @@
      See the License for the specific language governing permissions and
      See the License for the specific language governing permissions and
      limitations under the License.
      limitations under the License.
 -->
 -->
-
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 
 
   <string name="application_name">ExoPlayer</string>
   <string name="application_name">ExoPlayer</string>
 
 
-  <string name="video">Video</string>
-
-  <string name="audio">Audio</string>
-
-  <string name="text">Text</string>
-
-  <string name="retry">Retry</string>
+  <string name="unexpected_intent_action">Unexpected intent action: <xliff:g id="action">%1$s</xliff:g></string>
 
 
-  <string name="selection_disabled">Disabled</string>
+  <string name="error_cleartext_not_permitted">Cleartext traffic not permitted</string>
 
 
-  <string name="selection_default">Default</string>
+  <string name="error_generic">Playback failed</string>
 
 
-  <string name="unexpected_intent_action">Unexpected intent action: <xliff:g id="action">%1$s</xliff:g></string>
+  <string name="error_unrecognized_abr_algorithm">Unrecognized ABR algorithm</string>
 
 
-  <string name="enable_random_adaptation">Enable random adaptation</string>
+  <string name="error_unrecognized_stereo_mode">Unrecognized stereo mode</string>
 
 
   <string name="error_drm_not_supported">Protected content not supported on API levels below 18</string>
   <string name="error_drm_not_supported">Protected content not supported on API levels below 18</string>
 
 
@@ -58,4 +51,18 @@
 
 
   <string name="ima_not_loaded">Playing sample without ads, as the IMA extension was not loaded</string>
   <string name="ima_not_loaded">Playing sample without ads, as the IMA extension was not loaded</string>
 
 
+  <string name="download_start_error">Failed to start download</string>
+
+  <string name="download_playlist_unsupported">This demo app does not support downloading playlists</string>
+
+  <string name="download_drm_unsupported">This demo app does not support downloading protected content</string>
+
+  <string name="download_scheme_unsupported">This demo app only supports downloading http streams</string>
+
+  <string name="download_ads_unsupported">IMA does not support offline ads</string>
+
+  <string name="prefer_extension_decoders">Prefer extension decoders</string>
+
+  <string name="random_abr">Enable random ABR</string>
+
 </resources>
 </resources>

extensions/mediasession/src/main/res/values-kk-rKZ/strings.xml → demos/main/src/main/res/values/styles.xml

-<?xml version="1.0"?>
-<!--
-     Copyright (C) 2016 The Android Open Source Project
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2016 The Android Open Source Project
 
 
      Licensed under the Apache License, Version 2.0 (the "License");
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
      you may not use this file except in compliance with the License.
@@ -14,8 +13,15 @@
      See the License for the specific language governing permissions and
      See the License for the specific language governing permissions and
      limitations under the License.
      limitations under the License.
 -->
 -->
-<resources>
-  <string name="exo_media_action_repeat_all_description">"Барлығын қайталау"</string>
-  <string name="exo_media_action_repeat_off_description">"Ешқайсысын қайталамау"</string>
-  <string name="exo_media_action_repeat_one_description">"Біреуін қайталау"</string>
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
+
+  <style name="PlayerTheme" parent="android:Theme.Holo">
+    <item name="android:windowNoTitle">true</item>
+    <item name="android:windowBackground">@android:color/black</item>
+  </style>
+
+  <style name="PlayerTheme.Spherical">
+    <item name="surface_type">spherical_view</item>
+  </style>
+
 </resources>
 </resources>

extensions/README.md

+# ExoPlayer extensions #
+
+ExoPlayer extensions are modules that depend on external libraries to provide
+additional functionality. Browse the individual extensions and their READMEs to
+learn more.

extensions/cast/README.md

+# ExoPlayer Cast extension #
+
+## Description ##
+
+The cast extension is a [Player][] implementation that controls playback on a
+Cast receiver app.
+
+[Player]: https://google.github.io/ExoPlayer/doc/reference/index.html?com/google/android/exoplayer2/Player.html
+
+## Getting the extension ##
+
+The easiest way to use the extension is to add it as a gradle dependency:
+
+```gradle
+implementation 'com.google.android.exoplayer:extension-cast:2.X.X'
+```
+
+where `2.X.X` is the version, which must match the version of the ExoPlayer
+library being used.
+
+Alternatively, you can clone the ExoPlayer repository and depend on the module
+locally. Instructions for doing this can be found in ExoPlayer's
+[top level README][].
+
+[top level README]: https://github.com/google/ExoPlayer/blob/release-v2/README.md
+
+## Using the extension ##
+
+Create a `CastPlayer` and use it to integrate Cast into your app using
+ExoPlayer's common `Player` interface.

extensions/cast/build.gradle

+// Copyright (C) 2017 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://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: '../../constants.gradle'
+apply plugin: 'com.android.library'
+
+android {
+    compileSdkVersion project.ext.compileSdkVersion
+    buildToolsVersion project.ext.buildToolsVersion
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
+    defaultConfig {
+        minSdkVersion 14
+        targetSdkVersion project.ext.targetSdkVersion
+        consumerProguardFiles 'proguard-rules.txt'
+    }
+}
+
+dependencies {
+    api 'com.google.android.gms:play-services-cast-framework:16.0.3'
+    compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion
+    compileOnly 'org.checkerframework:checker-compat-qual:' + checkerframeworkVersion
+    implementation project(modulePrefix + 'library-core')
+    implementation project(modulePrefix + 'library-ui')
+    testImplementation project(modulePrefix + 'testutils')
+    testImplementation 'junit:junit:' + junitVersion
+    testImplementation 'org.mockito:mockito-core:' + mockitoVersion
+    testImplementation 'org.robolectric:robolectric:' + robolectricVersion
+    testImplementation project(modulePrefix + 'testutils-robolectric')
+    // These dependencies are necessary to force the supportLibraryVersion of
+    // com.android.support:support-v4, com.android.support:appcompat-v7 and
+    // com.android.support:mediarouter-v7 to be used. Else older versions are
+    // used, for example via:
+    // com.google.android.gms:play-services-cast-framework:15.0.1
+    // |-- com.android.support:mediarouter-v7:26.1.0
+    api 'com.android.support:support-v4:' + supportLibraryVersion
+    api 'com.android.support:mediarouter-v7:' + supportLibraryVersion
+    api 'com.android.support:recyclerview-v7:' + supportLibraryVersion
+}
+
+ext {
+    javadocTitle = 'Cast extension'
+}
+apply from: '../../javadoc_library.gradle'
+
+ext {
+    releaseArtifact = 'extension-cast'
+    releaseDescription = 'Cast extension for ExoPlayer.'
+}
+apply from: '../../publish.gradle'

extensions/cast/proguard-rules.txt

+# Proguard rules specific to the Cast extension.
+
+# DefaultCastOptionsProvider is commonly referred to only by the app's manifest.
+-keep class com.google.android.exoplayer2.ext.cast.DefaultCastOptionsProvider

library/ui/src/main/res/drawable-anydpi-v21/exo_controls_fastforward.xml → extensions/cast/src/main/AndroidManifest.xml

+<?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright (C) 2017 The Android Open Source Project
 <!-- Copyright (C) 2017 The Android Open Source Project
 
 
      Licensed under the Apache License, Version 2.0 (the "License");
      Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,14 +13,4 @@
      See the License for the specific language governing permissions and
      See the License for the specific language governing permissions and
      limitations under the License.
      limitations under the License.
 -->
 -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="32dp"
-    android:height="32dp"
-    android:viewportHeight="24.0"
-    android:viewportWidth="24.0">
-
-  <path
-      android:fillColor="#FFFFFFFF"
-      android:pathData="M4,18l8.5,-6L4,6v12zM13,6v12l8.5,-6L13,6z"/>
-
-</vector>
+<manifest package="com.google.android.exoplayer2.ext.cast"/>

extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastTimeline.java

+/*
+ * Copyright (C) 2017 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://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.
+ */
+package com.google.android.exoplayer2.ext.cast;
+
+import android.support.annotation.Nullable;
+import android.util.SparseIntArray;
+import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.Timeline;
+import com.google.android.gms.cast.MediaInfo;
+import com.google.android.gms.cast.MediaQueueItem;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * A {@link Timeline} for Cast media queues.
+ */
+/* package */ final class CastTimeline extends Timeline {
+
+  public static final CastTimeline EMPTY_CAST_TIMELINE =
+      new CastTimeline(Collections.emptyList(), Collections.emptyMap());
+
+  private final SparseIntArray idsToIndex;
+  private final int[] ids;
+  private final long[] durationsUs;
+  private final long[] defaultPositionsUs;
+
+  /**
+   * @param items A list of cast media queue items to represent.
+   * @param contentIdToDurationUsMap A map of content id to duration in microseconds.
+   */
+  public CastTimeline(List<MediaQueueItem> items, Map<String, Long> contentIdToDurationUsMap) {
+    int itemCount = items.size();
+    int index = 0;
+    idsToIndex = new SparseIntArray(itemCount);
+    ids = new int[itemCount];
+    durationsUs = new long[itemCount];
+    defaultPositionsUs = new long[itemCount];
+    for (MediaQueueItem item : items) {
+      int itemId = item.getItemId();
+      ids[index] = itemId;
+      idsToIndex.put(itemId, index);
+      MediaInfo mediaInfo = item.getMedia();
+      String contentId = mediaInfo.getContentId();
+      durationsUs[index] =
+          contentIdToDurationUsMap.containsKey(contentId)
+              ? contentIdToDurationUsMap.get(contentId)
+              : CastUtils.getStreamDurationUs(mediaInfo);
+      defaultPositionsUs[index] = (long) (item.getStartTime() * C.MICROS_PER_SECOND);
+      index++;
+    }
+  }
+
+  // Timeline implementation.
+
+  @Override
+  public int getWindowCount() {
+    return ids.length;
+  }
+
+  @Override
+  public Window getWindow(
+      int windowIndex, Window window, boolean setTag, long defaultPositionProjectionUs) {
+    long durationUs = durationsUs[windowIndex];
+    boolean isDynamic = durationUs == C.TIME_UNSET;
+    Object tag = setTag ? ids[windowIndex] : null;
+    return window.set(
+        tag,
+        /* presentationStartTimeMs= */ C.TIME_UNSET,
+        /* windowStartTimeMs= */ C.TIME_UNSET,
+        /* isSeekable= */ !isDynamic,
+        isDynamic,
+        defaultPositionsUs[windowIndex],
+        durationUs,
+        /* firstPeriodIndex= */ windowIndex,
+        /* lastPeriodIndex= */ windowIndex,
+        /* positionInFirstPeriodUs= */ 0);
+  }
+
+  @Override
+  public int getPeriodCount() {
+    return ids.length;
+  }
+
+  @Override
+  public Period getPeriod(int periodIndex, Period period, boolean setIds) {
+    int id = ids[periodIndex];
+    return period.set(id, id, periodIndex, durationsUs[periodIndex], 0);
+  }
+
+  @Override
+  public int getIndexOfPeriod(Object uid) {
+    return uid instanceof Integer ? idsToIndex.get((int) uid, C.INDEX_UNSET) : C.INDEX_UNSET;
+  }
+
+  @Override
+  public Integer getUidOfPeriod(int periodIndex) {
+    return ids[periodIndex];
+  }
+
+  // equals and hashCode implementations.
+
+  @Override
+  public boolean equals(@Nullable Object other) {
+    if (this == other) {
+      return true;
+    } else if (!(other instanceof CastTimeline)) {
+      return false;
+    }
+    CastTimeline that = (CastTimeline) other;
+    return Arrays.equals(ids, that.ids)
+        && Arrays.equals(durationsUs, that.durationsUs)
+        && Arrays.equals(defaultPositionsUs, that.defaultPositionsUs);
+  }
+
+  @Override
+  public int hashCode() {
+    int result = Arrays.hashCode(ids);
+    result = 31 * result + Arrays.hashCode(durationsUs);
+    result = 31 * result + Arrays.hashCode(defaultPositionsUs);
+    return result;
+  }
+
+}

extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastTimelineTracker.java

+/*
+ * Copyright (C) 2018 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://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.
+ */
+package com.google.android.exoplayer2.ext.cast;
+
+import com.google.android.gms.cast.MediaInfo;
+import com.google.android.gms.cast.MediaQueueItem;
+import com.google.android.gms.cast.MediaStatus;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+
+/**
+ * Creates {@link CastTimeline}s from cast receiver app media status.
+ *
+ * <p>This class keeps track of the duration reported by the current item to fill any missing
+ * durations in the media queue items [See internal: b/65152553].
+ */
+/* package */ final class CastTimelineTracker {
+
+  private final HashMap<String, Long> contentIdToDurationUsMap;
+  private final HashSet<String> scratchContentIdSet;
+
+  public CastTimelineTracker() {
+    contentIdToDurationUsMap = new HashMap<>();
+    scratchContentIdSet = new HashSet<>();
+  }
+
+  /**
+   * Returns a {@link CastTimeline} that represent the given {@code status}.
+   *
+   * @param status The Cast media status.
+   * @return A {@link CastTimeline} that represent the given {@code status}.
+   */
+  public CastTimeline getCastTimeline(MediaStatus status) {
+    MediaInfo mediaInfo = status.getMediaInfo();
+    List<MediaQueueItem> items = status.getQueueItems();
+    removeUnusedDurationEntries(items);
+
+    if (mediaInfo != null) {
+      String contentId = mediaInfo.getContentId();
+      long durationUs = CastUtils.getStreamDurationUs(mediaInfo);
+      contentIdToDurationUsMap.put(contentId, durationUs);
+    }
+    return new CastTimeline(items, contentIdToDurationUsMap);
+  }
+
+  private void removeUnusedDurationEntries(List<MediaQueueItem> items) {
+    scratchContentIdSet.clear();
+    for (MediaQueueItem item : items) {
+      scratchContentIdSet.add(item.getMedia().getContentId());
+    }
+    contentIdToDurationUsMap.keySet().retainAll(scratchContentIdSet);
+  }
+}

extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastUtils.java

+/*
+ * Copyright (C) 2017 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://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.
+ */
+package com.google.android.exoplayer2.ext.cast;
+
+import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.Format;
+import com.google.android.gms.cast.CastStatusCodes;
+import com.google.android.gms.cast.MediaInfo;
+import com.google.android.gms.cast.MediaTrack;
+
+/**
+ * Utility methods for ExoPlayer/Cast integration.
+ */
+/* package */ final class CastUtils {
+
+  /**
+   * Returns the duration in microseconds advertised by a media info, or {@link C#TIME_UNSET} if
+   * unknown or not applicable.
+   *
+   * @param mediaInfo The media info to get the duration from.
+   * @return The duration in microseconds.
+   */
+  public static long getStreamDurationUs(MediaInfo mediaInfo) {
+    long durationMs =
+        mediaInfo != null ? mediaInfo.getStreamDuration() : MediaInfo.UNKNOWN_DURATION;
+    return durationMs != MediaInfo.UNKNOWN_DURATION ? C.msToUs(durationMs) : C.TIME_UNSET;
+  }
+
+  /**
+   * Returns a descriptive log string for the given {@code statusCode}, or "Unknown." if not one of
+   * {@link CastStatusCodes}.
+   *
+   * @param statusCode A Cast API status code.
+   * @return A descriptive log string for the given {@code statusCode}, or "Unknown." if not one of
+   *     {@link CastStatusCodes}.
+   */
+  public static String getLogString(int statusCode) {
+    switch (statusCode) {
+      case CastStatusCodes.APPLICATION_NOT_FOUND:
+        return "A requested application could not be found.";
+      case CastStatusCodes.APPLICATION_NOT_RUNNING:
+        return "A requested application is not currently running.";
+      case CastStatusCodes.AUTHENTICATION_FAILED:
+        return "Authentication failure.";
+      case CastStatusCodes.CANCELED:
+        return "An in-progress request has been canceled, most likely because another action has "
+            + "preempted it.";
+      case CastStatusCodes.ERROR_SERVICE_CREATION_FAILED:
+        return "The Cast Remote Display service could not be created.";
+      case CastStatusCodes.ERROR_SERVICE_DISCONNECTED:
+        return "The Cast Remote Display service was disconnected.";
+      case CastStatusCodes.FAILED:
+        return "The in-progress request failed.";
+      case CastStatusCodes.INTERNAL_ERROR:
+        return "An internal error has occurred.";
+      case CastStatusCodes.INTERRUPTED:
+        return "A blocking call was interrupted while waiting and did not run to completion.";
+      case CastStatusCodes.INVALID_REQUEST:
+        return "An invalid request was made.";
+      case CastStatusCodes.MESSAGE_SEND_BUFFER_TOO_FULL:
+        return "A message could not be sent because there is not enough room in the send buffer at "
+            + "this time.";
+      case CastStatusCodes.MESSAGE_TOO_LARGE:
+        return "A message could not be sent because it is too large.";
+      case CastStatusCodes.NETWORK_ERROR:
+        return "Network I/O error.";
+      case CastStatusCodes.NOT_ALLOWED:
+        return "The request was disallowed and could not be completed.";
+      case CastStatusCodes.REPLACED:
+        return "The request's progress is no longer being tracked because another request of the "
+            + "same type has been made before the first request completed.";
+      case CastStatusCodes.SUCCESS:
+        return "Success.";
+      case CastStatusCodes.TIMEOUT:
+        return "An operation has timed out.";
+      case CastStatusCodes.UNKNOWN_ERROR:
+        return "An unknown, unexpected error has occurred.";
+      default:
+        return CastStatusCodes.getStatusCodeString(statusCode);
+    }
+  }
+
+  /**
+   * Creates a {@link Format} instance containing all information contained in the given
+   * {@link MediaTrack} object.
+   *
+   * @param mediaTrack The {@link MediaTrack}.
+   * @return The equivalent {@link Format}.
+   */
+  public static Format mediaTrackToFormat(MediaTrack mediaTrack) {
+    return Format.createContainerFormat(
+        mediaTrack.getContentId(),
+        /* label= */ null,
+        mediaTrack.getContentType(),
+        /* sampleMimeType= */ null,
+        /* codecs= */ null,
+        /* bitrate= */ Format.NO_VALUE,
+        /* selectionFlags= */ 0,
+        mediaTrack.getLanguage());
+  }
+
+  private CastUtils() {}
+
+}

extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/DefaultCastOptionsProvider.java

+/*
+ * Copyright (C) 2017 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://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.
+ */
+package com.google.android.exoplayer2.ext.cast;
+
+import android.content.Context;
+import com.google.android.gms.cast.CastMediaControlIntent;
+import com.google.android.gms.cast.framework.CastOptions;
+import com.google.android.gms.cast.framework.OptionsProvider;
+import com.google.android.gms.cast.framework.SessionProvider;
+import java.util.List;
+
+/**
+ * A convenience {@link OptionsProvider} to target the default cast receiver app.
+ */
+public final class DefaultCastOptionsProvider implements OptionsProvider {
+
+  @Override
+  public CastOptions getCastOptions(Context context) {
+    return new CastOptions.Builder()
+        .setReceiverApplicationId(CastMediaControlIntent.DEFAULT_MEDIA_RECEIVER_APPLICATION_ID)
+        .setStopReceiverApplicationWhenEndingSession(true).build();
+  }
+
+  @Override
+  public List<SessionProvider> getAdditionalSessionProviders(Context context) {
+    return null;
+  }
+
+}

extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/MediaItemQueue.java

+/*
+ * Copyright (C) 2018 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://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.
+ */
+package com.google.android.exoplayer2.ext.cast;
+
+/** Represents a sequence of {@link MediaItem MediaItems}. */
+public interface MediaItemQueue {
+
+  /**
+   * Returns the item at the given index.
+   *
+   * @param index The index of the item to retrieve.
+   * @return The item at the given index.
+   * @throws IndexOutOfBoundsException If {@code index < 0 || index >= getSize()}.
+   */
+  MediaItem get(int index);
+
+  /** Returns the number of items in this queue. */
+  int getSize();
+
+  /**
+   * Appends the given sequence of items to the queue.
+   *
+   * @param items The sequence of items to append.
+   */
+  void add(MediaItem... items);
+
+  /**
+   * Adds the given sequence of items to the queue at the given position, so that the first of
+   * {@code items} is placed at the given index.
+   *
+   * @param index The index at which {@code items} will be inserted.
+   * @param items The sequence of items to append.
+   * @throws IndexOutOfBoundsException If {@code index < 0 || index > getSize()}.
+   */
+  void add(int index, MediaItem... items);
+
+  /**
+   * Moves an existing item within the playlist.
+   *
+   * <p>Calling this method is equivalent to removing the item at position {@code indexFrom} and
+   * immediately inserting it at position {@code indexTo}. If the moved item is being played at the
+   * moment of the invocation, playback will stick with the moved item.
+   *
+   * @param indexFrom The index of the item to move.
+   * @param indexTo The index at which the item will be placed after this operation.
+   * @throws IndexOutOfBoundsException If for either index, {@code index < 0 || index >= getSize()}.
+   */
+  void move(int indexFrom, int indexTo);
+
+  /**
+   * Removes an item from the queue.
+   *
+   * @param index The index of the item to remove from the queue.
+   * @throws IndexOutOfBoundsException If {@code index < 0 || index >= getSize()}.
+   */
+  void remove(int index);
+
+  /**
+   * Removes a range of items from the queue.
+   *
+   * <p>Does nothing if an empty range ({@code from == exclusiveTo}) is passed.
+   *
+   * @param from The inclusive index at which the range to remove starts.
+   * @param exclusiveTo The exclusive index at which the range to remove ends.
+   * @throws IndexOutOfBoundsException If {@code from < 0 || exclusiveTo > getSize() || from >
+   *     exclusiveTo}.
+   */
+  void removeRange(int from, int exclusiveTo);
+
+  /** Removes all items in the queue. */
+  void clear();
+}

extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/SessionAvailabilityListener.java

+/*
+ * Copyright (C) 2018 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://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.
+ */
+package com.google.android.exoplayer2.ext.cast;
+
+/** Listener of changes in the cast session availability. */
+public interface SessionAvailabilityListener {
+
+  /** Called when a cast session becomes available to the player. */
+  void onCastSessionAvailable();
+
+  /** Called when the cast session becomes unavailable. */
+  void onCastSessionUnavailable();
+}

extensions/mediasession/src/main/res/values-et-rEE/strings.xml → extensions/cast/src/test/AndroidManifest.xml

-<?xml version="1.0"?>
-<!--
-     Copyright (C) 2016 The Android Open Source Project
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2018 The Android Open Source Project
 
 
      Licensed under the Apache License, Version 2.0 (the "License");
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
      you may not use this file except in compliance with the License.
@@ -14,8 +13,5 @@
      See the License for the specific language governing permissions and
      See the License for the specific language governing permissions and
      limitations under the License.
      limitations under the License.
 -->
 -->
-<resources>
-  <string name="exo_media_action_repeat_all_description">"Korda kõike"</string>
-  <string name="exo_media_action_repeat_off_description">"Ära korda midagi"</string>
-  <string name="exo_media_action_repeat_one_description">"Korda ühte"</string>
-</resources>
+
+<manifest package="com.google.android.exoplayer2.ext.cast.test"/>

extensions/cast/src/test/java/com/google/android/exoplayer2/ext/cast/CastTimelineTrackerTest.java

+/*
+ * Copyright (C) 2018 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://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.
+ */
+package com.google.android.exoplayer2.ext.cast;
+
+import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.testutil.TimelineAsserts;
+import com.google.android.exoplayer2.util.MimeTypes;
+import com.google.android.gms.cast.MediaInfo;
+import com.google.android.gms.cast.MediaQueueItem;
+import com.google.android.gms.cast.MediaStatus;
+import java.util.ArrayList;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mockito;
+import org.robolectric.RobolectricTestRunner;
+
+/** Tests for {@link CastTimelineTracker}. */
+@RunWith(RobolectricTestRunner.class)
+public class CastTimelineTrackerTest {
+
+  private static final long DURATION_1_MS = 1000;
+  private static final long DURATION_2_MS = 2000;
+  private static final long DURATION_3_MS = 3000;
+  private static final long DURATION_4_MS = 4000;
+  private static final long DURATION_5_MS = 5000;
+
+  /** Tests that duration of the current media info is correctly propagated to the timeline. */
+  @Test
+  public void testGetCastTimeline() {
+    MediaInfo mediaInfo;
+    MediaStatus status =
+        mockMediaStatus(
+            new int[] {1, 2, 3},
+            new String[] {"contentId1", "contentId2", "contentId3"},
+            new long[] {DURATION_1_MS, MediaInfo.UNKNOWN_DURATION, MediaInfo.UNKNOWN_DURATION});
+
+    CastTimelineTracker tracker = new CastTimelineTracker();
+    mediaInfo = getMediaInfo("contentId1", DURATION_1_MS);
+    Mockito.when(status.getMediaInfo()).thenReturn(mediaInfo);
+    TimelineAsserts.assertPeriodDurations(
+        tracker.getCastTimeline(status), C.msToUs(DURATION_1_MS), C.TIME_UNSET, C.TIME_UNSET);
+
+    mediaInfo = getMediaInfo("contentId3", DURATION_3_MS);
+    Mockito.when(status.getMediaInfo()).thenReturn(mediaInfo);
+    TimelineAsserts.assertPeriodDurations(
+        tracker.getCastTimeline(status),
+        C.msToUs(DURATION_1_MS),
+        C.TIME_UNSET,
+        C.msToUs(DURATION_3_MS));
+
+    mediaInfo = getMediaInfo("contentId2", DURATION_2_MS);
+    Mockito.when(status.getMediaInfo()).thenReturn(mediaInfo);
+    TimelineAsserts.assertPeriodDurations(
+        tracker.getCastTimeline(status),
+        C.msToUs(DURATION_1_MS),
+        C.msToUs(DURATION_2_MS),
+        C.msToUs(DURATION_3_MS));
+
+    MediaStatus newStatus =
+        mockMediaStatus(
+            new int[] {4, 1, 5, 3},
+            new String[] {"contentId4", "contentId1", "contentId5", "contentId3"},
+            new long[] {
+              MediaInfo.UNKNOWN_DURATION,
+              MediaInfo.UNKNOWN_DURATION,
+              DURATION_5_MS,
+              MediaInfo.UNKNOWN_DURATION
+            });
+    mediaInfo = getMediaInfo("contentId5", DURATION_5_MS);
+    Mockito.when(newStatus.getMediaInfo()).thenReturn(mediaInfo);
+    TimelineAsserts.assertPeriodDurations(
+        tracker.getCastTimeline(newStatus),
+        C.TIME_UNSET,
+        C.msToUs(DURATION_1_MS),
+        C.msToUs(DURATION_5_MS),
+        C.msToUs(DURATION_3_MS));
+
+    mediaInfo = getMediaInfo("contentId3", DURATION_3_MS);
+    Mockito.when(newStatus.getMediaInfo()).thenReturn(mediaInfo);
+    TimelineAsserts.assertPeriodDurations(
+        tracker.getCastTimeline(newStatus),
+        C.TIME_UNSET,
+        C.msToUs(DURATION_1_MS),
+        C.msToUs(DURATION_5_MS),
+        C.msToUs(DURATION_3_MS));
+
+    mediaInfo = getMediaInfo("contentId4", DURATION_4_MS);
+    Mockito.when(newStatus.getMediaInfo()).thenReturn(mediaInfo);
+    TimelineAsserts.assertPeriodDurations(
+        tracker.getCastTimeline(newStatus),
+        C.msToUs(DURATION_4_MS),
+        C.msToUs(DURATION_1_MS),
+        C.msToUs(DURATION_5_MS),
+        C.msToUs(DURATION_3_MS));
+  }
+
+  private static MediaStatus mockMediaStatus(
+      int[] itemIds, String[] contentIds, long[] durationsMs) {
+    ArrayList<MediaQueueItem> items = new ArrayList<>();
+    for (int i = 0; i < contentIds.length; i++) {
+      MediaInfo mediaInfo = getMediaInfo(contentIds[i], durationsMs[i]);
+      MediaQueueItem item = Mockito.mock(MediaQueueItem.class);
+      Mockito.when(item.getMedia()).thenReturn(mediaInfo);
+      Mockito.when(item.getItemId()).thenReturn(itemIds[i]);
+      items.add(item);
+    }
+    MediaStatus status = Mockito.mock(MediaStatus.class);
+    Mockito.when(status.getQueueItems()).thenReturn(items);
+    return status;
+  }
+
+  private static MediaInfo getMediaInfo(String contentId, long durationMs) {
+    return new MediaInfo.Builder(contentId)
+        .setStreamDuration(durationMs)
+        .setContentType(MimeTypes.APPLICATION_MP4)
+        .setStreamType(MediaInfo.STREAM_TYPE_NONE)
+        .build();
+  }
+}