WIP: Work around and demo for stuck buffering tunneling issue

.github/ISSUE_TEMPLATE/bug.md

@@ -8,9 +8,12 @@ assignees: ''
 
 Before filing a bug:
 -----------------------
-- Search existing issues, including issues that are closed.
-- Consult our FAQs, supported devices and supported formats pages. These can be
- found at https://exoplayer.dev/.
+- Search existing issues, including issues that are closed:
+ https://github.com/google/ExoPlayer/issues?q=is%3Aissue
+- Consult our developer website, which can be found at https://exoplayer.dev/.
+ It provides detailed information about supported formats and devices.
+- Learn how to create useful log output by using the EventLogger:
+ https://exoplayer.dev/listening-to-player-events.html#using-eventlogger
 - Rule out issues in your own code. A good way to do this is to try and
  reproduce the issue in the ExoPlayer demo app. Information about the ExoPlayer
  demo app can be found here:
@@ -33,16 +36,17 @@ or a small sample app that you’re able to share as source code on GitHub.
 Provide a JSON snippet for the demo app’s media.exolist.json file, or 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 [email protected] using a subject
-in the format "Issue #1234". Provide all the metadata we'd need to play the
-content like drm license urls or similar. If the content is accessible only in
-certain countries or regions, please say so.
+in the format "Issue #1234", where "#1234" should be replaced with your issue
+number. Provide all the metadata we'd need to play the content like drm license
+urls or similar. If the content is accessible only in certain countries or
+regions, please say so.
 
 ### [REQUIRED] A full bug report captured from the device
 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.
 If you don't wish to post it publicly, please submit the issue, then email the
 bug report to [email protected] using a subject in the format
-"Issue #1234".
+"Issue #1234", where "#1234" should be replaced with your issue number.
 
 ### [REQUIRED] Version of ExoPlayer being used
 Specify the absolute version number. Avoid using terms such as "latest".

.github/ISSUE_TEMPLATE/content_not_playing.md

@@ -8,9 +8,12 @@ assignees: ''
 
 Before filing a content issue:
 ------------------------------
-- Search existing issues, including issues that are closed.
+- Search existing issues, including issues that are closed:
+ https://github.com/google/ExoPlayer/issues?q=is%3Aissue
 - Consult our supported formats page, which can be found at
  https://exoplayer.dev/supported-formats.html.
+- Learn how to create useful log output by using the EventLogger:
+ https://exoplayer.dev/listening-to-player-events.html#using-eventlogger
 - Try playing your content in the ExoPlayer demo app. Information about the
  ExoPlayer demo app can be found here:
  http://exoplayer.dev/demo-application.html.
@@ -30,9 +33,10 @@ and you expect to play, like 5.1 audio track, text tracks or drm systems.
 Provide a JSON snippet for the demo app’s media.exolist.json file, or 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 [email protected] using a subject
-in the format "Issue #1234". Provide all the metadata we'd need to play the
-content like drm license urls or similar. If the content is accessible only in
-certain countries or regions, please say so.
+in the format "Issue #1234", where "#1234" should be replaced with your issue
+number. Provide all the metadata we'd need to play the content like drm license
+urls or similar. If the content is accessible only in certain countries or
+regions, please say so.
 
 ### [REQUIRED] Version of ExoPlayer being used
 Specify the absolute version number. Avoid using terms such as "latest".
@@ -41,6 +45,13 @@ Specify the absolute version number. Avoid using terms such as "latest".
 Specify the devices and versions of Android on which you expect the content to
 play. If possible, please test on multiple devices and Android versions.
 
+### [REQUIRED] A full bug report captured from the device
+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.
+If you don't wish to post it publicly, please submit the issue, then email the
+bug report to [email protected] using a subject in the format
+"Issue #1234", where "#1234" should be replaced with your issue number.
+
 <!-- DO NOT DELETE
 validate_template=true
 template_path=.github/ISSUE_TEMPLATE/content_not_playing.md

.github/ISSUE_TEMPLATE/feature_request.md

@@ -8,8 +8,9 @@ assignees: ''
 
 Before filing a feature request:
 -----------------------
-- Search existing open issues, specifically with the label ‘enhancement’.
-- Search existing pull requests.
+- Search existing open issues, specifically with the label ‘enhancement’:
+ https://github.com/google/ExoPlayer/labels/enhancement
+- Search existing pull requests: https://github.com/google/ExoPlayer/pulls
 
 When filing a feature request:
 -----------------------

.github/ISSUE_TEMPLATE/question.md

@@ -12,8 +12,12 @@ Before filing a question:
  a general Android development question, please do so on Stack Overflow.
 - Search existing issues, including issues that are closed. It’s often the
  quickest way to get an answer!
-- Consult our FAQs, developer guide and the class reference of ExoPlayer. These
- can be found at https://exoplayer.dev/.
+ https://github.com/google/ExoPlayer/issues?q=is%3Aissue
+- Consult our developer website, which can be found at https://exoplayer.dev/.
+ It provides detailed information about supported formats, devices as well as
+ information about how to use the ExoPlayer library.
+- The ExoPlayer library Javadoc can be found at
+ https://exoplayer.dev/doc/reference/
 
 When filing a question:
 -----------------------
@@ -28,6 +32,23 @@ important for us to know this so that we can improve our documentation.
 ### [REQUIRED] Question
 Describe your question in detail.
 
+### A full bug report captured from the device
+In case your question refers to a problem you are seeing in your app, capture a
+full bug report using "adb bugreport". 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 bug report to [email protected] using a subject in the format
+"Issue #1234", where "#1234" should be replaced with your issue number.
+
+### Link to test content
+In case your question is related to a piece of media, which you are trying to
+play, please provide a JSON snippet for the demo app’s media.exolist.json file,
+or 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
+[email protected] using a subject in the format "Issue #1234", where
+"#1234" should be replaced with your issue number. Provide all the metadata we'd
+need to play the content like drm license urls or similar. If the content is
+accessible only in certain countries or regions, please say so.
+
 <!-- DO NOT DELETE
 validate_template=true
 template_path=.github/ISSUE_TEMPLATE/question.md

RELEASENOTES.md

@@ -1,16 +1,116 @@
 # Release notes #
 
-### dev-v2 (not yet released) ###
-
-* Decoders:
- * Prefer codecs that advertise format support over ones that do not, even if
- they are listed lower in the `MediaCodecList`.
+### 2.10.4 ###
+
+* Offline: Add `Scheduler` implementation that uses `WorkManager`.
+* Add ability to specify a description when creating notification channels via
+ ExoPlayer library classes.
+* Switch normalized BCP-47 language codes to use 2-letter ISO 639-1 language
+ tags instead of 3-letter ISO 639-2 language tags.
+* Ensure the `SilenceMediaSource` position is in range
+ ([#6229](https://github.com/google/ExoPlayer/issues/6229)).
+* WAV: Calculate correct duration for clipped streams
+ ([#6241](https://github.com/google/ExoPlayer/issues/6241)).
+* MP3: Use CBR header bitrate, not calculated bitrate. This reverts a change
+ from 2.9.3 ([#6238](https://github.com/google/ExoPlayer/issues/6238)).
+* Flac extension: Parse `VORBIS_COMMENT` and `PICTURE` metadata
+ ([#5527](https://github.com/google/ExoPlayer/issues/5527)).
+* Fix issue where initial seek positions get ignored when playing a preroll ad
+ ([#6201](https://github.com/google/ExoPlayer/issues/6201)).
+* Fix issue where invalid language tags were normalized to "und" instead of
+ keeping the original
+ ([#6153](https://github.com/google/ExoPlayer/issues/6153)).
+* Fix `DataSchemeDataSource` re-opening and range requests
+ ([#6192](https://github.com/google/ExoPlayer/issues/6192)).
+* Fix Flac and ALAC playback on some LG devices
+ ([#5938](https://github.com/google/ExoPlayer/issues/5938)).
+* Fix issue when calling `performClick` on `PlayerView` without
+ `PlayerControlView`
+ ([#6260](https://github.com/google/ExoPlayer/issues/6260)).
+* Fix issue where playback speeds are not used in adaptive track selections
+ after manual selection changes for other renderers
+ ([#6256](https://github.com/google/ExoPlayer/issues/6256)).
+
+### 2.10.3 ###
+
+* Display last frame when seeking to end of stream
+ ([#2568](https://github.com/google/ExoPlayer/issues/2568)).
+* Audio:
+ * Fix an issue where not all audio was played out when the configuration
+ for the underlying track was changing (e.g., at some period transitions).
+ * Fix an issue where playback speed was applied inaccurately in playlists
+ ([#6117](https://github.com/google/ExoPlayer/issues/6117)).
+* UI: Fix `PlayerView` incorrectly consuming touch events if no controller is
+ attached ([#6109](https://github.com/google/ExoPlayer/issues/6109)).
+* CEA608: Fix repetition of special North American characters
+ ([#6133](https://github.com/google/ExoPlayer/issues/6133)).
+* FLV: Fix bug that caused playback of some live streams to not start
+ ([#6111](https://github.com/google/ExoPlayer/issues/6111)).
+* SmoothStreaming: Parse text stream `Subtype` into `Format.roleFlags`.
+* MediaSession extension: Fix `MediaSessionConnector.play()` not resuming
+ playback ([#6093](https://github.com/google/ExoPlayer/issues/6093)).
+
+### 2.10.2 ###
+
+* Add `ResolvingDataSource` for just-in-time resolution of `DataSpec`s
+ ([#5779](https://github.com/google/ExoPlayer/issues/5779)).
+* Add `SilenceMediaSource` that can be used to play silence of a given
+ duration ([#5735](https://github.com/google/ExoPlayer/issues/5735)).
+* Offline:
+ * Prevent unexpected `DownloadHelper.Callback.onPrepared` callbacks after
+ preparation of a `DownloadHelper` fails
+ ([#5915](https://github.com/google/ExoPlayer/issues/5915)).
+ * Fix `CacheUtil.cache()` downloading too much data
+ ([#5927](https://github.com/google/ExoPlayer/issues/5927)).
+ * Fix misreporting cached bytes when caching is paused
+ ([#5573](https://github.com/google/ExoPlayer/issues/5573)).
+* UI:
+ * Allow setting `DefaultTimeBar` attributes on `PlayerView` and
+ `PlayerControlView`.
+ * Change playback controls toggle from touch down to touch up events
+ ([#5784](https://github.com/google/ExoPlayer/issues/5784)).
+ * Fix issue where playback controls were not kept visible on key presses
+ ([#5963](https://github.com/google/ExoPlayer/issues/5963)).
+* Subtitles:
  * CEA-608: Handle XDS and TEXT modes
- ([5807](https://github.com/google/ExoPlayer/pull/5807)).
-* Audio: fix an issue where not all audio was played out when the configuration
- for the underlying track was changing (e.g., at some period transitions).
-* UI: Change playback controls toggle from touch down to touch up events
- ([#5784](https://github.com/google/ExoPlayer/issues/5784)).
+ ([#5807](https://github.com/google/ExoPlayer/pull/5807)).
+ * TTML: Fix bitmap rendering
+ ([#5633](https://github.com/google/ExoPlayer/pull/5633)).
+* IMA: Fix ad pod index offset calculation without preroll
+ ([#5928](https://github.com/google/ExoPlayer/issues/5928)).
+* Add a `playWhenReady` flag to MediaSessionConnector.PlaybackPreparer methods
+ to indicate whether a controller sent a play or only a prepare command. This
+ allows to take advantage of decoder reuse with the MediaSessionConnector
+ ([#5891](https://github.com/google/ExoPlayer/issues/5891)).
+* Add `ProgressUpdateListener` to `PlayerControlView`
+ ([#5834](https://github.com/google/ExoPlayer/issues/5834)).
+* Add support for auto-detecting UDP streams in `DefaultDataSource`
+ ([#6036](https://github.com/google/ExoPlayer/pull/6036)).
+* Allow enabling decoder fallback with `DefaultRenderersFactory`
+ ([#5942](https://github.com/google/ExoPlayer/issues/5942)).
+* Gracefully handle revoked `ACCESS_NETWORK_STATE` permission
+ ([#6019](https://github.com/google/ExoPlayer/issues/6019)).
+* Fix decoding problems when seeking back after seeking beyond a mid-roll ad
+ ([#6009](https://github.com/google/ExoPlayer/issues/6009)).
+* Fix application of `maxAudioBitrate` for adaptive audio track groups
+ ([#6006](https://github.com/google/ExoPlayer/issues/6006)).
+* Fix bug caused by parallel adaptive track selection using `Format`s without
+ bitrate information
+ ([#5971](https://github.com/google/ExoPlayer/issues/5971)).
+* Fix bug in `CastPlayer.getCurrentWindowIndex()`
+ ([#5955](https://github.com/google/ExoPlayer/issues/5955)).
+
+### 2.10.1 ###
+
+* Offline: Add option to remove all downloads.
+* HLS: Fix `NullPointerException` when using HLS chunkless preparation
+ ([#5868](https://github.com/google/ExoPlayer/issues/5868)).
+* Fix handling of empty values and line terminators in SHOUTcast ICY metadata
+ ([#5876](https://github.com/google/ExoPlayer/issues/5876)).
+* Fix DVB subtitles for SDK 28
+ ([#5862](https://github.com/google/ExoPlayer/issues/5862)).
+* Add a workaround for a decoder failure on ZTE Axon7 mini devices when playing
+ 48kHz audio ([#5821](https://github.com/google/ExoPlayer/issues/5821)).
 
 ### 2.10.0 ###
 

build.gradle

@@ -21,14 +21,6 @@ buildscript {
  classpath 'com.novoda:bintray-release:0.9'
  classpath 'com.google.android.gms:strict-version-matcher-plugin:1.1.0'
  }
- // Workaround for the following test coverage issue. Remove when fixed:
- // https://code.google.com/p/android/issues/detail?id=226070
- configurations.all {
- resolutionStrategy {
- force 'org.jacoco:org.jacoco.report:0.7.4.201502262128'
- force 'org.jacoco:org.jacoco.core:0.7.4.201502262128'
- }
- }
 }
 allprojects {
  repositories {
@@ -44,6 +36,7 @@ allprojects {
  }
  buildDir = "${externalBuildDir}/${project.name}"
  }
+ group = 'com.google.android.exoplayer'
 }
 
 apply from: 'javadoc_combined.gradle'

constants.gradle

@@ -13,19 +13,17 @@
 // limitations under the License.
 project.ext {
  // ExoPlayer version and version code.
- releaseVersion = '2.10.0'
- releaseVersionCode = 2010000
+ releaseVersion = '2.10.4'
+ releaseVersionCode = 2010004
  minSdkVersion = 16
  targetSdkVersion = 28
  compileSdkVersion = 28
  dexmakerVersion = '2.21.0'
  mockitoVersion = '2.25.0'
- robolectricVersion = '4.3-alpha-2'
+ robolectricVersion = '4.2'
  autoValueVersion = '1.6'
- autoServiceVersion = '1.0-rc4'
  checkerframeworkVersion = '2.5.0'
  androidXTestVersion = '1.1.0'
- truthVersion = '0.44'
  modulePrefix = ':'
  if (gradle.ext.has('exoplayerModulePrefix')) {
  modulePrefix += gradle.ext.exoplayerModulePrefix

core_settings.gradle

@@ -38,6 +38,7 @@ include modulePrefix + 'extension-vp9'
 include modulePrefix + 'extension-rtmp'
 include modulePrefix + 'extension-leanback'
 include modulePrefix + 'extension-jobdispatcher'
+include modulePrefix + 'extension-workmanager'
 
 project(modulePrefix + 'library').projectDir = new File(rootDir, 'library/all')
 project(modulePrefix + 'library-core').projectDir = new File(rootDir, 'library/core')
@@ -60,3 +61,4 @@ project(modulePrefix + 'extension-vp9').projectDir = new File(rootDir, 'extensio
 project(modulePrefix + 'extension-rtmp').projectDir = new File(rootDir, 'extensions/rtmp')
 project(modulePrefix + 'extension-leanback').projectDir = new File(rootDir, 'extensions/leanback')
 project(modulePrefix + 'extension-jobdispatcher').projectDir = new File(rootDir, 'extensions/jobdispatcher')
+project(modulePrefix + 'extension-workmanager').projectDir = new File(rootDir, 'extensions/workmanager')

demos/cast/build.gradle

@@ -47,17 +47,6 @@ android {
  // The demo app isn't indexed and doesn't have translations.
  disable 'GoogleAppIndexingWarning','MissingTranslation'
  }
-
- flavorDimensions "receiver"
-
- productFlavors {
- defaultCast {
- dimension "receiver"
- manifestPlaceholders =
- [castOptionsProvider: "com.google.android.exoplayer2.ext.cast.DefaultCastOptionsProvider"]
- }
- }
-
 }
 
 dependencies {

demos/cast/src/main/AndroidManifest.xml

@@ -25,7 +25,7 @@
  android:largeHeap="true" android:allowBackup="false">
 
  <meta-data android:name="com.google.android.gms.cast.framework.OPTIONS_PROVIDER_CLASS_NAME"
- android:value="${castOptionsProvider}" />
+ 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"

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

@@ -66,7 +66,6 @@
  private final Listener listener;
  private final ConcatenatingMediaSource concatenatingMediaSource;
 
- private boolean castMediaQueueCreationPending;
  private int currentItemIndex;
  private Player currentPlayer;
 
@@ -255,7 +254,7 @@ public void release() {
  // Player.EventListener implementation.
 
  @Override
- public void onPlayerStateChanged(boolean playWhenReady, @Player.State int playbackState) {
+ public void onPlayerStateChanged(boolean playWhenReady, int playbackState) {
  updateCurrentItemIndex();
  }
 
@@ -268,9 +267,6 @@ public void onPositionDiscontinuity(@DiscontinuityReason int reason) {
  public void onTimelineChanged(
  Timeline timeline, @Nullable Object manifest, @TimelineChangeReason int reason) {
  updateCurrentItemIndex();
- if (currentPlayer == castPlayer && timeline.isEmpty()) {
- castMediaQueueCreationPending = true;
- }
  }
 
  // CastPlayer.SessionAvailabilityListener implementation.
@@ -332,7 +328,6 @@ private void setCurrentPlayer(Player currentPlayer) {
  this.currentPlayer = currentPlayer;
 
  // Media queue management.
- castMediaQueueCreationPending = currentPlayer == castPlayer;
  if (currentPlayer == exoPlayer) {
  exoPlayer.prepare(concatenatingMediaSource);
  }
@@ -352,12 +347,11 @@ private void setCurrentPlayer(Player currentPlayer) {
  */
  private void setCurrentItem(int itemIndex, long positionMs, boolean playWhenReady) {
  maybeSetCurrentItemAndNotify(itemIndex);
- if (castMediaQueueCreationPending) {
+ if (currentPlayer == castPlayer && castPlayer.getCurrentTimeline().isEmpty()) {
  MediaQueueItem[] items = new MediaQueueItem[mediaQueue.size()];
  for (int i = 0; i < items.length; i++) {
  items[i] = buildMediaQueueItem(mediaQueue.get(i));
  }
- castMediaQueueCreationPending = false;
  castPlayer.loadItems(items, itemIndex, positionMs, Player.REPEAT_MODE_OFF);
  } else {
  currentPlayer.seekTo(itemIndex, positionMs);