Skip to content

SDK / exoplayer

Go to a project
Commit b5beb326 by ojw28 Committed by GitHub
Options

Merge pull request #5037 from google/dev-v2-r2.9.1 

r2.9.1
parents fa9d7d5e a02a75ba
Expand all
Inline Side-by-side
Showing with 1513 additions and 458 deletions
README.md
...@@ -28,13 +28,13 @@ repository and depend on the modules locally. ...@@ -28,13 +28,13 @@ repository and depend on the modules locally.
### From 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 and Google repositories 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: included in the `build.gradle` file in the root of your project:
```gradle ```gradle
repositories { repositories {
jcenter()
google() google()
jcenter()
} }
``` ```
...@@ -45,10 +45,20 @@ following will add a dependency to the full library: ...@@ -45,10 +45,20 @@ following will add a dependency to the full library:
implementation 'com.google.android.exoplayer:exoplayer:2.X.X' implementation 'com.google.android.exoplayer:exoplayer:2.X.X'
``` ```
where `2.X.X` is your preferred version. Alternatively, you can depend on only where `2.X.X` is your preferred version. If not enabled already, you also need
the library modules that you actually need. For example the following will add to turn on Java 8 support in all `build.gradle` files depending on ExoPlayer, by
dependencies on the Core, DASH and UI library modules, as might be required for adding the following to the `android` section:
an app that plays DASH content:
```gradle
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 ```gradle
implementation 'com.google.android.exoplayer:exoplayer-core:2.X.X' implementation 'com.google.android.exoplayer:exoplayer-core:2.X.X'
......
RELEASENOTES.md
# Release notes # # Release notes #
### 2.9.1 ###
* Add convenience methods `Player.next`, `Player.previous`, `Player.hasNext`
and `Player.hasPrevious`
([#4863](https://github.com/google/ExoPlayer/issues/4863)).
* Improve initial bandwidth meter estimates using the current country and
network type.
* IMA extension:
* For preroll to live stream transitions, project forward the loading position
to avoid being behind the live window.
* Let apps specify whether to focus the skip button on ATV
([#5019](https://github.com/google/ExoPlayer/issues/5019)).
* MP3:
* Support seeking based on MLLT metadata
([#3241](https://github.com/google/ExoPlayer/issues/3241)).
* Fix handling of streams with appended data
([#4954](https://github.com/google/ExoPlayer/issues/4954)).
* DASH: Parse ProgramInformation element if present in the manifest.
* HLS:
* Add constructor to `DefaultHlsExtractorFactory` for adding TS payload
reader factory flags
* Fix bug in segment sniffing
([#5039](https://github.com/google/ExoPlayer/issues/5039)).
([#4861](https://github.com/google/ExoPlayer/issues/4861)).
* SubRip: Add support for alignment tags, and remove tags from the displayed
captions ([#4306](https://github.com/google/ExoPlayer/issues/4306)).
* Fix issue with blind seeking to windows with non-zero offset in a
`ConcatenatingMediaSource`
([#4873](https://github.com/google/ExoPlayer/issues/4873)).
* Fix logic for enabling next and previous actions in `TimelineQueueNavigator`
([#5065](https://github.com/google/ExoPlayer/issues/5065)).
* Fix issue where audio focus handling could not be disabled after enabling it
([#5055](https://github.com/google/ExoPlayer/issues/5055)).
* Fix issue where subtitles were positioned incorrectly if `SubtitleView` had a
non-zero position offset to its parent
([#4788](https://github.com/google/ExoPlayer/issues/4788)).
* Fix issue where the buffered position was not updated correctly when
transitioning between periods
([#4899](https://github.com/google/ExoPlayer/issues/4899)).
* Fix issue where a `NullPointerException` is thrown when removing an unprepared
media source from a `ConcatenatingMediaSource` with the `useLazyPreparation`
option enabled ([#4986](https://github.com/google/ExoPlayer/issues/4986)).
* Work around an issue where a non-empty end-of-stream audio buffer would be
output with timestamp zero, causing the player position to jump backwards
([#5045](https://github.com/google/ExoPlayer/issues/5045)).
* Suppress a spurious assertion failure on some Samsung devices
([#4532](https://github.com/google/ExoPlayer/issues/4532)).
* Suppress spurious "references unknown class member" shrinking warning
([#4890](https://github.com/google/ExoPlayer/issues/4890)).
* Swap recommended order for google() and jcenter() in gradle config
([#4997](https://github.com/google/ExoPlayer/issues/4997)).
### 2.9.0 ### ### 2.9.0 ###
* Turn on Java 8 compiler support for the ExoPlayer library. Apps may need to * Turn on Java 8 compiler support for the ExoPlayer library. Apps may need to
......
build.gradle
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
// limitations under the License. // limitations under the License.
buildscript { buildscript {
repositories { repositories {
jcenter()
google() google()
jcenter()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:3.1.4' classpath 'com.android.tools.build:gradle:3.1.4'
...@@ -32,8 +32,8 @@ buildscript { ...@@ -32,8 +32,8 @@ buildscript {
} }
allprojects { allprojects {
repositories { repositories {
jcenter()
google() google()
jcenter()
} }
project.ext { project.ext {
exoplayerPublishEnabled = true exoplayerPublishEnabled = true
......
constants.gradle
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
// limitations under the License. // limitations under the License.
project.ext { project.ext {
// ExoPlayer version and version code. // ExoPlayer version and version code.
releaseVersion = '2.9.0' releaseVersion = '2.9.1'
releaseVersionCode = 2009000 releaseVersionCode = 2009001
// Important: ExoPlayer specifies a minSdkVersion of 14 because various // 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
......
demos/main/src/main/res/drawable-xxhdpi/ic_download.png
demos/main/src/main/res/drawable-xxhdpi/ic_download.png

303 Bytes | W: | H:

demos/main/src/main/res/drawable-xxhdpi/ic_download.png

261 Bytes | W: | H:

demos/main/src/main/res/drawable-xxhdpi/ic_download.png
demos/main/src/main/res/drawable-xxhdpi/ic_download.png
demos/main/src/main/res/drawable-xxhdpi/ic_download.png
demos/main/src/main/res/drawable-xxhdpi/ic_download.png
  • 2-up
  • Swipe
  • Onion skin
demos/main/src/main/res/drawable-xxxhdpi/ic_download.png
demos/main/src/main/res/drawable-xxxhdpi/ic_download.png

304 Bytes | W: | H:

demos/main/src/main/res/drawable-xxxhdpi/ic_download.png

263 Bytes | W: | H:

demos/main/src/main/res/drawable-xxxhdpi/ic_download.png
demos/main/src/main/res/drawable-xxxhdpi/ic_download.png
demos/main/src/main/res/drawable-xxxhdpi/ic_download.png
demos/main/src/main/res/drawable-xxxhdpi/ic_download.png
  • 2-up
  • Swipe
  • Onion skin
extensions/cast/build.gradle
...@@ -31,7 +31,7 @@ android { ...@@ -31,7 +31,7 @@ android {
} }
dependencies { dependencies {
api 'com.google.android.gms:play-services-cast-framework:16.0.1' api 'com.google.android.gms:play-services-cast-framework:16.0.3'
implementation project(modulePrefix + 'library-core') implementation project(modulePrefix + 'library-core')
implementation project(modulePrefix + 'library-ui') implementation project(modulePrefix + 'library-ui')
testImplementation project(modulePrefix + 'testutils') testImplementation project(modulePrefix + 'testutils')
......
extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastPlayer.java
...@@ -18,6 +18,7 @@ package com.google.android.exoplayer2.ext.cast; ...@@ -18,6 +18,7 @@ package com.google.android.exoplayer2.ext.cast;
import android.os.Looper; import android.os.Looper;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
import android.support.annotation.Nullable; import android.support.annotation.Nullable;
import com.google.android.exoplayer2.BasePlayer;
import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.ExoPlaybackException; import com.google.android.exoplayer2.ExoPlaybackException;
import com.google.android.exoplayer2.PlaybackParameters; import com.google.android.exoplayer2.PlaybackParameters;
...@@ -31,7 +32,6 @@ import com.google.android.exoplayer2.trackselection.TrackSelectionArray; ...@@ -31,7 +32,6 @@ import com.google.android.exoplayer2.trackselection.TrackSelectionArray;
import com.google.android.exoplayer2.util.Assertions; import com.google.android.exoplayer2.util.Assertions;
import com.google.android.exoplayer2.util.Log; import com.google.android.exoplayer2.util.Log;
import com.google.android.exoplayer2.util.MimeTypes; import com.google.android.exoplayer2.util.MimeTypes;
import com.google.android.exoplayer2.util.Util;
import com.google.android.gms.cast.CastStatusCodes; import com.google.android.gms.cast.CastStatusCodes;
import com.google.android.gms.cast.MediaInfo; import com.google.android.gms.cast.MediaInfo;
import com.google.android.gms.cast.MediaQueueItem; import com.google.android.gms.cast.MediaQueueItem;
...@@ -62,7 +62,7 @@ import java.util.concurrent.CopyOnWriteArraySet; ...@@ -62,7 +62,7 @@ import java.util.concurrent.CopyOnWriteArraySet;
* *
* <p>Methods should be called on the application's main thread.</p> * <p>Methods should be called on the application's main thread.</p>
*/ */
public final class CastPlayer implements Player { public final class CastPlayer extends BasePlayer {
/** /**
* Listener of changes in the cast session availability. * Listener of changes in the cast session availability.
...@@ -95,7 +95,6 @@ public final class CastPlayer implements Player { ...@@ -95,7 +95,6 @@ public final class CastPlayer implements Player {
private final CastContext castContext; private final CastContext castContext;
// TODO: Allow custom implementations of CastTimelineTracker. // TODO: Allow custom implementations of CastTimelineTracker.
private final CastTimelineTracker timelineTracker; private final CastTimelineTracker timelineTracker;
private final Timeline.Window window;
private final Timeline.Period period; private final Timeline.Period period;
private RemoteMediaClient remoteMediaClient; private RemoteMediaClient remoteMediaClient;
...@@ -128,7 +127,6 @@ public final class CastPlayer implements Player { ...@@ -128,7 +127,6 @@ public final class CastPlayer implements Player {
public CastPlayer(CastContext castContext) { public CastPlayer(CastContext castContext) {
this.castContext = castContext; this.castContext = castContext;
timelineTracker = new CastTimelineTracker(); timelineTracker = new CastTimelineTracker();
window = new Timeline.Window();
period = new Timeline.Period(); period = new Timeline.Period();
statusListener = new StatusListener(); statusListener = new StatusListener();
seekResultCallback = new SeekResultCallback(); seekResultCallback = new SeekResultCallback();
...@@ -342,21 +340,6 @@ public final class CastPlayer implements Player { ...@@ -342,21 +340,6 @@ public final class CastPlayer implements Player {
} }
@Override @Override
public void seekToDefaultPosition() {
seekTo(0);
}
@Override
public void seekToDefaultPosition(int windowIndex) {
seekTo(windowIndex, 0);
}
@Override
public void seekTo(long positionMs) {
seekTo(getCurrentWindowIndex(), positionMs);
}
@Override
public void seekTo(int windowIndex, long positionMs) { public void seekTo(int windowIndex, long positionMs) {
MediaStatus mediaStatus = getMediaStatus(); MediaStatus mediaStatus = getMediaStatus();
// We assume the default position is 0. There is no support for seeking to the default position // We assume the default position is 0. There is no support for seeking to the default position
...@@ -393,11 +376,6 @@ public final class CastPlayer implements Player { ...@@ -393,11 +376,6 @@ public final class CastPlayer implements Player {
} }
@Override @Override
public void stop() {
stop(/* reset= */ false);
}
@Override
public void stop(boolean reset) { public void stop(boolean reset) {
playbackState = STATE_IDLE; playbackState = STATE_IDLE;
if (remoteMediaClient != null) { if (remoteMediaClient != null) {
...@@ -486,32 +464,11 @@ public final class CastPlayer implements Player { ...@@ -486,32 +464,11 @@ public final class CastPlayer implements Player {
return pendingSeekWindowIndex != C.INDEX_UNSET ? pendingSeekWindowIndex : currentWindowIndex; return pendingSeekWindowIndex != C.INDEX_UNSET ? pendingSeekWindowIndex : currentWindowIndex;
} }
@Override
public int getNextWindowIndex() {
return currentTimeline.isEmpty() ? C.INDEX_UNSET
: currentTimeline.getNextWindowIndex(getCurrentWindowIndex(), repeatMode, false);
}
@Override
public int getPreviousWindowIndex() {
return currentTimeline.isEmpty() ? C.INDEX_UNSET
: currentTimeline.getPreviousWindowIndex(getCurrentWindowIndex(), repeatMode, false);
}
@Override
public @Nullable Object getCurrentTag() {
int windowIndex = getCurrentWindowIndex();
return windowIndex >= currentTimeline.getWindowCount()
? null
: currentTimeline.getWindow(windowIndex, window, /* setTag= */ true).tag;
}
// TODO: Fill the cast timeline information with ProgressListener's duration updates. // TODO: Fill the cast timeline information with ProgressListener's duration updates.
// See [Internal: b/65152553]. // See [Internal: b/65152553].
@Override @Override
public long getDuration() { public long getDuration() {
return currentTimeline.isEmpty() ? C.TIME_UNSET return getContentDuration();
: currentTimeline.getWindow(getCurrentWindowIndex(), window).getDurationMs();
} }
@Override @Override
...@@ -529,15 +486,6 @@ public final class CastPlayer implements Player { ...@@ -529,15 +486,6 @@ public final class CastPlayer implements Player {
} }
@Override @Override
public int getBufferedPercentage() {
long position = getBufferedPosition();
long duration = getDuration();
return position == C.TIME_UNSET || duration == C.TIME_UNSET
? 0
: duration == 0 ? 100 : Util.constrainValue((int) ((position * 100) / duration), 0, 100);
}
@Override
public long getTotalBufferedDuration() { public long getTotalBufferedDuration() {
long bufferedPosition = getBufferedPosition(); long bufferedPosition = getBufferedPosition();
long currentPosition = getCurrentPosition(); long currentPosition = getCurrentPosition();
...@@ -547,18 +495,6 @@ public final class CastPlayer implements Player { ...@@ -547,18 +495,6 @@ public final class CastPlayer implements Player {
} }
@Override @Override
public boolean isCurrentWindowDynamic() {
return !currentTimeline.isEmpty()
&& currentTimeline.getWindow(getCurrentWindowIndex(), window).isDynamic;
}
@Override
public boolean isCurrentWindowSeekable() {
return !currentTimeline.isEmpty()
&& currentTimeline.getWindow(getCurrentWindowIndex(), window).isSeekable;
}
@Override
public boolean isPlayingAd() { public boolean isPlayingAd() {
return false; return false;
} }
...@@ -574,11 +510,6 @@ public final class CastPlayer implements Player { ...@@ -574,11 +510,6 @@ public final class CastPlayer implements Player {
} }
@Override @Override
public long getContentDuration() {
return getDuration();
}
@Override
public boolean isLoading() { public boolean isLoading() {
return false; return false;
} }
......
extensions/cronet/src/main/java/com/google/android/exoplayer2/ext/cronet/CronetDataSource.java
...@@ -326,8 +326,12 @@ public class CronetDataSource extends BaseDataSource implements HttpDataSource { ...@@ -326,8 +326,12 @@ public class CronetDataSource extends BaseDataSource implements HttpDataSource {
// Check for a valid response code. // Check for a valid response code.
int responseCode = responseInfo.getHttpStatusCode(); int responseCode = responseInfo.getHttpStatusCode();
if (responseCode < 200 || responseCode > 299) { if (responseCode < 200 || responseCode > 299) {
InvalidResponseCodeException exception = new InvalidResponseCodeException(responseCode, InvalidResponseCodeException exception =
responseInfo.getAllHeaders(), currentDataSpec); new InvalidResponseCodeException(
responseCode,
responseInfo.getHttpStatusText(),
responseInfo.getAllHeaders(),
currentDataSpec);
if (responseCode == 416) { if (responseCode == 416) {
exception.initCause(new DataSourceException(DataSourceException.POSITION_OUT_OF_RANGE)); exception.initCause(new DataSourceException(DataSourceException.POSITION_OUT_OF_RANGE));
} }
...@@ -611,7 +615,8 @@ public class CronetDataSource extends BaseDataSource implements HttpDataSource { ...@@ -611,7 +615,8 @@ public class CronetDataSource extends BaseDataSource implements HttpDataSource {
// The industry standard is to disregard POST redirects when the status code is 307 or 308. // The industry standard is to disregard POST redirects when the status code is 307 or 308.
if (responseCode == 307 || responseCode == 308) { if (responseCode == 307 || responseCode == 308) {
exception = exception =
new InvalidResponseCodeException(responseCode, info.getAllHeaders(), currentDataSpec); new InvalidResponseCodeException(
responseCode, info.getHttpStatusText(), info.getAllHeaders(), currentDataSpec);
operation.open(); operation.open();
return; return;
} }
......
extensions/cronet/src/main/java/com/google/android/exoplayer2/ext/cronet/CronetEngineWrapper.java
...@@ -19,6 +19,7 @@ import android.content.Context; ...@@ -19,6 +19,7 @@ import android.content.Context;
import android.support.annotation.IntDef; import android.support.annotation.IntDef;
import com.google.android.exoplayer2.util.Log; import com.google.android.exoplayer2.util.Log;
import com.google.android.exoplayer2.util.Util; import com.google.android.exoplayer2.util.Util;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
import java.lang.reflect.Field; import java.lang.reflect.Field;
...@@ -43,6 +44,7 @@ public final class CronetEngineWrapper { ...@@ -43,6 +44,7 @@ public final class CronetEngineWrapper {
* Source of {@link CronetEngine}. One of {@link #SOURCE_NATIVE}, {@link #SOURCE_GMS}, {@link * Source of {@link CronetEngine}. One of {@link #SOURCE_NATIVE}, {@link #SOURCE_GMS}, {@link
* #SOURCE_UNKNOWN}, {@link #SOURCE_USER_PROVIDED} or {@link #SOURCE_UNAVAILABLE}. * #SOURCE_UNKNOWN}, {@link #SOURCE_USER_PROVIDED} or {@link #SOURCE_UNAVAILABLE}.
*/ */
@Documented
@Retention(RetentionPolicy.SOURCE) @Retention(RetentionPolicy.SOURCE)
@IntDef({SOURCE_NATIVE, SOURCE_GMS, SOURCE_UNKNOWN, SOURCE_USER_PROVIDED, SOURCE_UNAVAILABLE}) @IntDef({SOURCE_NATIVE, SOURCE_GMS, SOURCE_UNKNOWN, SOURCE_USER_PROVIDED, SOURCE_UNAVAILABLE})
public @interface CronetEngineSource {} public @interface CronetEngineSource {}
......
extensions/flac/README.md
...@@ -28,18 +28,19 @@ EXOPLAYER_ROOT="$(pwd)" ...@@ -28,18 +28,19 @@ EXOPLAYER_ROOT="$(pwd)"
FLAC_EXT_PATH="${EXOPLAYER_ROOT}/extensions/flac/src/main" FLAC_EXT_PATH="${EXOPLAYER_ROOT}/extensions/flac/src/main"
``` ```
* Download the [Android NDK][] and set its location in an environment variable: * Download the [Android NDK][] (version <= 17c) and set its location in an
environment variable:
``` ```
NDK_PATH="<path to Android NDK>" NDK_PATH="<path to Android NDK>"
``` ```
* Download and extract flac-1.3.1 as "${FLAC_EXT_PATH}/jni/flac" folder: * Download and extract flac-1.3.2 as "${FLAC_EXT_PATH}/jni/flac" folder:
``` ```
cd "${FLAC_EXT_PATH}/jni" && \ cd "${FLAC_EXT_PATH}/jni" && \
curl https://ftp.osuosl.org/pub/xiph/releases/flac/flac-1.3.1.tar.xz | tar xJ && \ curl https://ftp.osuosl.org/pub/xiph/releases/flac/flac-1.3.2.tar.xz | tar xJ && \
mv flac-1.3.1 flac mv flac-1.3.2 flac
``` ```
* Build the JNI native libraries from the command line: * Build the JNI native libraries from the command line:
......
extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/FlacExtractor.java
...@@ -37,6 +37,7 @@ import com.google.android.exoplayer2.util.FlacStreamInfo; ...@@ -37,6 +37,7 @@ import com.google.android.exoplayer2.util.FlacStreamInfo;
import com.google.android.exoplayer2.util.MimeTypes; import com.google.android.exoplayer2.util.MimeTypes;
import com.google.android.exoplayer2.util.ParsableByteArray; import com.google.android.exoplayer2.util.ParsableByteArray;
import java.io.IOException; import java.io.IOException;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
...@@ -54,6 +55,7 @@ public final class FlacExtractor implements Extractor { ...@@ -54,6 +55,7 @@ public final class FlacExtractor implements Extractor {
* Flags controlling the behavior of the extractor. Possible flag value is {@link * Flags controlling the behavior of the extractor. Possible flag value is {@link
* #FLAG_DISABLE_ID3_METADATA}. * #FLAG_DISABLE_ID3_METADATA}.
*/ */
@Documented
@Retention(RetentionPolicy.SOURCE) @Retention(RetentionPolicy.SOURCE)
@IntDef( @IntDef(
flag = true, flag = true,
......
extensions/flac/src/main/jni/Android.mk
...@@ -30,9 +30,9 @@ LOCAL_C_INCLUDES := \ ...@@ -30,9 +30,9 @@ LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/flac/src/libFLAC/include $(LOCAL_PATH)/flac/src/libFLAC/include
LOCAL_SRC_FILES := $(FLAC_SOURCES) LOCAL_SRC_FILES := $(FLAC_SOURCES)
LOCAL_CFLAGS += '-DVERSION="1.3.1"' -DFLAC__NO_MD5 -DFLAC__INTEGER_ONLY_LIBRARY -DFLAC__NO_ASM LOCAL_CFLAGS += '-DPACKAGE_VERSION="1.3.2"' -DFLAC__NO_MD5 -DFLAC__INTEGER_ONLY_LIBRARY
LOCAL_CFLAGS += -D_REENTRANT -DPIC -DU_COMMON_IMPLEMENTATION -fPIC -DHAVE_SYS_PARAM_H LOCAL_CFLAGS += -D_REENTRANT -DPIC -DU_COMMON_IMPLEMENTATION -fPIC -DHAVE_SYS_PARAM_H
LOCAL_CFLAGS += -O3 -funroll-loops -finline-functions LOCAL_CFLAGS += -O3 -funroll-loops -finline-functions -DFLAC__NO_ASM '-DFLAC__HAS_OGG=0'
LOCAL_LDLIBS := -llog -lz -lm LOCAL_LDLIBS := -llog -lz -lm
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)
extensions/flac/src/main/jni/Application.mk
...@@ -17,4 +17,4 @@ ...@@ -17,4 +17,4 @@
APP_OPTIM := release APP_OPTIM := release
APP_STL := gnustl_static APP_STL := gnustl_static
APP_CPPFLAGS := -frtti APP_CPPFLAGS := -frtti
APP_PLATFORM := android-9 APP_PLATFORM := android-14
extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/ImaAdsLoader.java
...@@ -40,6 +40,7 @@ import com.google.ads.interactivemedia.v3.api.AdsRequest; ...@@ -40,6 +40,7 @@ import com.google.ads.interactivemedia.v3.api.AdsRequest;
import com.google.ads.interactivemedia.v3.api.CompanionAdSlot; import com.google.ads.interactivemedia.v3.api.CompanionAdSlot;
import com.google.ads.interactivemedia.v3.api.ImaSdkFactory; import com.google.ads.interactivemedia.v3.api.ImaSdkFactory;
import com.google.ads.interactivemedia.v3.api.ImaSdkSettings; import com.google.ads.interactivemedia.v3.api.ImaSdkSettings;
import com.google.ads.interactivemedia.v3.api.UiElement;
import com.google.ads.interactivemedia.v3.api.player.ContentProgressProvider; import com.google.ads.interactivemedia.v3.api.player.ContentProgressProvider;
import com.google.ads.interactivemedia.v3.api.player.VideoAdPlayer; import com.google.ads.interactivemedia.v3.api.player.VideoAdPlayer;
import com.google.ads.interactivemedia.v3.api.player.VideoProgressUpdate; import com.google.ads.interactivemedia.v3.api.player.VideoProgressUpdate;
...@@ -60,14 +61,17 @@ import com.google.android.exoplayer2.util.Log; ...@@ -60,14 +61,17 @@ import com.google.android.exoplayer2.util.Log;
import com.google.android.exoplayer2.util.MimeTypes; import com.google.android.exoplayer2.util.MimeTypes;
import com.google.android.exoplayer2.util.Util; import com.google.android.exoplayer2.util.Util;
import java.io.IOException; import java.io.IOException;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collection; import java.util.Collection;
import java.util.Collections; import java.util.Collections;
import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set;
/** Loads ads using the IMA SDK. All methods are called on the main thread. */ /** Loads ads using the IMA SDK. All methods are called on the main thread. */
public final class ImaAdsLoader public final class ImaAdsLoader
...@@ -90,8 +94,11 @@ public final class ImaAdsLoader ...@@ -90,8 +94,11 @@ public final class ImaAdsLoader
private @Nullable ImaSdkSettings imaSdkSettings; private @Nullable ImaSdkSettings imaSdkSettings;
private @Nullable AdEventListener adEventListener; private @Nullable AdEventListener adEventListener;
private @Nullable Set<UiElement> adUiElements;
private int vastLoadTimeoutMs; private int vastLoadTimeoutMs;
private int mediaLoadTimeoutMs; private int mediaLoadTimeoutMs;
private int mediaBitrate;
private boolean focusSkipButtonWhenAvailable;
private ImaFactory imaFactory; private ImaFactory imaFactory;
/** /**
...@@ -103,6 +110,8 @@ public final class ImaAdsLoader ...@@ -103,6 +110,8 @@ public final class ImaAdsLoader
this.context = Assertions.checkNotNull(context); this.context = Assertions.checkNotNull(context);
vastLoadTimeoutMs = TIMEOUT_UNSET; vastLoadTimeoutMs = TIMEOUT_UNSET;
mediaLoadTimeoutMs = TIMEOUT_UNSET; mediaLoadTimeoutMs = TIMEOUT_UNSET;
mediaBitrate = BITRATE_UNSET;
focusSkipButtonWhenAvailable = true;
imaFactory = new DefaultImaFactory(); imaFactory = new DefaultImaFactory();
} }
...@@ -133,6 +142,18 @@ public final class ImaAdsLoader ...@@ -133,6 +142,18 @@ public final class ImaAdsLoader
} }
/** /**
* Sets the ad UI elements to be rendered by the IMA SDK.
*
* @param adUiElements The ad UI elements to be rendered by the IMA SDK.
* @return This builder, for convenience.
* @see AdsRenderingSettings#setUiElements(Set)
*/
public Builder setAdUiElements(Set<UiElement> adUiElements) {
this.adUiElements = new HashSet<>(Assertions.checkNotNull(adUiElements));
return this;
}
/**
* Sets the VAST load timeout, in milliseconds. * Sets the VAST load timeout, in milliseconds.
* *
* @param vastLoadTimeoutMs The VAST load timeout, in milliseconds. * @param vastLoadTimeoutMs The VAST load timeout, in milliseconds.
...@@ -140,7 +161,7 @@ public final class ImaAdsLoader ...@@ -140,7 +161,7 @@ public final class ImaAdsLoader
* @see AdsRequest#setVastLoadTimeout(float) * @see AdsRequest#setVastLoadTimeout(float)
*/ */
public Builder setVastLoadTimeoutMs(int vastLoadTimeoutMs) { public Builder setVastLoadTimeoutMs(int vastLoadTimeoutMs) {
Assertions.checkArgument(vastLoadTimeoutMs >= 0); Assertions.checkArgument(vastLoadTimeoutMs > 0);
this.vastLoadTimeoutMs = vastLoadTimeoutMs; this.vastLoadTimeoutMs = vastLoadTimeoutMs;
return this; return this;
} }
...@@ -153,11 +174,38 @@ public final class ImaAdsLoader ...@@ -153,11 +174,38 @@ public final class ImaAdsLoader
* @see AdsRenderingSettings#setLoadVideoTimeout(int) * @see AdsRenderingSettings#setLoadVideoTimeout(int)
*/ */
public Builder setMediaLoadTimeoutMs(int mediaLoadTimeoutMs) { public Builder setMediaLoadTimeoutMs(int mediaLoadTimeoutMs) {
Assertions.checkArgument(mediaLoadTimeoutMs >= 0); Assertions.checkArgument(mediaLoadTimeoutMs > 0);
this.mediaLoadTimeoutMs = mediaLoadTimeoutMs; this.mediaLoadTimeoutMs = mediaLoadTimeoutMs;
return this; return this;
} }
/**
* Sets the media maximum recommended bitrate for ads, in bps.
*
* @param bitrate The media maximum recommended bitrate for ads, in bps.
* @return This builder, for convenience.
* @see AdsRenderingSettings#setBitrateKbps(int)
*/
public Builder setMaxMediaBitrate(int bitrate) {
Assertions.checkArgument(bitrate > 0);
this.mediaBitrate = bitrate;
return this;
}
/**
* Sets whether to focus the skip button (when available) on Android TV devices. The default
* setting is {@code true}.
*
* @param focusSkipButtonWhenAvailable Whether to focus the skip button (when available) on
* Android TV devices.
* @return This builder, for convenience.
* @see AdsRenderingSettings#setFocusSkipButtonWhenAvailable(boolean)
*/
public Builder setFocusSkipButtonWhenAvailable(boolean focusSkipButtonWhenAvailable) {
this.focusSkipButtonWhenAvailable = focusSkipButtonWhenAvailable;
return this;
}
// @VisibleForTesting // @VisibleForTesting
/* package */ Builder setImaFactory(ImaFactory imaFactory) { /* package */ Builder setImaFactory(ImaFactory imaFactory) {
this.imaFactory = Assertions.checkNotNull(imaFactory); this.imaFactory = Assertions.checkNotNull(imaFactory);
...@@ -180,6 +228,9 @@ public final class ImaAdsLoader ...@@ -180,6 +228,9 @@ public final class ImaAdsLoader
null, null,
vastLoadTimeoutMs, vastLoadTimeoutMs,
mediaLoadTimeoutMs, mediaLoadTimeoutMs,
mediaBitrate,
focusSkipButtonWhenAvailable,
adUiElements,
adEventListener, adEventListener,
imaFactory); imaFactory);
} }
...@@ -199,6 +250,9 @@ public final class ImaAdsLoader ...@@ -199,6 +250,9 @@ public final class ImaAdsLoader
adsResponse, adsResponse,
vastLoadTimeoutMs, vastLoadTimeoutMs,
mediaLoadTimeoutMs, mediaLoadTimeoutMs,
mediaBitrate,
focusSkipButtonWhenAvailable,
adUiElements,
adEventListener, adEventListener,
imaFactory); imaFactory);
} }
...@@ -228,8 +282,10 @@ public final class ImaAdsLoader ...@@ -228,8 +282,10 @@ public final class ImaAdsLoader
private static final long MAXIMUM_PRELOAD_DURATION_MS = 8000; private static final long MAXIMUM_PRELOAD_DURATION_MS = 8000;
private static final int TIMEOUT_UNSET = -1; private static final int TIMEOUT_UNSET = -1;
private static final int BITRATE_UNSET = -1;
/** The state of ad playback. */ /** The state of ad playback. */
@Documented
@Retention(RetentionPolicy.SOURCE) @Retention(RetentionPolicy.SOURCE)
@IntDef({IMA_AD_STATE_NONE, IMA_AD_STATE_PLAYING, IMA_AD_STATE_PAUSED}) @IntDef({IMA_AD_STATE_NONE, IMA_AD_STATE_PLAYING, IMA_AD_STATE_PAUSED})
private @interface ImaAdState {} private @interface ImaAdState {}
...@@ -250,6 +306,9 @@ public final class ImaAdsLoader ...@@ -250,6 +306,9 @@ public final class ImaAdsLoader
private final @Nullable String adsResponse; private final @Nullable String adsResponse;
private final int vastLoadTimeoutMs; private final int vastLoadTimeoutMs;
private final int mediaLoadTimeoutMs; private final int mediaLoadTimeoutMs;
private final boolean focusSkipButtonWhenAvailable;
private final int mediaBitrate;
private final @Nullable Set<UiElement> adUiElements;
private final @Nullable AdEventListener adEventListener; private final @Nullable AdEventListener adEventListener;
private final ImaFactory imaFactory; private final ImaFactory imaFactory;
private final Timeline.Period period; private final Timeline.Period period;
...@@ -336,6 +395,9 @@ public final class ImaAdsLoader ...@@ -336,6 +395,9 @@ public final class ImaAdsLoader
/* adsResponse= */ null, /* adsResponse= */ null,
/* vastLoadTimeoutMs= */ TIMEOUT_UNSET, /* vastLoadTimeoutMs= */ TIMEOUT_UNSET,
/* mediaLoadTimeoutMs= */ TIMEOUT_UNSET, /* mediaLoadTimeoutMs= */ TIMEOUT_UNSET,
/* mediaBitrate= */ BITRATE_UNSET,
/* focusSkipButtonWhenAvailable= */ true,
/* adUiElements= */ null,
/* adEventListener= */ null, /* adEventListener= */ null,
/* imaFactory= */ new DefaultImaFactory()); /* imaFactory= */ new DefaultImaFactory());
} }
...@@ -360,6 +422,9 @@ public final class ImaAdsLoader ...@@ -360,6 +422,9 @@ public final class ImaAdsLoader
/* adsResponse= */ null, /* adsResponse= */ null,
/* vastLoadTimeoutMs= */ TIMEOUT_UNSET, /* vastLoadTimeoutMs= */ TIMEOUT_UNSET,
/* mediaLoadTimeoutMs= */ TIMEOUT_UNSET, /* mediaLoadTimeoutMs= */ TIMEOUT_UNSET,
/* mediaBitrate= */ BITRATE_UNSET,
/* focusSkipButtonWhenAvailable= */ true,
/* adUiElements= */ null,
/* adEventListener= */ null, /* adEventListener= */ null,
/* imaFactory= */ new DefaultImaFactory()); /* imaFactory= */ new DefaultImaFactory());
} }
...@@ -371,6 +436,9 @@ public final class ImaAdsLoader ...@@ -371,6 +436,9 @@ public final class ImaAdsLoader
@Nullable String adsResponse, @Nullable String adsResponse,
int vastLoadTimeoutMs, int vastLoadTimeoutMs,
int mediaLoadTimeoutMs, int mediaLoadTimeoutMs,
int mediaBitrate,
boolean focusSkipButtonWhenAvailable,
@Nullable Set<UiElement> adUiElements,
@Nullable AdEventListener adEventListener, @Nullable AdEventListener adEventListener,
ImaFactory imaFactory) { ImaFactory imaFactory) {
Assertions.checkArgument(adTagUri != null || adsResponse != null); Assertions.checkArgument(adTagUri != null || adsResponse != null);
...@@ -378,6 +446,9 @@ public final class ImaAdsLoader ...@@ -378,6 +446,9 @@ public final class ImaAdsLoader
this.adsResponse = adsResponse; this.adsResponse = adsResponse;
this.vastLoadTimeoutMs = vastLoadTimeoutMs; this.vastLoadTimeoutMs = vastLoadTimeoutMs;
this.mediaLoadTimeoutMs = mediaLoadTimeoutMs; this.mediaLoadTimeoutMs = mediaLoadTimeoutMs;
this.mediaBitrate = mediaBitrate;
this.focusSkipButtonWhenAvailable = focusSkipButtonWhenAvailable;
this.adUiElements = adUiElements;
this.adEventListener = adEventListener; this.adEventListener = adEventListener;
this.imaFactory = imaFactory; this.imaFactory = imaFactory;
if (imaSdkSettings == null) { if (imaSdkSettings == null) {
...@@ -924,6 +995,13 @@ public final class ImaAdsLoader ...@@ -924,6 +995,13 @@ public final class ImaAdsLoader
if (mediaLoadTimeoutMs != TIMEOUT_UNSET) { if (mediaLoadTimeoutMs != TIMEOUT_UNSET) {
adsRenderingSettings.setLoadVideoTimeout(mediaLoadTimeoutMs); adsRenderingSettings.setLoadVideoTimeout(mediaLoadTimeoutMs);
} }
if (mediaBitrate != BITRATE_UNSET) {
adsRenderingSettings.setBitrateKbps(mediaBitrate / 1000);
}
adsRenderingSettings.setFocusSkipButtonWhenAvailable(focusSkipButtonWhenAvailable);
if (adUiElements != null) {
adsRenderingSettings.setUiElements(adUiElements);
}
// Set up the ad playback state, skipping ads based on the start position as required. // Set up the ad playback state, skipping ads based on the start position as required.
long[] adGroupTimesUs = getAdGroupTimesUs(adsManager.getAdCuePoints()); long[] adGroupTimesUs = getAdGroupTimesUs(adsManager.getAdCuePoints());
......
extensions/ima/src/test/java/com/google/android/exoplayer2/ext/ima/FakePlayer.java
...@@ -26,7 +26,6 @@ import java.util.ArrayList; ...@@ -26,7 +26,6 @@ import java.util.ArrayList;
/* package */ final class FakePlayer extends StubExoPlayer { /* package */ final class FakePlayer extends StubExoPlayer {
private final ArrayList<Player.EventListener> listeners; private final ArrayList<Player.EventListener> listeners;
private final Timeline.Window window;
private final Timeline.Period period; private final Timeline.Period period;
private final Timeline timeline; private final Timeline timeline;
...@@ -41,7 +40,6 @@ import java.util.ArrayList; ...@@ -41,7 +40,6 @@ import java.util.ArrayList;
public FakePlayer() { public FakePlayer() {
listeners = new ArrayList<>(); listeners = new ArrayList<>();
window = new Timeline.Window();
period = new Timeline.Period(); period = new Timeline.Period();
state = Player.STATE_IDLE; state = Player.STATE_IDLE;
playWhenReady = true; playWhenReady = true;
...@@ -152,16 +150,6 @@ import java.util.ArrayList; ...@@ -152,16 +150,6 @@ import java.util.ArrayList;
} }
@Override @Override
public int getNextWindowIndex() {
return C.INDEX_UNSET;
}
@Override
public int getPreviousWindowIndex() {
return C.INDEX_UNSET;
}
@Override
public long getDuration() { public long getDuration() {
if (timeline.isEmpty()) { if (timeline.isEmpty()) {
return C.INDEX_UNSET; return C.INDEX_UNSET;
......
extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/MediaSessionConnector.java
...@@ -259,6 +259,9 @@ public final class MediaSessionConnector { ...@@ -259,6 +259,9 @@ public final class MediaSessionConnector {
/** See {@link MediaSessionCompat.Callback#onSetRating(RatingCompat)}. */ /** See {@link MediaSessionCompat.Callback#onSetRating(RatingCompat)}. */
void onSetRating(Player player, RatingCompat rating); void onSetRating(Player player, RatingCompat rating);
/** See {@link MediaSessionCompat.Callback#onSetRating(RatingCompat, Bundle)}. */
void onSetRating(Player player, RatingCompat rating, Bundle extras);
} }
/** /**
...@@ -1004,6 +1007,13 @@ public final class MediaSessionConnector { ...@@ -1004,6 +1007,13 @@ public final class MediaSessionConnector {
} }
@Override @Override
public void onSetRating(RatingCompat rating, Bundle extras) {
if (canDispatchToRatingCallback(PlaybackStateCompat.ACTION_SET_RATING)) {
ratingCallback.onSetRating(player, rating, extras);
}
}
@Override
public void onAddQueueItem(MediaDescriptionCompat description) { public void onAddQueueItem(MediaDescriptionCompat description) {
if (queueEditor != null) { if (queueEditor != null) {
queueEditor.onAddQueueItem(player, description); queueEditor.onAddQueueItem(player, description);
......
extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/TimelineQueueNavigator.java
...@@ -39,6 +39,7 @@ public abstract class TimelineQueueNavigator implements MediaSessionConnector.Qu ...@@ -39,6 +39,7 @@ public abstract class TimelineQueueNavigator implements MediaSessionConnector.Qu
public static final int DEFAULT_MAX_QUEUE_SIZE = 10; public static final int DEFAULT_MAX_QUEUE_SIZE = 10;
private final MediaSessionCompat mediaSession; private final MediaSessionCompat mediaSession;
private final Timeline.Window window;
protected final int maxQueueSize; protected final int maxQueueSize;
private long activeQueueItemId; private long activeQueueItemId;
...@@ -68,6 +69,7 @@ public abstract class TimelineQueueNavigator implements MediaSessionConnector.Qu ...@@ -68,6 +69,7 @@ public abstract class TimelineQueueNavigator implements MediaSessionConnector.Qu
this.mediaSession = mediaSession; this.mediaSession = mediaSession;
this.maxQueueSize = maxQueueSize; this.maxQueueSize = maxQueueSize;
activeQueueItemId = MediaSessionCompat.QueueItem.UNKNOWN_ID; activeQueueItemId = MediaSessionCompat.QueueItem.UNKNOWN_ID;
window = new Timeline.Window();
} }
/** /**
...@@ -81,25 +83,24 @@ public abstract class TimelineQueueNavigator implements MediaSessionConnector.Qu ...@@ -81,25 +83,24 @@ public abstract class TimelineQueueNavigator implements MediaSessionConnector.Qu
@Override @Override
public long getSupportedQueueNavigatorActions(Player player) { public long getSupportedQueueNavigatorActions(Player player) {
if (player == null || player.getCurrentTimeline().getWindowCount() < 2) { if (player == null) {
return 0; return 0;
} }
if (player.getRepeatMode() != Player.REPEAT_MODE_OFF) { Timeline timeline = player.getCurrentTimeline();
return PlaybackStateCompat.ACTION_SKIP_TO_NEXT | PlaybackStateCompat.ACTION_SKIP_TO_PREVIOUS if (timeline.isEmpty() || player.isPlayingAd()) {
| PlaybackStateCompat.ACTION_SKIP_TO_QUEUE_ITEM; return 0;
} }
long actions = 0;
int currentWindowIndex = player.getCurrentWindowIndex(); if (timeline.getWindowCount() > 1) {
long actions; actions |= PlaybackStateCompat.ACTION_SKIP_TO_QUEUE_ITEM;
if (currentWindowIndex == 0) { }
actions = PlaybackStateCompat.ACTION_SKIP_TO_NEXT; if (window.isSeekable || !window.isDynamic || player.hasPrevious()) {
} else if (currentWindowIndex == player.getCurrentTimeline().getWindowCount() - 1) { actions |= PlaybackStateCompat.ACTION_SKIP_TO_PREVIOUS;
actions = PlaybackStateCompat.ACTION_SKIP_TO_PREVIOUS;
} else {
actions = PlaybackStateCompat.ACTION_SKIP_TO_NEXT
| PlaybackStateCompat.ACTION_SKIP_TO_PREVIOUS;
} }
return actions | PlaybackStateCompat.ACTION_SKIP_TO_QUEUE_ITEM; if (window.isDynamic || player.hasNext()) {
actions |= PlaybackStateCompat.ACTION_SKIP_TO_NEXT;
}
return actions;
} }
@Override @Override
...@@ -125,22 +126,25 @@ public abstract class TimelineQueueNavigator implements MediaSessionConnector.Qu ...@@ -125,22 +126,25 @@ public abstract class TimelineQueueNavigator implements MediaSessionConnector.Qu
@Override @Override
public void onSkipToPrevious(Player player) { public void onSkipToPrevious(Player player) {
Timeline timeline = player.getCurrentTimeline(); Timeline timeline = player.getCurrentTimeline();
if (timeline.isEmpty()) { if (timeline.isEmpty() || player.isPlayingAd()) {
return; return;
} }
int windowIndex = player.getCurrentWindowIndex();
timeline.getWindow(windowIndex, window);
int previousWindowIndex = player.getPreviousWindowIndex(); int previousWindowIndex = player.getPreviousWindowIndex();
if (player.getCurrentPosition() > MAX_POSITION_FOR_SEEK_TO_PREVIOUS if (previousWindowIndex != C.INDEX_UNSET
|| previousWindowIndex == C.INDEX_UNSET) { && (player.getCurrentPosition() <= MAX_POSITION_FOR_SEEK_TO_PREVIOUS
player.seekTo(0); || (window.isDynamic && !window.isSeekable))) {
} else {
player.seekTo(previousWindowIndex, C.TIME_UNSET); player.seekTo(previousWindowIndex, C.TIME_UNSET);
} else {
player.seekTo(0);
} }
} }
@Override @Override
public void onSkipToQueueItem(Player player, long id) { public void onSkipToQueueItem(Player player, long id) {
Timeline timeline = player.getCurrentTimeline(); Timeline timeline = player.getCurrentTimeline();
if (timeline.isEmpty()) { if (timeline.isEmpty() || player.isPlayingAd()) {
return; return;
} }
int windowIndex = (int) id; int windowIndex = (int) id;
...@@ -152,12 +156,15 @@ public abstract class TimelineQueueNavigator implements MediaSessionConnector.Qu ...@@ -152,12 +156,15 @@ public abstract class TimelineQueueNavigator implements MediaSessionConnector.Qu
@Override @Override
public void onSkipToNext(Player player) { public void onSkipToNext(Player player) {
Timeline timeline = player.getCurrentTimeline(); Timeline timeline = player.getCurrentTimeline();
if (timeline.isEmpty()) { if (timeline.isEmpty() || player.isPlayingAd()) {
return; return;
} }
int windowIndex = player.getCurrentWindowIndex();
int nextWindowIndex = player.getNextWindowIndex(); int nextWindowIndex = player.getNextWindowIndex();
if (nextWindowIndex != C.INDEX_UNSET) { if (nextWindowIndex != C.INDEX_UNSET) {
player.seekTo(nextWindowIndex, C.TIME_UNSET); player.seekTo(nextWindowIndex, C.TIME_UNSET);
} else if (timeline.getWindow(windowIndex, window).isDynamic) {
player.seekTo(windowIndex, C.TIME_UNSET);
} }
} }
......
extensions/okhttp/src/main/java/com/google/android/exoplayer2/ext/okhttp/OkHttpDataSource.java
...@@ -172,8 +172,8 @@ public class OkHttpDataSource extends BaseDataSource implements HttpDataSource { ...@@ -172,8 +172,8 @@ public class OkHttpDataSource extends BaseDataSource implements HttpDataSource {
if (!response.isSuccessful()) { if (!response.isSuccessful()) {
Map<String, List<String>> headers = response.headers().toMultimap(); Map<String, List<String>> headers = response.headers().toMultimap();
closeConnectionQuietly(); closeConnectionQuietly();
InvalidResponseCodeException exception = new InvalidResponseCodeException( InvalidResponseCodeException exception =
responseCode, headers, dataSpec); new InvalidResponseCodeException(responseCode, response.message(), headers, dataSpec);
if (responseCode == 416) { if (responseCode == 416) {
exception.initCause(new DataSourceException(DataSourceException.POSITION_OUT_OF_RANGE)); exception.initCause(new DataSourceException(DataSourceException.POSITION_OUT_OF_RANGE));
} }
......
extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/LibvpxVideoRenderer.java
...@@ -45,6 +45,7 @@ import com.google.android.exoplayer2.util.Util; ...@@ -45,6 +45,7 @@ import com.google.android.exoplayer2.util.Util;
import com.google.android.exoplayer2.video.VideoFrameMetadataListener; import com.google.android.exoplayer2.video.VideoFrameMetadataListener;
import com.google.android.exoplayer2.video.VideoRendererEventListener; import com.google.android.exoplayer2.video.VideoRendererEventListener;
import com.google.android.exoplayer2.video.VideoRendererEventListener.EventDispatcher; import com.google.android.exoplayer2.video.VideoRendererEventListener.EventDispatcher;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
...@@ -64,9 +65,13 @@ import java.lang.annotation.RetentionPolicy; ...@@ -64,9 +65,13 @@ import java.lang.annotation.RetentionPolicy;
*/ */
public class LibvpxVideoRenderer extends BaseRenderer { public class LibvpxVideoRenderer extends BaseRenderer {
@Documented
@Retention(RetentionPolicy.SOURCE) @Retention(RetentionPolicy.SOURCE)
@IntDef({REINITIALIZATION_STATE_NONE, REINITIALIZATION_STATE_SIGNAL_END_OF_STREAM, @IntDef({
REINITIALIZATION_STATE_WAIT_END_OF_STREAM}) REINITIALIZATION_STATE_NONE,
REINITIALIZATION_STATE_SIGNAL_END_OF_STREAM,
REINITIALIZATION_STATE_WAIT_END_OF_STREAM
})
private @interface ReinitializationState {} private @interface ReinitializationState {}
/** /**
* The decoder does not need to be re-initialized. * The decoder does not need to be re-initialized.
......
library/core/src/main/java/com/google/android/exoplayer2/BasePlayer.java 0 → 100644
/*
* 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;
import android.support.annotation.Nullable;
import com.google.android.exoplayer2.util.Util;
/** Abstract base {@link Player} which implements common implementation independent methods. */
public abstract class BasePlayer implements Player {
protected final Timeline.Window window;
public BasePlayer() {
window = new Timeline.Window();
}
@Override
public final void seekToDefaultPosition() {
seekToDefaultPosition(getCurrentWindowIndex());
}
@Override
public final void seekToDefaultPosition(int windowIndex) {
seekTo(windowIndex, /* positionMs= */ C.TIME_UNSET);
}
@Override
public final void seekTo(long positionMs) {
seekTo(getCurrentWindowIndex(), positionMs);
}
@Override
public final boolean hasPrevious() {
return getPreviousWindowIndex() != C.INDEX_UNSET;
}
@Override
public final void previous() {
int previousWindowIndex = getPreviousWindowIndex();
if (previousWindowIndex != C.INDEX_UNSET) {
seekToDefaultPosition(previousWindowIndex);
}
}
@Override
public final boolean hasNext() {
return getNextWindowIndex() != C.INDEX_UNSET;
}
@Override
public final void next() {
int nextWindowIndex = getNextWindowIndex();
if (nextWindowIndex != C.INDEX_UNSET) {
seekToDefaultPosition(nextWindowIndex);
}
}
@Override
public final void stop() {
stop(/* reset= */ false);
}
@Override
public final int getNextWindowIndex() {
Timeline timeline = getCurrentTimeline();
return timeline.isEmpty()
? C.INDEX_UNSET
: timeline.getNextWindowIndex(
getCurrentWindowIndex(), getRepeatModeForNavigation(), getShuffleModeEnabled());
}
@Override
public final int getPreviousWindowIndex() {
Timeline timeline = getCurrentTimeline();
return timeline.isEmpty()
? C.INDEX_UNSET
: timeline.getPreviousWindowIndex(
getCurrentWindowIndex(), getRepeatModeForNavigation(), getShuffleModeEnabled());
}
@Override
@Nullable
public final Object getCurrentTag() {
int windowIndex = getCurrentWindowIndex();
Timeline timeline = getCurrentTimeline();
return windowIndex >= timeline.getWindowCount()
? null
: timeline.getWindow(windowIndex, window, /* setTag= */ true).tag;
}
@Override
public final int getBufferedPercentage() {
long position = getBufferedPosition();
long duration = getDuration();
return position == C.TIME_UNSET || duration == C.TIME_UNSET
? 0
: duration == 0 ? 100 : Util.constrainValue((int) ((position * 100) / duration), 0, 100);
}
@Override
public final boolean isCurrentWindowDynamic() {
Timeline timeline = getCurrentTimeline();
return !timeline.isEmpty() && timeline.getWindow(getCurrentWindowIndex(), window).isDynamic;
}
@Override
public final boolean isCurrentWindowSeekable() {
Timeline timeline = getCurrentTimeline();
return !timeline.isEmpty() && timeline.getWindow(getCurrentWindowIndex(), window).isSeekable;
}
@Override
public final long getContentDuration() {
Timeline timeline = getCurrentTimeline();
return timeline.isEmpty()
? C.TIME_UNSET
: timeline.getWindow(getCurrentWindowIndex(), window).getDurationMs();
}
@RepeatMode
private int getRepeatModeForNavigation() {
@RepeatMode int repeatMode = getRepeatMode();
return repeatMode == REPEAT_MODE_ONE ? REPEAT_MODE_OFF : repeatMode;
}
}
library/core/src/main/java/com/google/android/exoplayer2/C.java
...@@ -28,6 +28,7 @@ import com.google.android.exoplayer2.audio.AuxEffectInfo; ...@@ -28,6 +28,7 @@ import com.google.android.exoplayer2.audio.AuxEffectInfo;
import com.google.android.exoplayer2.util.Util; import com.google.android.exoplayer2.util.Util;
import com.google.android.exoplayer2.video.VideoFrameMetadataListener; import com.google.android.exoplayer2.video.VideoFrameMetadataListener;
import com.google.android.exoplayer2.video.spherical.CameraMotionListener; import com.google.android.exoplayer2.video.spherical.CameraMotionListener;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
import java.util.UUID; import java.util.UUID;
...@@ -114,6 +115,7 @@ public final class C { ...@@ -114,6 +115,7 @@ public final class C {
* Crypto modes for a codec. One of {@link #CRYPTO_MODE_UNENCRYPTED}, {@link #CRYPTO_MODE_AES_CTR} * Crypto modes for a codec. One of {@link #CRYPTO_MODE_UNENCRYPTED}, {@link #CRYPTO_MODE_AES_CTR}
* or {@link #CRYPTO_MODE_AES_CBC}. * or {@link #CRYPTO_MODE_AES_CBC}.
*/ */
@Documented
@Retention(RetentionPolicy.SOURCE) @Retention(RetentionPolicy.SOURCE)
@IntDef({CRYPTO_MODE_UNENCRYPTED, CRYPTO_MODE_AES_CTR, CRYPTO_MODE_AES_CBC}) @IntDef({CRYPTO_MODE_UNENCRYPTED, CRYPTO_MODE_AES_CTR, CRYPTO_MODE_AES_CBC})
public @interface CryptoMode {} public @interface CryptoMode {}
...@@ -144,6 +146,7 @@ public final class C { ...@@ -144,6 +146,7 @@ public final class C {
* #ENCODING_E_AC3}, {@link #ENCODING_DTS}, {@link #ENCODING_DTS_HD} or {@link * #ENCODING_E_AC3}, {@link #ENCODING_DTS}, {@link #ENCODING_DTS_HD} or {@link
* #ENCODING_DOLBY_TRUEHD}. * #ENCODING_DOLBY_TRUEHD}.
*/ */
@Documented
@Retention(RetentionPolicy.SOURCE) @Retention(RetentionPolicy.SOURCE)
@IntDef({ @IntDef({
Format.NO_VALUE, Format.NO_VALUE,
...@@ -169,6 +172,7 @@ public final class C { ...@@ -169,6 +172,7 @@ public final class C {
* #ENCODING_PCM_24BIT}, {@link #ENCODING_PCM_32BIT}, {@link #ENCODING_PCM_FLOAT}, {@link * #ENCODING_PCM_24BIT}, {@link #ENCODING_PCM_32BIT}, {@link #ENCODING_PCM_FLOAT}, {@link
* #ENCODING_PCM_MU_LAW} or {@link #ENCODING_PCM_A_LAW}. * #ENCODING_PCM_MU_LAW} or {@link #ENCODING_PCM_A_LAW}.
*/ */
@Documented
@Retention(RetentionPolicy.SOURCE) @Retention(RetentionPolicy.SOURCE)
@IntDef({ @IntDef({
Format.NO_VALUE, Format.NO_VALUE,
...@@ -215,6 +219,7 @@ public final class C { ...@@ -215,6 +219,7 @@ public final class C {
* #STREAM_TYPE_RING}, {@link #STREAM_TYPE_SYSTEM}, {@link #STREAM_TYPE_VOICE_CALL} or {@link * #STREAM_TYPE_RING}, {@link #STREAM_TYPE_SYSTEM}, {@link #STREAM_TYPE_VOICE_CALL} or {@link
* #STREAM_TYPE_USE_DEFAULT}. * #STREAM_TYPE_USE_DEFAULT}.
*/ */
@Documented
@Retention(RetentionPolicy.SOURCE) @Retention(RetentionPolicy.SOURCE)
@IntDef({ @IntDef({
STREAM_TYPE_ALARM, STREAM_TYPE_ALARM,
...@@ -269,6 +274,7 @@ public final class C { ...@@ -269,6 +274,7 @@ public final class C {
* #CONTENT_TYPE_MOVIE}, {@link #CONTENT_TYPE_MUSIC}, {@link #CONTENT_TYPE_SONIFICATION}, {@link * #CONTENT_TYPE_MOVIE}, {@link #CONTENT_TYPE_MUSIC}, {@link #CONTENT_TYPE_SONIFICATION}, {@link
* #CONTENT_TYPE_SPEECH} or {@link #CONTENT_TYPE_UNKNOWN}. * #CONTENT_TYPE_SPEECH} or {@link #CONTENT_TYPE_UNKNOWN}.
*/ */
@Documented
@Retention(RetentionPolicy.SOURCE) @Retention(RetentionPolicy.SOURCE)
@IntDef({ @IntDef({
CONTENT_TYPE_MOVIE, CONTENT_TYPE_MOVIE,
...@@ -309,6 +315,7 @@ public final class C { ...@@ -309,6 +315,7 @@ public final class C {
* <p>Note that {@code FLAG_HW_AV_SYNC} is not available because the player takes care of setting * <p>Note that {@code FLAG_HW_AV_SYNC} is not available because the player takes care of setting
* the flag when tunneling is enabled via a track selector. * the flag when tunneling is enabled via a track selector.
*/ */
@Documented
@Retention(RetentionPolicy.SOURCE) @Retention(RetentionPolicy.SOURCE)
@IntDef( @IntDef(
flag = true, flag = true,
...@@ -331,6 +338,7 @@ public final class C { ...@@ -331,6 +338,7 @@ public final class C {
* #USAGE_UNKNOWN}, {@link #USAGE_VOICE_COMMUNICATION} or {@link * #USAGE_UNKNOWN}, {@link #USAGE_VOICE_COMMUNICATION} or {@link
* #USAGE_VOICE_COMMUNICATION_SIGNALLING}. * #USAGE_VOICE_COMMUNICATION_SIGNALLING}.
*/ */
@Documented
@Retention(RetentionPolicy.SOURCE) @Retention(RetentionPolicy.SOURCE)
@IntDef({ @IntDef({
USAGE_ALARM, USAGE_ALARM,
...@@ -427,6 +435,7 @@ public final class C { ...@@ -427,6 +435,7 @@ public final class C {
* #AUDIOFOCUS_GAIN_TRANSIENT}, {@link #AUDIOFOCUS_GAIN_TRANSIENT_MAY_DUCK} or {@link * #AUDIOFOCUS_GAIN_TRANSIENT}, {@link #AUDIOFOCUS_GAIN_TRANSIENT_MAY_DUCK} or {@link
* #AUDIOFOCUS_GAIN_TRANSIENT_EXCLUSIVE}. * #AUDIOFOCUS_GAIN_TRANSIENT_EXCLUSIVE}.
*/ */
@Documented
@Retention(RetentionPolicy.SOURCE) @Retention(RetentionPolicy.SOURCE)
@IntDef({ @IntDef({
AUDIOFOCUS_NONE, AUDIOFOCUS_NONE,
...@@ -454,6 +463,7 @@ public final class C { ...@@ -454,6 +463,7 @@ public final class C {
* #BUFFER_FLAG_KEY_FRAME}, {@link #BUFFER_FLAG_END_OF_STREAM}, {@link #BUFFER_FLAG_ENCRYPTED} and * #BUFFER_FLAG_KEY_FRAME}, {@link #BUFFER_FLAG_END_OF_STREAM}, {@link #BUFFER_FLAG_ENCRYPTED} and
* {@link #BUFFER_FLAG_DECODE_ONLY}. * {@link #BUFFER_FLAG_DECODE_ONLY}.
*/ */
@Documented
@Retention(RetentionPolicy.SOURCE) @Retention(RetentionPolicy.SOURCE)
@IntDef( @IntDef(
flag = true, flag = true,
...@@ -482,6 +492,7 @@ public final class C { ...@@ -482,6 +492,7 @@ public final class C {
* Video scaling modes for {@link MediaCodec}-based {@link Renderer}s. One of {@link * Video scaling modes for {@link MediaCodec}-based {@link Renderer}s. One of {@link
* #VIDEO_SCALING_MODE_SCALE_TO_FIT} or {@link #VIDEO_SCALING_MODE_SCALE_TO_FIT_WITH_CROPPING}. * #VIDEO_SCALING_MODE_SCALE_TO_FIT} or {@link #VIDEO_SCALING_MODE_SCALE_TO_FIT_WITH_CROPPING}.
*/ */
@Documented
@Retention(RetentionPolicy.SOURCE) @Retention(RetentionPolicy.SOURCE)
@IntDef(value = {VIDEO_SCALING_MODE_SCALE_TO_FIT, VIDEO_SCALING_MODE_SCALE_TO_FIT_WITH_CROPPING}) @IntDef(value = {VIDEO_SCALING_MODE_SCALE_TO_FIT, VIDEO_SCALING_MODE_SCALE_TO_FIT_WITH_CROPPING})
public @interface VideoScalingMode {} public @interface VideoScalingMode {}
...@@ -504,6 +515,7 @@ public final class C { ...@@ -504,6 +515,7 @@ public final class C {
* Track selection flags. Possible flag values are {@link #SELECTION_FLAG_DEFAULT}, {@link * Track selection flags. Possible flag values are {@link #SELECTION_FLAG_DEFAULT}, {@link
* #SELECTION_FLAG_FORCED} and {@link #SELECTION_FLAG_AUTOSELECT}. * #SELECTION_FLAG_FORCED} and {@link #SELECTION_FLAG_AUTOSELECT}.
*/ */
@Documented
@Retention(RetentionPolicy.SOURCE) @Retention(RetentionPolicy.SOURCE)
@IntDef( @IntDef(
flag = true, flag = true,
...@@ -530,6 +542,7 @@ public final class C { ...@@ -530,6 +542,7 @@ public final class C {
* Represents a streaming or other media type. One of {@link #TYPE_DASH}, {@link #TYPE_SS}, {@link * Represents a streaming or other media type. One of {@link #TYPE_DASH}, {@link #TYPE_SS}, {@link
* #TYPE_HLS} or {@link #TYPE_OTHER}. * #TYPE_HLS} or {@link #TYPE_OTHER}.
*/ */
@Documented
@Retention(RetentionPolicy.SOURCE) @Retention(RetentionPolicy.SOURCE)
@IntDef({TYPE_DASH, TYPE_SS, TYPE_HLS, TYPE_OTHER}) @IntDef({TYPE_DASH, TYPE_SS, TYPE_HLS, TYPE_OTHER})
public @interface ContentType {} public @interface ContentType {}
...@@ -796,6 +809,7 @@ public final class C { ...@@ -796,6 +809,7 @@ public final class C {
* #STEREO_MODE_MONO}, {@link #STEREO_MODE_TOP_BOTTOM}, {@link #STEREO_MODE_LEFT_RIGHT} or {@link * #STEREO_MODE_MONO}, {@link #STEREO_MODE_TOP_BOTTOM}, {@link #STEREO_MODE_LEFT_RIGHT} or {@link
* #STEREO_MODE_STEREO_MESH}. * #STEREO_MODE_STEREO_MESH}.
*/ */
@Documented
@Retention(RetentionPolicy.SOURCE) @Retention(RetentionPolicy.SOURCE)
@IntDef({ @IntDef({
Format.NO_VALUE, Format.NO_VALUE,
...@@ -827,6 +841,7 @@ public final class C { ...@@ -827,6 +841,7 @@ public final class C {
* Video colorspaces. One of {@link Format#NO_VALUE}, {@link #COLOR_SPACE_BT709}, {@link * Video colorspaces. One of {@link Format#NO_VALUE}, {@link #COLOR_SPACE_BT709}, {@link
* #COLOR_SPACE_BT601} or {@link #COLOR_SPACE_BT2020}. * #COLOR_SPACE_BT601} or {@link #COLOR_SPACE_BT2020}.
*/ */
@Documented
@Retention(RetentionPolicy.SOURCE) @Retention(RetentionPolicy.SOURCE)
@IntDef({Format.NO_VALUE, COLOR_SPACE_BT709, COLOR_SPACE_BT601, COLOR_SPACE_BT2020}) @IntDef({Format.NO_VALUE, COLOR_SPACE_BT709, COLOR_SPACE_BT601, COLOR_SPACE_BT2020})
public @interface ColorSpace {} public @interface ColorSpace {}
...@@ -847,6 +862,7 @@ public final class C { ...@@ -847,6 +862,7 @@ public final class C {
* Video color transfer characteristics. One of {@link Format#NO_VALUE}, {@link * Video color transfer characteristics. One of {@link Format#NO_VALUE}, {@link
* #COLOR_TRANSFER_SDR}, {@link #COLOR_TRANSFER_ST2084} or {@link #COLOR_TRANSFER_HLG}. * #COLOR_TRANSFER_SDR}, {@link #COLOR_TRANSFER_ST2084} or {@link #COLOR_TRANSFER_HLG}.
*/ */
@Documented
@Retention(RetentionPolicy.SOURCE) @Retention(RetentionPolicy.SOURCE)
@IntDef({Format.NO_VALUE, COLOR_TRANSFER_SDR, COLOR_TRANSFER_ST2084, COLOR_TRANSFER_HLG}) @IntDef({Format.NO_VALUE, COLOR_TRANSFER_SDR, COLOR_TRANSFER_ST2084, COLOR_TRANSFER_HLG})
public @interface ColorTransfer {} public @interface ColorTransfer {}
...@@ -867,6 +883,7 @@ public final class C { ...@@ -867,6 +883,7 @@ public final class C {
* Video color range. One of {@link Format#NO_VALUE}, {@link #COLOR_RANGE_LIMITED} or {@link * Video color range. One of {@link Format#NO_VALUE}, {@link #COLOR_RANGE_LIMITED} or {@link
* #COLOR_RANGE_FULL}. * #COLOR_RANGE_FULL}.
*/ */
@Documented
@Retention(RetentionPolicy.SOURCE) @Retention(RetentionPolicy.SOURCE)
@IntDef({Format.NO_VALUE, COLOR_RANGE_LIMITED, COLOR_RANGE_FULL}) @IntDef({Format.NO_VALUE, COLOR_RANGE_LIMITED, COLOR_RANGE_FULL})
public @interface ColorRange {} public @interface ColorRange {}
...@@ -899,6 +916,7 @@ public final class C { ...@@ -899,6 +916,7 @@ public final class C {
* #NETWORK_TYPE_4G}, {@link #NETWORK_TYPE_CELLULAR_UNKNOWN}, {@link #NETWORK_TYPE_ETHERNET} or * #NETWORK_TYPE_4G}, {@link #NETWORK_TYPE_CELLULAR_UNKNOWN}, {@link #NETWORK_TYPE_ETHERNET} or
* {@link #NETWORK_TYPE_OTHER}. * {@link #NETWORK_TYPE_OTHER}.
*/ */
@Documented
@Retention(RetentionPolicy.SOURCE) @Retention(RetentionPolicy.SOURCE)
@IntDef({ @IntDef({
NETWORK_TYPE_UNKNOWN, NETWORK_TYPE_UNKNOWN,
...@@ -960,7 +978,10 @@ public final class C { ...@@ -960,7 +978,10 @@ public final class C {
} }
/** /**
* Returns a newly generated {@link android.media.AudioTrack} session identifier. * Returns a newly generated audio session identifier, or {@link AudioManager#ERROR} if an error
* occurred in which case audio playback may fail.
*
* @see AudioManager#generateAudioSessionId()
*/ */
@TargetApi(21) @TargetApi(21)
public static int generateAudioSessionIdV21(Context context) { public static int generateAudioSessionIdV21(Context context) {
......
library/core/src/main/java/com/google/android/exoplayer2/DefaultRenderersFactory.java
...@@ -36,6 +36,7 @@ import com.google.android.exoplayer2.util.Log; ...@@ -36,6 +36,7 @@ import com.google.android.exoplayer2.util.Log;
import com.google.android.exoplayer2.video.MediaCodecVideoRenderer; import com.google.android.exoplayer2.video.MediaCodecVideoRenderer;
import com.google.android.exoplayer2.video.VideoRendererEventListener; import com.google.android.exoplayer2.video.VideoRendererEventListener;
import com.google.android.exoplayer2.video.spherical.CameraMotionRenderer; import com.google.android.exoplayer2.video.spherical.CameraMotionRenderer;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
import java.lang.reflect.Constructor; import java.lang.reflect.Constructor;
...@@ -56,6 +57,7 @@ public class DefaultRenderersFactory implements RenderersFactory { ...@@ -56,6 +57,7 @@ public class DefaultRenderersFactory implements RenderersFactory {
* Modes for using extension renderers. One of {@link #EXTENSION_RENDERER_MODE_OFF}, {@link * Modes for using extension renderers. One of {@link #EXTENSION_RENDERER_MODE_OFF}, {@link
* #EXTENSION_RENDERER_MODE_ON} or {@link #EXTENSION_RENDERER_MODE_PREFER}. * #EXTENSION_RENDERER_MODE_ON} or {@link #EXTENSION_RENDERER_MODE_PREFER}.
*/ */
@Documented
@Retention(RetentionPolicy.SOURCE) @Retention(RetentionPolicy.SOURCE)
@IntDef({EXTENSION_RENDERER_MODE_OFF, EXTENSION_RENDERER_MODE_ON, EXTENSION_RENDERER_MODE_PREFER}) @IntDef({EXTENSION_RENDERER_MODE_OFF, EXTENSION_RENDERER_MODE_ON, EXTENSION_RENDERER_MODE_PREFER})
public @interface ExtensionRendererMode {} public @interface ExtensionRendererMode {}
......
library/core/src/main/java/com/google/android/exoplayer2/ExoPlaybackException.java
...@@ -19,6 +19,7 @@ import android.support.annotation.IntDef; ...@@ -19,6 +19,7 @@ import android.support.annotation.IntDef;
import com.google.android.exoplayer2.source.MediaSource; import com.google.android.exoplayer2.source.MediaSource;
import com.google.android.exoplayer2.util.Assertions; import com.google.android.exoplayer2.util.Assertions;
import java.io.IOException; import java.io.IOException;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
...@@ -31,6 +32,7 @@ public final class ExoPlaybackException extends Exception { ...@@ -31,6 +32,7 @@ public final class ExoPlaybackException extends Exception {
* The type of source that produced the error. One of {@link #TYPE_SOURCE}, {@link #TYPE_RENDERER} * The type of source that produced the error. One of {@link #TYPE_SOURCE}, {@link #TYPE_RENDERER}
* or {@link #TYPE_UNEXPECTED}. * or {@link #TYPE_UNEXPECTED}.
*/ */
@Documented
@Retention(RetentionPolicy.SOURCE) @Retention(RetentionPolicy.SOURCE)
@IntDef({TYPE_SOURCE, TYPE_RENDERER, TYPE_UNEXPECTED}) @IntDef({TYPE_SOURCE, TYPE_RENDERER, TYPE_UNEXPECTED})
public @interface Type {} public @interface Type {}
......
library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java
...@@ -40,10 +40,8 @@ import java.util.List; ...@@ -40,10 +40,8 @@ import java.util.List;
import java.util.Set; import java.util.Set;
import java.util.concurrent.CopyOnWriteArraySet; import java.util.concurrent.CopyOnWriteArraySet;
/** /** An {@link ExoPlayer} implementation. Instances can be obtained from {@link ExoPlayerFactory}. */
* An {@link ExoPlayer} implementation. Instances can be obtained from {@link ExoPlayerFactory}. /* package */ final class ExoPlayerImpl extends BasePlayer implements ExoPlayer {
*/
/* package */ final class ExoPlayerImpl implements ExoPlayer {
private static final String TAG = "ExoPlayerImpl"; private static final String TAG = "ExoPlayerImpl";
...@@ -61,7 +59,6 @@ import java.util.concurrent.CopyOnWriteArraySet; ...@@ -61,7 +59,6 @@ import java.util.concurrent.CopyOnWriteArraySet;
private final ExoPlayerImplInternal internalPlayer; private final ExoPlayerImplInternal internalPlayer;
private final Handler internalPlayerHandler; private final Handler internalPlayerHandler;
private final CopyOnWriteArraySet<Player.EventListener> listeners; private final CopyOnWriteArraySet<Player.EventListener> listeners;
private final Timeline.Window window;
private final Timeline.Period period; private final Timeline.Period period;
private final ArrayDeque<PlaybackInfoUpdate> pendingPlaybackInfoUpdates; private final ArrayDeque<PlaybackInfoUpdate> pendingPlaybackInfoUpdates;
...@@ -118,7 +115,6 @@ import java.util.concurrent.CopyOnWriteArraySet; ...@@ -118,7 +115,6 @@ import java.util.concurrent.CopyOnWriteArraySet;
new RendererConfiguration[renderers.length], new RendererConfiguration[renderers.length],
new TrackSelection[renderers.length], new TrackSelection[renderers.length],
null); null);
window = new Timeline.Window();
period = new Timeline.Period(); period = new Timeline.Period();
playbackParameters = PlaybackParameters.DEFAULT; playbackParameters = PlaybackParameters.DEFAULT;
seekParameters = SeekParameters.DEFAULT; seekParameters = SeekParameters.DEFAULT;
...@@ -294,21 +290,6 @@ import java.util.concurrent.CopyOnWriteArraySet; ...@@ -294,21 +290,6 @@ import java.util.concurrent.CopyOnWriteArraySet;
} }
@Override @Override
public void seekToDefaultPosition() {
seekToDefaultPosition(getCurrentWindowIndex());
}
@Override
public void seekToDefaultPosition(int windowIndex) {
seekTo(windowIndex, C.TIME_UNSET);
}
@Override
public void seekTo(long positionMs) {
seekTo(getCurrentWindowIndex(), positionMs);
}
@Override
public void seekTo(int windowIndex, long positionMs) { public void seekTo(int windowIndex, long positionMs) {
Timeline timeline = playbackInfo.timeline; Timeline timeline = playbackInfo.timeline;
if (windowIndex < 0 || (!timeline.isEmpty() && windowIndex >= timeline.getWindowCount())) { if (windowIndex < 0 || (!timeline.isEmpty() && windowIndex >= timeline.getWindowCount())) {
...@@ -378,19 +359,6 @@ import java.util.concurrent.CopyOnWriteArraySet; ...@@ -378,19 +359,6 @@ import java.util.concurrent.CopyOnWriteArraySet;
} }
@Override @Override
public @Nullable Object getCurrentTag() {
int windowIndex = getCurrentWindowIndex();
return windowIndex >= playbackInfo.timeline.getWindowCount()
? null
: playbackInfo.timeline.getWindow(windowIndex, window, /* setTag= */ true).tag;
}
@Override
public void stop() {
stop(/* reset= */ false);
}
@Override
public void stop(boolean reset) { public void stop(boolean reset) {
if (reset) { if (reset) {
playbackError = null; playbackError = null;
...@@ -495,20 +463,6 @@ import java.util.concurrent.CopyOnWriteArraySet; ...@@ -495,20 +463,6 @@ import java.util.concurrent.CopyOnWriteArraySet;
} }
@Override @Override
public int getNextWindowIndex() {
Timeline timeline = playbackInfo.timeline;
return timeline.isEmpty() ? C.INDEX_UNSET
: timeline.getNextWindowIndex(getCurrentWindowIndex(), repeatMode, shuffleModeEnabled);
}
@Override
public int getPreviousWindowIndex() {
Timeline timeline = playbackInfo.timeline;
return timeline.isEmpty() ? C.INDEX_UNSET
: timeline.getPreviousWindowIndex(getCurrentWindowIndex(), repeatMode, shuffleModeEnabled);
}
@Override
public long getDuration() { public long getDuration() {
if (isPlayingAd()) { if (isPlayingAd()) {
MediaPeriodId periodId = playbackInfo.periodId; MediaPeriodId periodId = playbackInfo.periodId;
...@@ -541,32 +495,11 @@ import java.util.concurrent.CopyOnWriteArraySet; ...@@ -541,32 +495,11 @@ import java.util.concurrent.CopyOnWriteArraySet;
} }
@Override @Override
public int getBufferedPercentage() {
long position = getBufferedPosition();
long duration = getDuration();
return position == C.TIME_UNSET || duration == C.TIME_UNSET
? 0
: (duration == 0 ? 100 : Util.constrainValue((int) ((position * 100) / duration), 0, 100));
}
@Override
public long getTotalBufferedDuration() { public long getTotalBufferedDuration() {
return Math.max(0, C.usToMs(playbackInfo.totalBufferedDurationUs)); return Math.max(0, C.usToMs(playbackInfo.totalBufferedDurationUs));
} }
@Override @Override
public boolean isCurrentWindowDynamic() {
Timeline timeline = playbackInfo.timeline;
return !timeline.isEmpty() && timeline.getWindow(getCurrentWindowIndex(), window).isDynamic;
}
@Override
public boolean isCurrentWindowSeekable() {
Timeline timeline = playbackInfo.timeline;
return !timeline.isEmpty() && timeline.getWindow(getCurrentWindowIndex(), window).isSeekable;
}
@Override
public boolean isPlayingAd() { public boolean isPlayingAd() {
return !shouldMaskPosition() && playbackInfo.periodId.isAd(); return !shouldMaskPosition() && playbackInfo.periodId.isAd();
} }
...@@ -582,13 +515,6 @@ import java.util.concurrent.CopyOnWriteArraySet; ...@@ -582,13 +515,6 @@ import java.util.concurrent.CopyOnWriteArraySet;
} }
@Override @Override
public long getContentDuration() {
return playbackInfo.timeline.isEmpty()
? C.TIME_UNSET
: playbackInfo.timeline.getWindow(getCurrentWindowIndex(), window).getDurationMs();
}
@Override
public long getContentPosition() { public long getContentPosition() {
if (isPlayingAd()) { if (isPlayingAd()) {
playbackInfo.timeline.getPeriodByUid(playbackInfo.periodId.periodUid, period); playbackInfo.timeline.getPeriodByUid(playbackInfo.periodId.periodUid, period);
...@@ -692,7 +618,7 @@ import java.util.concurrent.CopyOnWriteArraySet; ...@@ -692,7 +618,7 @@ import java.util.concurrent.CopyOnWriteArraySet;
if (playbackInfo.startPositionUs == C.TIME_UNSET) { if (playbackInfo.startPositionUs == C.TIME_UNSET) {
// Replace internal unset start position with externally visible start position of zero. // Replace internal unset start position with externally visible start position of zero.
playbackInfo = playbackInfo =
playbackInfo.fromNewPosition( playbackInfo.resetToNewPosition(
playbackInfo.periodId, /* startPositionUs= */ 0, playbackInfo.contentPositionUs); playbackInfo.periodId, /* startPositionUs= */ 0, playbackInfo.contentPositionUs);
} }
if ((!this.playbackInfo.timeline.isEmpty() || hasPendingPrepare) if ((!this.playbackInfo.timeline.isEmpty() || hasPendingPrepare)
...@@ -731,20 +657,26 @@ import java.util.concurrent.CopyOnWriteArraySet; ...@@ -731,20 +657,26 @@ import java.util.concurrent.CopyOnWriteArraySet;
maskingPeriodIndex = getCurrentPeriodIndex(); maskingPeriodIndex = getCurrentPeriodIndex();
maskingWindowPositionMs = getCurrentPosition(); maskingWindowPositionMs = getCurrentPosition();
} }
MediaPeriodId mediaPeriodId =
resetPosition
? playbackInfo.getDummyFirstMediaPeriodId(shuffleModeEnabled, window)
: playbackInfo.periodId;
long startPositionUs = resetPosition ? 0 : playbackInfo.positionUs;
long contentPositionUs = resetPosition ? C.TIME_UNSET : playbackInfo.contentPositionUs;
return new PlaybackInfo( return new PlaybackInfo(
resetState ? Timeline.EMPTY : playbackInfo.timeline, resetState ? Timeline.EMPTY : playbackInfo.timeline,
resetState ? null : playbackInfo.manifest, resetState ? null : playbackInfo.manifest,
playbackInfo.periodId, mediaPeriodId,
playbackInfo.startPositionUs, startPositionUs,
playbackInfo.contentPositionUs, contentPositionUs,
playbackState, playbackState,
/* isLoading= */ false, /* isLoading= */ false,
resetState ? TrackGroupArray.EMPTY : playbackInfo.trackGroups, resetState ? TrackGroupArray.EMPTY : playbackInfo.trackGroups,
resetState ? emptyTrackSelectorResult : playbackInfo.trackSelectorResult, resetState ? emptyTrackSelectorResult : playbackInfo.trackSelectorResult,
playbackInfo.periodId, mediaPeriodId,
playbackInfo.startPositionUs, startPositionUs,
/* totalBufferedDurationUs= */ 0, /* totalBufferedDurationUs= */ 0,
playbackInfo.startPositionUs); startPositionUs);
} }
private void updatePlaybackInfo( private void updatePlaybackInfo(
......
library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerLibraryInfo.java
...@@ -29,11 +29,11 @@ public final class ExoPlayerLibraryInfo { ...@@ -29,11 +29,11 @@ public final class ExoPlayerLibraryInfo {
/** The version of the library expressed as a string, for example "1.2.3". */ /** The version of the library expressed as a string, for example "1.2.3". */
// Intentionally hardcoded. Do not derive from other constants (e.g. VERSION_INT) or vice versa. // Intentionally hardcoded. Do not derive from other constants (e.g. VERSION_INT) or vice versa.
public static final String VERSION = "2.9.0"; public static final String VERSION = "2.9.1";
/** The version of the library expressed as {@code "ExoPlayerLib/" + VERSION}. */ /** The version of the library expressed as {@code "ExoPlayerLib/" + VERSION}. */
// Intentionally hardcoded. Do not derive from other constants (e.g. VERSION) or vice versa. // Intentionally hardcoded. Do not derive from other constants (e.g. VERSION) or vice versa.
public static final String VERSION_SLASHY = "ExoPlayerLib/2.9.0"; public static final String VERSION_SLASHY = "ExoPlayerLib/2.9.1";
/** /**
* The version of the library expressed as an integer, for example 1002003. * The version of the library expressed as an integer, for example 1002003.
...@@ -43,7 +43,7 @@ public final class ExoPlayerLibraryInfo { ...@@ -43,7 +43,7 @@ public final class ExoPlayerLibraryInfo {
* integer version 123045006 (123-045-006). * integer version 123045006 (123-045-006).
*/ */
// Intentionally hardcoded. Do not derive from other constants (e.g. VERSION) or vice versa. // Intentionally hardcoded. Do not derive from other constants (e.g. VERSION) or vice versa.
public static final int VERSION_INT = 2009000; public static final int VERSION_INT = 2009001;
/** /**
* Whether the library was compiled with {@link com.google.android.exoplayer2.util.Assertions} * Whether the library was compiled with {@link com.google.android.exoplayer2.util.Assertions}
......
library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodHolder.java
...@@ -117,23 +117,18 @@ import com.google.android.exoplayer2.util.Log; ...@@ -117,23 +117,18 @@ import com.google.android.exoplayer2.util.Log;
} }
/** /**
* Returns the buffered position in microseconds. If the period is buffered to the end then * Returns the buffered position in microseconds. If the period is buffered to the end, then the
* {@link C#TIME_END_OF_SOURCE} is returned unless {@code convertEosToDuration} is true, in which * period duration is returned.
* case the period duration is returned.
* *
* @param convertEosToDuration Whether to return the period duration rather than
* {@link C#TIME_END_OF_SOURCE} if the period is fully buffered.
* @return The buffered position in microseconds. * @return The buffered position in microseconds.
*/ */
public long getBufferedPositionUs(boolean convertEosToDuration) { public long getBufferedPositionUs() {
if (!prepared) { if (!prepared) {
return info.startPositionUs; return info.startPositionUs;
} }
long bufferedPositionUs = long bufferedPositionUs =
hasEnabledTracks ? mediaPeriod.getBufferedPositionUs() : C.TIME_END_OF_SOURCE; hasEnabledTracks ? mediaPeriod.getBufferedPositionUs() : C.TIME_END_OF_SOURCE;
return bufferedPositionUs == C.TIME_END_OF_SOURCE && convertEosToDuration return bufferedPositionUs == C.TIME_END_OF_SOURCE ? info.durationUs : bufferedPositionUs;
? info.durationUs
: bufferedPositionUs;
} }
public long getNextLoadPositionUs() { public long getNextLoadPositionUs() {
......
library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodQueue.java
...@@ -532,6 +532,11 @@ import com.google.android.exoplayer2.util.Assertions; ...@@ -532,6 +532,11 @@ import com.google.android.exoplayer2.util.Assertions;
// until the timeline is updated. Store whether the next timeline period is ready when the // until the timeline is updated. Store whether the next timeline period is ready when the
// timeline is updated, to avoid repeatedly checking the same timeline. // timeline is updated, to avoid repeatedly checking the same timeline.
MediaPeriodInfo mediaPeriodInfo = mediaPeriodHolder.info; MediaPeriodInfo mediaPeriodInfo = mediaPeriodHolder.info;
// The expected delay until playback transitions to the new period is equal the duration of
// media that's currently buffered (assuming no interruptions). This is used to project forward
// the start position for transitions to new windows.
long bufferedDurationUs =
mediaPeriodHolder.getRendererOffset() + mediaPeriodInfo.durationUs - rendererPositionUs;
if (mediaPeriodInfo.isLastInTimelinePeriod) { if (mediaPeriodInfo.isLastInTimelinePeriod) {
int currentPeriodIndex = timeline.getIndexOfPeriod(mediaPeriodInfo.id.periodUid); int currentPeriodIndex = timeline.getIndexOfPeriod(mediaPeriodInfo.id.periodUid);
int nextPeriodIndex = int nextPeriodIndex =
...@@ -549,19 +554,15 @@ import com.google.android.exoplayer2.util.Assertions; ...@@ -549,19 +554,15 @@ import com.google.android.exoplayer2.util.Assertions;
long windowSequenceNumber = mediaPeriodInfo.id.windowSequenceNumber; long windowSequenceNumber = mediaPeriodInfo.id.windowSequenceNumber;
if (timeline.getWindow(nextWindowIndex, window).firstPeriodIndex == nextPeriodIndex) { if (timeline.getWindow(nextWindowIndex, window).firstPeriodIndex == nextPeriodIndex) {
// We're starting to buffer a new window. When playback transitions to this window we'll // We're starting to buffer a new window. When playback transitions to this window we'll
// want it to be from its default start position. The expected delay until playback // want it to be from its default start position, so project the default start position
// transitions is equal the duration of media that's currently buffered (assuming no // forward by the duration of the buffer, and start buffering from this point.
// interruptions). Hence we project the default start position forward by the duration of
// the buffer, and start buffering from this point.
long defaultPositionProjectionUs =
mediaPeriodHolder.getRendererOffset() + mediaPeriodInfo.durationUs - rendererPositionUs;
Pair<Object, Long> defaultPosition = Pair<Object, Long> defaultPosition =
timeline.getPeriodPosition( timeline.getPeriodPosition(
window, window,
period, period,
nextWindowIndex, nextWindowIndex,
C.TIME_UNSET, /* windowPositionUs= */ C.TIME_UNSET,
Math.max(0, defaultPositionProjectionUs)); /* defaultPositionProjectionUs= */ Math.max(0, bufferedDurationUs));
if (defaultPosition == null) { if (defaultPosition == null) {
return null; return null;
} }
...@@ -601,11 +602,27 @@ import com.google.android.exoplayer2.util.Assertions; ...@@ -601,11 +602,27 @@ import com.google.android.exoplayer2.util.Assertions;
mediaPeriodInfo.contentPositionUs, mediaPeriodInfo.contentPositionUs,
currentPeriodId.windowSequenceNumber); currentPeriodId.windowSequenceNumber);
} else { } else {
// Play content from the ad group position. // Play content from the ad group position. As a special case, if we're transitioning from a
// preroll ad group to content and there are no other ad groups, project the start position
// forward as if this were a transition to a new window. No attempt is made to handle
// midrolls in live streams, as it's unclear what content position should play after an ad
// (server-side dynamic ad insertion is more appropriate for this use case).
long startPositionUs = mediaPeriodInfo.contentPositionUs;
if (period.getAdGroupCount() == 1 && period.getAdGroupTimeUs(0) == 0) {
Pair<Object, Long> defaultPosition =
timeline.getPeriodPosition(
window,
period,
period.windowIndex,
/* windowPositionUs= */ C.TIME_UNSET,
/* defaultPositionProjectionUs= */ Math.max(0, bufferedDurationUs));
if (defaultPosition == null) {
return null;
}
startPositionUs = defaultPosition.second;
}
return getMediaPeriodInfoForContent( return getMediaPeriodInfoForContent(
currentPeriodId.periodUid, currentPeriodId.periodUid, startPositionUs, currentPeriodId.windowSequenceNumber);
mediaPeriodInfo.contentPositionUs,
currentPeriodId.windowSequenceNumber);
} }
} else if (mediaPeriodInfo.id.endPositionUs != C.TIME_END_OF_SOURCE) { } else if (mediaPeriodInfo.id.endPositionUs != C.TIME_END_OF_SOURCE) {
// Play the next ad group if it's available. // Play the next ad group if it's available.
......
library/core/src/main/java/com/google/android/exoplayer2/PlaybackInfo.java
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
*/ */
package com.google.android.exoplayer2; package com.google.android.exoplayer2;
import android.support.annotation.CheckResult;
import android.support.annotation.Nullable; import android.support.annotation.Nullable;
import com.google.android.exoplayer2.source.MediaSource.MediaPeriodId; import com.google.android.exoplayer2.source.MediaSource.MediaPeriodId;
import com.google.android.exoplayer2.source.TrackGroupArray; import com.google.android.exoplayer2.source.TrackGroupArray;
...@@ -29,7 +30,7 @@ import com.google.android.exoplayer2.trackselection.TrackSelectorResult; ...@@ -29,7 +30,7 @@ import com.google.android.exoplayer2.trackselection.TrackSelectorResult;
* Dummy media period id used while the timeline is empty and no period id is specified. This id * Dummy media period id used while the timeline is empty and no period id is specified. This id
* is used when playback infos are created with {@link #createDummy(long, TrackSelectorResult)}. * is used when playback infos are created with {@link #createDummy(long, TrackSelectorResult)}.
*/ */
public static final MediaPeriodId DUMMY_MEDIA_PERIOD_ID = private static final MediaPeriodId DUMMY_MEDIA_PERIOD_ID =
new MediaPeriodId(/* periodUid= */ new Object()); new MediaPeriodId(/* periodUid= */ new Object());
/** The current {@link Timeline}. */ /** The current {@link Timeline}. */
...@@ -40,7 +41,8 @@ import com.google.android.exoplayer2.trackselection.TrackSelectorResult; ...@@ -40,7 +41,8 @@ import com.google.android.exoplayer2.trackselection.TrackSelectorResult;
public final MediaPeriodId periodId; public final MediaPeriodId periodId;
/** /**
* The start position at which playback started in {@link #periodId} relative to the start of the * The start position at which playback started in {@link #periodId} relative to the start of the
* associated period in the {@link #timeline}, in microseconds. * associated period in the {@link #timeline}, in microseconds. Note that this value changes for
* each position discontinuity.
*/ */
public final long startPositionUs; public final long startPositionUs;
/** /**
...@@ -103,6 +105,23 @@ import com.google.android.exoplayer2.trackselection.TrackSelectorResult; ...@@ -103,6 +105,23 @@ import com.google.android.exoplayer2.trackselection.TrackSelectorResult;
startPositionUs); startPositionUs);
} }
/**
* Create playback info.
*
* @param timeline See {@link #timeline}.
* @param manifest See {@link #manifest}.
* @param periodId See {@link #periodId}.
* @param startPositionUs See {@link #startPositionUs}.
* @param contentPositionUs See {@link #contentPositionUs}.
* @param playbackState See {@link #playbackState}.
* @param isLoading See {@link #isLoading}.
* @param trackGroups See {@link #trackGroups}.
* @param trackSelectorResult See {@link #trackSelectorResult}.
* @param loadingMediaPeriodId See {@link #loadingMediaPeriodId}.
* @param bufferedPositionUs See {@link #bufferedPositionUs}.
* @param totalBufferedDurationUs See {@link #totalBufferedDurationUs}.
* @param positionUs See {@link #positionUs}.
*/
public PlaybackInfo( public PlaybackInfo(
Timeline timeline, Timeline timeline,
@Nullable Object manifest, @Nullable Object manifest,
...@@ -132,7 +151,35 @@ import com.google.android.exoplayer2.trackselection.TrackSelectorResult; ...@@ -132,7 +151,35 @@ import com.google.android.exoplayer2.trackselection.TrackSelectorResult;
this.positionUs = positionUs; this.positionUs = positionUs;
} }
public PlaybackInfo fromNewPosition( /**
* Returns dummy media period id for the first-to-be-played period of the current timeline.
*
* @param shuffleModeEnabled Whether shuffle mode is enabled.
* @param window A writable {@link Timeline.Window}.
* @return A dummy media period id for the first-to-be-played period of the current timeline.
*/
public MediaPeriodId getDummyFirstMediaPeriodId(
boolean shuffleModeEnabled, Timeline.Window window) {
if (timeline.isEmpty()) {
return DUMMY_MEDIA_PERIOD_ID;
}
int firstPeriodIndex =
timeline.getWindow(timeline.getFirstWindowIndex(shuffleModeEnabled), window)
.firstPeriodIndex;
return new MediaPeriodId(timeline.getUidOfPeriod(firstPeriodIndex));
}
/**
* Copies playback info and resets playing and loading position.
*
* @param periodId New playing and loading {@link MediaPeriodId}.
* @param startPositionUs New start position. See {@link #startPositionUs}.
* @param contentPositionUs New content position. See {@link #contentPositionUs}. Value is ignored
* if {@code periodId.isAd()} is true.
* @return Copied playback info with reset position.
*/
@CheckResult
public PlaybackInfo resetToNewPosition(
MediaPeriodId periodId, long startPositionUs, long contentPositionUs) { MediaPeriodId periodId, long startPositionUs, long contentPositionUs) {
return new PlaybackInfo( return new PlaybackInfo(
timeline, timeline,
...@@ -150,6 +197,46 @@ import com.google.android.exoplayer2.trackselection.TrackSelectorResult; ...@@ -150,6 +197,46 @@ import com.google.android.exoplayer2.trackselection.TrackSelectorResult;
startPositionUs); startPositionUs);
} }
/**
* Copied playback info with new playing position.
*
* @param periodId New playing media period. See {@link #periodId}.
* @param positionUs New position. See {@link #positionUs}.
* @param contentPositionUs New content position. See {@link #contentPositionUs}. Value is ignored
* if {@code periodId.isAd()} is true.
* @param totalBufferedDurationUs New buffered duration. See {@link #totalBufferedDurationUs}.
* @return Copied playback info with new playing position.
*/
@CheckResult
public PlaybackInfo copyWithNewPosition(
MediaPeriodId periodId,
long positionUs,
long contentPositionUs,
long totalBufferedDurationUs) {
return new PlaybackInfo(
timeline,
manifest,
periodId,
positionUs,
periodId.isAd() ? contentPositionUs : C.TIME_UNSET,
playbackState,
isLoading,
trackGroups,
trackSelectorResult,
loadingMediaPeriodId,
bufferedPositionUs,
totalBufferedDurationUs,
positionUs);
}
/**
* Copies playback info with new timeline and manifest.
*
* @param timeline New timeline. See {@link #timeline}.
* @param manifest New manifest. See {@link #manifest}.
* @return Copied playback info with new timeline and manifest.
*/
@CheckResult
public PlaybackInfo copyWithTimeline(Timeline timeline, Object manifest) { public PlaybackInfo copyWithTimeline(Timeline timeline, Object manifest) {
return new PlaybackInfo( return new PlaybackInfo(
timeline, timeline,
...@@ -167,6 +254,13 @@ import com.google.android.exoplayer2.trackselection.TrackSelectorResult; ...@@ -167,6 +254,13 @@ import com.google.android.exoplayer2.trackselection.TrackSelectorResult;
positionUs); positionUs);
} }
/**
* Copies playback info with new playback state.
*
* @param playbackState New playback state. See {@link #playbackState}.
* @return Copied playback info with new playback state.
*/
@CheckResult
public PlaybackInfo copyWithPlaybackState(int playbackState) { public PlaybackInfo copyWithPlaybackState(int playbackState) {
return new PlaybackInfo( return new PlaybackInfo(
timeline, timeline,
...@@ -184,6 +278,13 @@ import com.google.android.exoplayer2.trackselection.TrackSelectorResult; ...@@ -184,6 +278,13 @@ import com.google.android.exoplayer2.trackselection.TrackSelectorResult;
positionUs); positionUs);
} }
/**
* Copies playback info with new loading state.
*
* @param isLoading New loading state. See {@link #isLoading}.
* @return Copied playback info with new loading state.
*/
@CheckResult
public PlaybackInfo copyWithIsLoading(boolean isLoading) { public PlaybackInfo copyWithIsLoading(boolean isLoading) {
return new PlaybackInfo( return new PlaybackInfo(
timeline, timeline,
...@@ -201,6 +302,14 @@ import com.google.android.exoplayer2.trackselection.TrackSelectorResult; ...@@ -201,6 +302,14 @@ import com.google.android.exoplayer2.trackselection.TrackSelectorResult;
positionUs); positionUs);
} }
/**
* Copies playback info with new track information.
*
* @param trackGroups New track groups. See {@link #trackGroups}.
* @param trackSelectorResult New track selector result. See {@link #trackSelectorResult}.
* @return Copied playback info with new track information.
*/
@CheckResult
public PlaybackInfo copyWithTrackInfo( public PlaybackInfo copyWithTrackInfo(
TrackGroupArray trackGroups, TrackSelectorResult trackSelectorResult) { TrackGroupArray trackGroups, TrackSelectorResult trackSelectorResult) {
return new PlaybackInfo( return new PlaybackInfo(
...@@ -219,6 +328,13 @@ import com.google.android.exoplayer2.trackselection.TrackSelectorResult; ...@@ -219,6 +328,13 @@ import com.google.android.exoplayer2.trackselection.TrackSelectorResult;
positionUs); positionUs);
} }
/**
* Copies playback info with new loading media period.
*
* @param loadingMediaPeriodId New loading media period id. See {@link #loadingMediaPeriodId}.
* @return Copied playback info with new loading media period.
*/
@CheckResult
public PlaybackInfo copyWithLoadingMediaPeriodId(MediaPeriodId loadingMediaPeriodId) { public PlaybackInfo copyWithLoadingMediaPeriodId(MediaPeriodId loadingMediaPeriodId) {
return new PlaybackInfo( return new PlaybackInfo(
timeline, timeline,
......
library/core/src/main/java/com/google/android/exoplayer2/Player.java
...@@ -33,6 +33,7 @@ import com.google.android.exoplayer2.util.Util; ...@@ -33,6 +33,7 @@ import com.google.android.exoplayer2.util.Util;
import com.google.android.exoplayer2.video.VideoFrameMetadataListener; import com.google.android.exoplayer2.video.VideoFrameMetadataListener;
import com.google.android.exoplayer2.video.VideoListener; import com.google.android.exoplayer2.video.VideoListener;
import com.google.android.exoplayer2.video.spherical.CameraMotionListener; import com.google.android.exoplayer2.video.spherical.CameraMotionListener;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
...@@ -446,6 +447,7 @@ public interface Player { ...@@ -446,6 +447,7 @@ public interface Player {
* Repeat modes for playback. One of {@link #REPEAT_MODE_OFF}, {@link #REPEAT_MODE_ONE} or {@link * Repeat modes for playback. One of {@link #REPEAT_MODE_OFF}, {@link #REPEAT_MODE_ONE} or {@link
* #REPEAT_MODE_ALL}. * #REPEAT_MODE_ALL}.
*/ */
@Documented
@Retention(RetentionPolicy.SOURCE) @Retention(RetentionPolicy.SOURCE)
@IntDef({REPEAT_MODE_OFF, REPEAT_MODE_ONE, REPEAT_MODE_ALL}) @IntDef({REPEAT_MODE_OFF, REPEAT_MODE_ONE, REPEAT_MODE_ALL})
@interface RepeatMode {} @interface RepeatMode {}
...@@ -467,6 +469,7 @@ public interface Player { ...@@ -467,6 +469,7 @@ public interface Player {
* {@link #DISCONTINUITY_REASON_SEEK}, {@link #DISCONTINUITY_REASON_SEEK_ADJUSTMENT}, {@link * {@link #DISCONTINUITY_REASON_SEEK}, {@link #DISCONTINUITY_REASON_SEEK_ADJUSTMENT}, {@link
* #DISCONTINUITY_REASON_AD_INSERTION} or {@link #DISCONTINUITY_REASON_INTERNAL}. * #DISCONTINUITY_REASON_AD_INSERTION} or {@link #DISCONTINUITY_REASON_INTERNAL}.
*/ */
@Documented
@Retention(RetentionPolicy.SOURCE) @Retention(RetentionPolicy.SOURCE)
@IntDef({ @IntDef({
DISCONTINUITY_REASON_PERIOD_TRANSITION, DISCONTINUITY_REASON_PERIOD_TRANSITION,
...@@ -497,6 +500,7 @@ public interface Player { ...@@ -497,6 +500,7 @@ public interface Player {
* Reasons for timeline and/or manifest changes. One of {@link #TIMELINE_CHANGE_REASON_PREPARED}, * Reasons for timeline and/or manifest changes. One of {@link #TIMELINE_CHANGE_REASON_PREPARED},
* {@link #TIMELINE_CHANGE_REASON_RESET} or {@link #TIMELINE_CHANGE_REASON_DYNAMIC}. * {@link #TIMELINE_CHANGE_REASON_RESET} or {@link #TIMELINE_CHANGE_REASON_DYNAMIC}.
*/ */
@Documented
@Retention(RetentionPolicy.SOURCE) @Retention(RetentionPolicy.SOURCE)
@IntDef({ @IntDef({
TIMELINE_CHANGE_REASON_PREPARED, TIMELINE_CHANGE_REASON_PREPARED,
...@@ -656,6 +660,32 @@ public interface Player { ...@@ -656,6 +660,32 @@ public interface Player {
void seekTo(int windowIndex, long positionMs); void seekTo(int windowIndex, long positionMs);
/** /**
* Returns whether a previous window exists, which may depend on the current repeat mode and
* whether shuffle mode is enabled.
*/
boolean hasPrevious();
/**
* Seeks to the default position of the previous window in the timeline, which may depend on the
* current repeat mode and whether shuffle mode is enabled. Does nothing if {@link #hasPrevious()}
* is {@code false}.
*/
void previous();
/**
* Returns whether a next window exists, which may depend on the current repeat mode and whether
* shuffle mode is enabled.
*/
boolean hasNext();
/**
* Seeks to the default position of the next window in the timeline, which may depend on the
* current repeat mode and whether shuffle mode is enabled. Does nothing if {@link #hasNext()} is
* {@code false}.
*/
void next();
/**
* Attempts to set the playback parameters. Passing {@code null} sets the parameters to the * Attempts to set the playback parameters. Passing {@code null} sets the parameters to the
* default, {@link PlaybackParameters#DEFAULT}, which means there is no speed or pitch adjustment. * default, {@link PlaybackParameters#DEFAULT}, which means there is no speed or pitch adjustment.
* <p> * <p>
......
library/core/src/main/java/com/google/android/exoplayer2/Renderer.java
...@@ -19,6 +19,7 @@ import android.support.annotation.IntDef; ...@@ -19,6 +19,7 @@ import android.support.annotation.IntDef;
import com.google.android.exoplayer2.source.SampleStream; import com.google.android.exoplayer2.source.SampleStream;
import com.google.android.exoplayer2.util.MediaClock; import com.google.android.exoplayer2.util.MediaClock;
import java.io.IOException; import java.io.IOException;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
...@@ -38,6 +39,7 @@ public interface Renderer extends PlayerMessage.Target { ...@@ -38,6 +39,7 @@ public interface Renderer extends PlayerMessage.Target {
* The renderer states. One of {@link #STATE_DISABLED}, {@link #STATE_ENABLED} or {@link * The renderer states. One of {@link #STATE_DISABLED}, {@link #STATE_ENABLED} or {@link
* #STATE_STARTED}. * #STATE_STARTED}.
*/ */
@Documented
@Retention(RetentionPolicy.SOURCE) @Retention(RetentionPolicy.SOURCE)
@IntDef({STATE_DISABLED, STATE_ENABLED, STATE_STARTED}) @IntDef({STATE_DISABLED, STATE_ENABLED, STATE_STARTED})
@interface State {} @interface State {}
......
library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java
...@@ -64,7 +64,7 @@ import java.util.concurrent.CopyOnWriteArraySet; ...@@ -64,7 +64,7 @@ import java.util.concurrent.CopyOnWriteArraySet;
* be obtained from {@link ExoPlayerFactory}. * be obtained from {@link ExoPlayerFactory}.
*/ */
@TargetApi(16) @TargetApi(16)
public class SimpleExoPlayer public class SimpleExoPlayer extends BasePlayer
implements ExoPlayer, Player.AudioComponent, Player.VideoComponent, Player.TextComponent { implements ExoPlayer, Player.AudioComponent, Player.VideoComponent, Player.TextComponent {
/** @deprecated Use {@link com.google.android.exoplayer2.video.VideoListener}. */ /** @deprecated Use {@link com.google.android.exoplayer2.video.VideoListener}. */
...@@ -928,27 +928,6 @@ public class SimpleExoPlayer ...@@ -928,27 +928,6 @@ public class SimpleExoPlayer
} }
@Override @Override
public void seekToDefaultPosition() {
verifyApplicationThread();
analyticsCollector.notifySeekStarted();
player.seekToDefaultPosition();
}
@Override
public void seekToDefaultPosition(int windowIndex) {
verifyApplicationThread();
analyticsCollector.notifySeekStarted();
player.seekToDefaultPosition(windowIndex);
}
@Override
public void seekTo(long positionMs) {
verifyApplicationThread();
analyticsCollector.notifySeekStarted();
player.seekTo(positionMs);
}
@Override
public void seekTo(int windowIndex, long positionMs) { public void seekTo(int windowIndex, long positionMs) {
verifyApplicationThread(); verifyApplicationThread();
analyticsCollector.notifySeekStarted(); analyticsCollector.notifySeekStarted();
...@@ -980,17 +959,6 @@ public class SimpleExoPlayer ...@@ -980,17 +959,6 @@ public class SimpleExoPlayer
} }
@Override @Override
public @Nullable Object getCurrentTag() {
verifyApplicationThread();
return player.getCurrentTag();
}
@Override
public void stop() {
stop(/* reset= */ false);
}
@Override
public void stop(boolean reset) { public void stop(boolean reset) {
verifyApplicationThread(); verifyApplicationThread();
player.stop(reset); player.stop(reset);
...@@ -1093,18 +1061,6 @@ public class SimpleExoPlayer ...@@ -1093,18 +1061,6 @@ public class SimpleExoPlayer
} }
@Override @Override
public int getNextWindowIndex() {
verifyApplicationThread();
return player.getNextWindowIndex();
}
@Override
public int getPreviousWindowIndex() {
verifyApplicationThread();
return player.getPreviousWindowIndex();
}
@Override
public long getDuration() { public long getDuration() {
verifyApplicationThread(); verifyApplicationThread();
return player.getDuration(); return player.getDuration();
...@@ -1123,30 +1079,12 @@ public class SimpleExoPlayer ...@@ -1123,30 +1079,12 @@ public class SimpleExoPlayer
} }
@Override @Override
public int getBufferedPercentage() {
verifyApplicationThread();
return player.getBufferedPercentage();
}
@Override
public long getTotalBufferedDuration() { public long getTotalBufferedDuration() {
verifyApplicationThread(); verifyApplicationThread();
return player.getTotalBufferedDuration(); return player.getTotalBufferedDuration();
} }
@Override @Override
public boolean isCurrentWindowDynamic() {
verifyApplicationThread();
return player.isCurrentWindowDynamic();
}
@Override
public boolean isCurrentWindowSeekable() {
verifyApplicationThread();
return player.isCurrentWindowSeekable();
}
@Override
public boolean isPlayingAd() { public boolean isPlayingAd() {
verifyApplicationThread(); verifyApplicationThread();
return player.isPlayingAd(); return player.isPlayingAd();
...@@ -1165,12 +1103,6 @@ public class SimpleExoPlayer ...@@ -1165,12 +1103,6 @@ public class SimpleExoPlayer
} }
@Override @Override
public long getContentDuration() {
verifyApplicationThread();
return player.getContentDuration();
}
@Override
public long getContentPosition() { public long getContentPosition() {
verifyApplicationThread(); verifyApplicationThread();
return player.getContentPosition(); return player.getContentPosition();
......
library/core/src/main/java/com/google/android/exoplayer2/audio/Ac3Util.java
...@@ -23,6 +23,7 @@ import com.google.android.exoplayer2.drm.DrmInitData; ...@@ -23,6 +23,7 @@ import com.google.android.exoplayer2.drm.DrmInitData;
import com.google.android.exoplayer2.util.MimeTypes; import com.google.android.exoplayer2.util.MimeTypes;
import com.google.android.exoplayer2.util.ParsableBitArray; import com.google.android.exoplayer2.util.ParsableBitArray;
import com.google.android.exoplayer2.util.ParsableByteArray; import com.google.android.exoplayer2.util.ParsableByteArray;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
...@@ -40,6 +41,7 @@ public final class Ac3Util { ...@@ -40,6 +41,7 @@ public final class Ac3Util {
* AC3 stream types. See also ETSI TS 102 366 E.1.3.1.1. One of {@link #STREAM_TYPE_UNDEFINED}, * AC3 stream types. See also ETSI TS 102 366 E.1.3.1.1. One of {@link #STREAM_TYPE_UNDEFINED},
* {@link #STREAM_TYPE_TYPE0}, {@link #STREAM_TYPE_TYPE1} or {@link #STREAM_TYPE_TYPE2}. * {@link #STREAM_TYPE_TYPE0}, {@link #STREAM_TYPE_TYPE1} or {@link #STREAM_TYPE_TYPE2}.
*/ */
@Documented
@Retention(RetentionPolicy.SOURCE) @Retention(RetentionPolicy.SOURCE)
@IntDef({STREAM_TYPE_UNDEFINED, STREAM_TYPE_TYPE0, STREAM_TYPE_TYPE1, STREAM_TYPE_TYPE2}) @IntDef({STREAM_TYPE_UNDEFINED, STREAM_TYPE_TYPE0, STREAM_TYPE_TYPE1, STREAM_TYPE_TYPE2})
public @interface StreamType {} public @interface StreamType {}
......
library/core/src/main/java/com/google/android/exoplayer2/audio/AudioFocusManager.java
...@@ -28,6 +28,7 @@ import com.google.android.exoplayer2.source.MediaSource; ...@@ -28,6 +28,7 @@ import com.google.android.exoplayer2.source.MediaSource;
import com.google.android.exoplayer2.util.Assertions; import com.google.android.exoplayer2.util.Assertions;
import com.google.android.exoplayer2.util.Log; import com.google.android.exoplayer2.util.Log;
import com.google.android.exoplayer2.util.Util; import com.google.android.exoplayer2.util.Util;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
import org.checkerframework.checker.nullness.qual.MonotonicNonNull; import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
...@@ -56,6 +57,7 @@ public final class AudioFocusManager { ...@@ -56,6 +57,7 @@ public final class AudioFocusManager {
* Player commands. One of {@link #PLAYER_COMMAND_DO_NOT_PLAY}, {@link * Player commands. One of {@link #PLAYER_COMMAND_DO_NOT_PLAY}, {@link
* #PLAYER_COMMAND_WAIT_FOR_CALLBACK} or {@link #PLAYER_COMMAND_PLAY_WHEN_READY}. * #PLAYER_COMMAND_WAIT_FOR_CALLBACK} or {@link #PLAYER_COMMAND_PLAY_WHEN_READY}.
*/ */
@Documented
@Retention(RetentionPolicy.SOURCE) @Retention(RetentionPolicy.SOURCE)
@IntDef({ @IntDef({
PLAYER_COMMAND_DO_NOT_PLAY, PLAYER_COMMAND_DO_NOT_PLAY,
...@@ -71,6 +73,7 @@ public final class AudioFocusManager { ...@@ -71,6 +73,7 @@ public final class AudioFocusManager {
public static final int PLAYER_COMMAND_PLAY_WHEN_READY = 1; public static final int PLAYER_COMMAND_PLAY_WHEN_READY = 1;
/** Audio focus state. */ /** Audio focus state. */
@Documented
@Retention(RetentionPolicy.SOURCE) @Retention(RetentionPolicy.SOURCE)
@IntDef({ @IntDef({
AUDIO_FOCUS_STATE_LOST_FOCUS, AUDIO_FOCUS_STATE_LOST_FOCUS,
...@@ -141,8 +144,8 @@ public final class AudioFocusManager { ...@@ -141,8 +144,8 @@ public final class AudioFocusManager {
*/ */
public @PlayerCommand int setAudioAttributes( public @PlayerCommand int setAudioAttributes(
@Nullable AudioAttributes audioAttributes, boolean playWhenReady, int playerState) { @Nullable AudioAttributes audioAttributes, boolean playWhenReady, int playerState) {
if (audioAttributes == null) { if (this.audioAttributes == null && audioAttributes == null) {
return PLAYER_COMMAND_PLAY_WHEN_READY; return playWhenReady ? PLAYER_COMMAND_PLAY_WHEN_READY : PLAYER_COMMAND_DO_NOT_PLAY;
} }
Assertions.checkNotNull( Assertions.checkNotNull(
...@@ -160,11 +163,9 @@ public final class AudioFocusManager { ...@@ -160,11 +163,9 @@ public final class AudioFocusManager {
} }
} }
if (playerState == Player.STATE_IDLE) { return playerState == Player.STATE_IDLE
return PLAYER_COMMAND_WAIT_FOR_CALLBACK; ? handleIdle(playWhenReady)
} else { : handlePrepare(playWhenReady);
return handlePrepare(playWhenReady);
}
} }
/** /**
...@@ -196,12 +197,9 @@ public final class AudioFocusManager { ...@@ -196,12 +197,9 @@ public final class AudioFocusManager {
if (!playWhenReady) { if (!playWhenReady) {
abandonAudioFocus(); abandonAudioFocus();
return PLAYER_COMMAND_DO_NOT_PLAY; return PLAYER_COMMAND_DO_NOT_PLAY;
} else if (playerState != Player.STATE_IDLE) {
return requestAudioFocus();
} }
return focusGain != C.AUDIOFOCUS_NONE
? PLAYER_COMMAND_WAIT_FOR_CALLBACK return playerState == Player.STATE_IDLE ? handleIdle(playWhenReady) : requestAudioFocus();
: PLAYER_COMMAND_PLAY_WHEN_READY;
} }
/** Called by the player as part of {@link ExoPlayer#stop(boolean)}. */ /** Called by the player as part of {@link ExoPlayer#stop(boolean)}. */
...@@ -215,6 +213,11 @@ public final class AudioFocusManager { ...@@ -215,6 +213,11 @@ public final class AudioFocusManager {
// Internal methods. // Internal methods.
@PlayerCommand
private int handleIdle(boolean playWhenReady) {
return playWhenReady ? PLAYER_COMMAND_PLAY_WHEN_READY : PLAYER_COMMAND_DO_NOT_PLAY;
}
private @PlayerCommand int requestAudioFocus() { private @PlayerCommand int requestAudioFocus() {
int focusRequestResult; int focusRequestResult;
......
library/core/src/main/java/com/google/android/exoplayer2/audio/AudioTimestampPoller.java
...@@ -22,6 +22,7 @@ import android.support.annotation.IntDef; ...@@ -22,6 +22,7 @@ import android.support.annotation.IntDef;
import android.support.annotation.Nullable; import android.support.annotation.Nullable;
import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.util.Util; import com.google.android.exoplayer2.util.Util;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
...@@ -45,6 +46,7 @@ import java.lang.annotation.RetentionPolicy; ...@@ -45,6 +46,7 @@ import java.lang.annotation.RetentionPolicy;
/* package */ final class AudioTimestampPoller { /* package */ final class AudioTimestampPoller {
/** Timestamp polling states. */ /** Timestamp polling states. */
@Documented
@Retention(RetentionPolicy.SOURCE) @Retention(RetentionPolicy.SOURCE)
@IntDef({ @IntDef({
STATE_INITIALIZING, STATE_INITIALIZING,
......
library/core/src/main/java/com/google/android/exoplayer2/audio/AudioTrackPositionTracker.java
...@@ -25,6 +25,7 @@ import android.support.annotation.Nullable; ...@@ -25,6 +25,7 @@ import android.support.annotation.Nullable;
import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.util.Assertions; import com.google.android.exoplayer2.util.Assertions;
import com.google.android.exoplayer2.util.Util; import com.google.android.exoplayer2.util.Util;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
import java.lang.reflect.Method; import java.lang.reflect.Method;
...@@ -97,6 +98,7 @@ import java.lang.reflect.Method; ...@@ -97,6 +98,7 @@ import java.lang.reflect.Method;
} }
/** {@link AudioTrack} playback states. */ /** {@link AudioTrack} playback states. */
@Documented
@Retention(RetentionPolicy.SOURCE) @Retention(RetentionPolicy.SOURCE)
@IntDef({PLAYSTATE_STOPPED, PLAYSTATE_PAUSED, PLAYSTATE_PLAYING}) @IntDef({PLAYSTATE_STOPPED, PLAYSTATE_PAUSED, PLAYSTATE_PLAYING})
private @interface PlayState {} private @interface PlayState {}
......
library/core/src/main/java/com/google/android/exoplayer2/audio/DefaultAudioSink.java
...@@ -30,6 +30,7 @@ import com.google.android.exoplayer2.PlaybackParameters; ...@@ -30,6 +30,7 @@ import com.google.android.exoplayer2.PlaybackParameters;
import com.google.android.exoplayer2.util.Assertions; import com.google.android.exoplayer2.util.Assertions;
import com.google.android.exoplayer2.util.Log; import com.google.android.exoplayer2.util.Log;
import com.google.android.exoplayer2.util.Util; import com.google.android.exoplayer2.util.Util;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
...@@ -171,6 +172,9 @@ public final class DefaultAudioSink implements AudioSink { ...@@ -171,6 +172,9 @@ public final class DefaultAudioSink implements AudioSink {
*/ */
private static final int BUFFER_MULTIPLICATION_FACTOR = 4; private static final int BUFFER_MULTIPLICATION_FACTOR = 4;
/** To avoid underruns on some devices (e.g., Broadcom 7271), scale up the AC3 buffer duration. */
private static final int AC3_BUFFER_MULTIPLICATION_FACTOR = 2;
/** /**
* @see AudioTrack#ERROR_BAD_VALUE * @see AudioTrack#ERROR_BAD_VALUE
*/ */
...@@ -195,12 +199,12 @@ public final class DefaultAudioSink implements AudioSink { ...@@ -195,12 +199,12 @@ public final class DefaultAudioSink implements AudioSink {
private static final String TAG = "AudioTrack"; private static final String TAG = "AudioTrack";
/** /** Represents states of the {@link #startMediaTimeUs} value. */
* Represents states of the {@link #startMediaTimeUs} value. @Documented
*/
@Retention(RetentionPolicy.SOURCE) @Retention(RetentionPolicy.SOURCE)
@IntDef({START_NOT_SET, START_IN_SYNC, START_NEED_SYNC}) @IntDef({START_NOT_SET, START_IN_SYNC, START_NEED_SYNC})
private @interface StartMediaTimeState {} private @interface StartMediaTimeState {}
private static final int START_NOT_SET = 0; private static final int START_NOT_SET = 0;
private static final int START_IN_SYNC = 1; private static final int START_IN_SYNC = 1;
private static final int START_NEED_SYNC = 2; private static final int START_NEED_SYNC = 2;
...@@ -483,6 +487,9 @@ public final class DefaultAudioSink implements AudioSink { ...@@ -483,6 +487,9 @@ public final class DefaultAudioSink implements AudioSink {
return Util.constrainValue(multipliedBufferSize, minAppBufferSize, maxAppBufferSize); return Util.constrainValue(multipliedBufferSize, minAppBufferSize, maxAppBufferSize);
} else { } else {
int rate = getMaximumEncodedRateBytesPerSecond(outputEncoding); int rate = getMaximumEncodedRateBytesPerSecond(outputEncoding);
if (outputEncoding == C.ENCODING_AC3) {
rate *= AC3_BUFFER_MULTIPLICATION_FACTOR;
}
return (int) (PASSTHROUGH_BUFFER_DURATION_US * rate / C.MICROS_PER_SECOND); return (int) (PASSTHROUGH_BUFFER_DURATION_US * rate / C.MICROS_PER_SECOND);
} }
} }
......
library/core/src/main/java/com/google/android/exoplayer2/audio/MediaCodecAudioRenderer.java
...@@ -24,6 +24,7 @@ import android.media.MediaCrypto; ...@@ -24,6 +24,7 @@ import android.media.MediaCrypto;
import android.media.MediaFormat; import android.media.MediaFormat;
import android.media.audiofx.Virtualizer; import android.media.audiofx.Virtualizer;
import android.os.Handler; import android.os.Handler;
import android.support.annotation.CallSuper;
import android.support.annotation.Nullable; import android.support.annotation.Nullable;
import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.ExoPlaybackException; import com.google.android.exoplayer2.ExoPlaybackException;
...@@ -86,6 +87,7 @@ public class MediaCodecAudioRenderer extends MediaCodecRenderer implements Media ...@@ -86,6 +87,7 @@ public class MediaCodecAudioRenderer extends MediaCodecRenderer implements Media
private int codecMaxInputSize; private int codecMaxInputSize;
private boolean passthroughEnabled; private boolean passthroughEnabled;
private boolean codecNeedsDiscardChannelsWorkaround; private boolean codecNeedsDiscardChannelsWorkaround;
private boolean codecNeedsEosBufferTimestampWorkaround;
private android.media.MediaFormat passthroughMediaFormat; private android.media.MediaFormat passthroughMediaFormat;
private @C.Encoding int pcmEncoding; private @C.Encoding int pcmEncoding;
private int channelCount; private int channelCount;
...@@ -345,6 +347,7 @@ public class MediaCodecAudioRenderer extends MediaCodecRenderer implements Media ...@@ -345,6 +347,7 @@ public class MediaCodecAudioRenderer extends MediaCodecRenderer implements Media
float codecOperatingRate) { float codecOperatingRate) {
codecMaxInputSize = getCodecMaxInputSize(codecInfo, format, getStreamFormats()); codecMaxInputSize = getCodecMaxInputSize(codecInfo, format, getStreamFormats());
codecNeedsDiscardChannelsWorkaround = codecNeedsDiscardChannelsWorkaround(codecInfo.name); codecNeedsDiscardChannelsWorkaround = codecNeedsDiscardChannelsWorkaround(codecInfo.name);
codecNeedsEosBufferTimestampWorkaround = codecNeedsEosBufferTimestampWorkaround(codecInfo.name);
passthroughEnabled = codecInfo.passthrough; passthroughEnabled = codecInfo.passthrough;
String codecMimeType = codecInfo.mimeType == null ? MimeTypes.AUDIO_RAW : codecInfo.mimeType; String codecMimeType = codecInfo.mimeType == null ? MimeTypes.AUDIO_RAW : codecInfo.mimeType;
MediaFormat mediaFormat = MediaFormat mediaFormat =
...@@ -583,9 +586,9 @@ public class MediaCodecAudioRenderer extends MediaCodecRenderer implements Media ...@@ -583,9 +586,9 @@ public class MediaCodecAudioRenderer extends MediaCodecRenderer implements Media
lastInputTimeUs = Math.max(buffer.timeUs, lastInputTimeUs); lastInputTimeUs = Math.max(buffer.timeUs, lastInputTimeUs);
} }
@CallSuper
@Override @Override
protected void onProcessedOutputBuffer(long presentationTimeUs) { protected void onProcessedOutputBuffer(long presentationTimeUs) {
super.onProcessedOutputBuffer(presentationTimeUs);
while (pendingStreamChangeCount != 0 && presentationTimeUs >= pendingStreamChangeTimesUs[0]) { while (pendingStreamChangeCount != 0 && presentationTimeUs >= pendingStreamChangeTimesUs[0]) {
audioSink.handleDiscontinuity(); audioSink.handleDiscontinuity();
pendingStreamChangeCount--; pendingStreamChangeCount--;
...@@ -610,6 +613,13 @@ public class MediaCodecAudioRenderer extends MediaCodecRenderer implements Media ...@@ -610,6 +613,13 @@ public class MediaCodecAudioRenderer extends MediaCodecRenderer implements Media
boolean shouldSkip, boolean shouldSkip,
Format format) Format format)
throws ExoPlaybackException { throws ExoPlaybackException {
if (codecNeedsEosBufferTimestampWorkaround
&& bufferPresentationTimeUs == 0
&& (bufferFlags & MediaCodec.BUFFER_FLAG_END_OF_STREAM) != 0
&& lastInputTimeUs != C.TIME_UNSET) {
bufferPresentationTimeUs = lastInputTimeUs;
}
if (passthroughEnabled && (bufferFlags & MediaCodec.BUFFER_FLAG_CODEC_CONFIG) != 0) { if (passthroughEnabled && (bufferFlags & MediaCodec.BUFFER_FLAG_CODEC_CONFIG) != 0) {
// Discard output buffers from the passthrough (raw) decoder containing codec specific data. // Discard output buffers from the passthrough (raw) decoder containing codec specific data.
codec.releaseOutputBuffer(bufferIndex, false); codec.releaseOutputBuffer(bufferIndex, false);
...@@ -777,6 +787,24 @@ public class MediaCodecAudioRenderer extends MediaCodecRenderer implements Media ...@@ -777,6 +787,24 @@ public class MediaCodecAudioRenderer extends MediaCodecRenderer implements Media
|| Util.DEVICE.startsWith("heroqlte")); || Util.DEVICE.startsWith("heroqlte"));
} }
/**
* Returns whether the decoder may output a non-empty buffer with timestamp 0 as the end of stream
* buffer.
*
* <p>See <a href="https://github.com/google/ExoPlayer/issues/5045">GitHub issue #5045</a>.
*/
private static boolean codecNeedsEosBufferTimestampWorkaround(String codecName) {
return Util.SDK_INT < 21
&& "OMX.SEC.mp3.dec".equals(codecName)
&& "samsung".equals(Util.MANUFACTURER)
&& (Util.DEVICE.startsWith("baffin")
|| Util.DEVICE.startsWith("grand")
|| Util.DEVICE.startsWith("fortuna")
|| Util.DEVICE.startsWith("gprimelte")
|| Util.DEVICE.startsWith("j2y18lte")
|| Util.DEVICE.startsWith("ms01"));
}
private final class AudioSinkListener implements AudioSink.Listener { private final class AudioSinkListener implements AudioSink.Listener {
@Override @Override
......
library/core/src/main/java/com/google/android/exoplayer2/audio/SilenceSkippingAudioProcessor.java
...@@ -19,6 +19,7 @@ import android.support.annotation.IntDef; ...@@ -19,6 +19,7 @@ import android.support.annotation.IntDef;
import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.Format;
import com.google.android.exoplayer2.util.Util; import com.google.android.exoplayer2.util.Util;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
...@@ -54,6 +55,7 @@ public final class SilenceSkippingAudioProcessor implements AudioProcessor { ...@@ -54,6 +55,7 @@ public final class SilenceSkippingAudioProcessor implements AudioProcessor {
private static final byte SILENCE_THRESHOLD_LEVEL_MSB = (SILENCE_THRESHOLD_LEVEL + 128) >> 8; private static final byte SILENCE_THRESHOLD_LEVEL_MSB = (SILENCE_THRESHOLD_LEVEL + 128) >> 8;
/** Trimming states. */ /** Trimming states. */
@Documented
@Retention(RetentionPolicy.SOURCE) @Retention(RetentionPolicy.SOURCE)
@IntDef({ @IntDef({
STATE_NOISY, STATE_NOISY,
......
library/core/src/main/java/com/google/android/exoplayer2/audio/SimpleDecoderAudioRenderer.java
...@@ -43,6 +43,7 @@ import com.google.android.exoplayer2.util.MediaClock; ...@@ -43,6 +43,7 @@ import com.google.android.exoplayer2.util.MediaClock;
import com.google.android.exoplayer2.util.MimeTypes; import com.google.android.exoplayer2.util.MimeTypes;
import com.google.android.exoplayer2.util.TraceUtil; import com.google.android.exoplayer2.util.TraceUtil;
import com.google.android.exoplayer2.util.Util; import com.google.android.exoplayer2.util.Util;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
...@@ -65,9 +66,13 @@ import java.lang.annotation.RetentionPolicy; ...@@ -65,9 +66,13 @@ import java.lang.annotation.RetentionPolicy;
*/ */
public abstract class SimpleDecoderAudioRenderer extends BaseRenderer implements MediaClock { public abstract class SimpleDecoderAudioRenderer extends BaseRenderer implements MediaClock {
@Documented
@Retention(RetentionPolicy.SOURCE) @Retention(RetentionPolicy.SOURCE)
@IntDef({REINITIALIZATION_STATE_NONE, REINITIALIZATION_STATE_SIGNAL_END_OF_STREAM, @IntDef({
REINITIALIZATION_STATE_WAIT_END_OF_STREAM}) REINITIALIZATION_STATE_NONE,
REINITIALIZATION_STATE_SIGNAL_END_OF_STREAM,
REINITIALIZATION_STATE_WAIT_END_OF_STREAM
})
private @interface ReinitializationState {} private @interface ReinitializationState {}
/** /**
* The decoder does not need to be re-initialized. * The decoder does not need to be re-initialized.
......
library/core/src/main/java/com/google/android/exoplayer2/decoder/DecoderInputBuffer.java
...@@ -17,6 +17,7 @@ package com.google.android.exoplayer2.decoder; ...@@ -17,6 +17,7 @@ package com.google.android.exoplayer2.decoder;
import android.support.annotation.IntDef; import android.support.annotation.IntDef;
import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.C;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
...@@ -31,6 +32,7 @@ public class DecoderInputBuffer extends Buffer { ...@@ -31,6 +32,7 @@ public class DecoderInputBuffer extends Buffer {
* #BUFFER_REPLACEMENT_MODE_DISABLED}, {@link #BUFFER_REPLACEMENT_MODE_NORMAL} or {@link * #BUFFER_REPLACEMENT_MODE_DISABLED}, {@link #BUFFER_REPLACEMENT_MODE_NORMAL} or {@link
* #BUFFER_REPLACEMENT_MODE_DIRECT}. * #BUFFER_REPLACEMENT_MODE_DIRECT}.
*/ */
@Documented
@Retention(RetentionPolicy.SOURCE) @Retention(RetentionPolicy.SOURCE)
@IntDef({ @IntDef({
BUFFER_REPLACEMENT_MODE_DISABLED, BUFFER_REPLACEMENT_MODE_DISABLED,
......
library/core/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSessionManager.java
...@@ -32,6 +32,7 @@ import com.google.android.exoplayer2.util.Assertions; ...@@ -32,6 +32,7 @@ import com.google.android.exoplayer2.util.Assertions;
import com.google.android.exoplayer2.util.EventDispatcher; import com.google.android.exoplayer2.util.EventDispatcher;
import com.google.android.exoplayer2.util.Log; import com.google.android.exoplayer2.util.Log;
import com.google.android.exoplayer2.util.Util; import com.google.android.exoplayer2.util.Util;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
import java.util.ArrayList; import java.util.ArrayList;
...@@ -70,6 +71,7 @@ public class DefaultDrmSessionManager<T extends ExoMediaCrypto> implements DrmSe ...@@ -70,6 +71,7 @@ public class DefaultDrmSessionManager<T extends ExoMediaCrypto> implements DrmSe
* Determines the action to be done after a session acquired. One of {@link #MODE_PLAYBACK}, * Determines the action to be done after a session acquired. One of {@link #MODE_PLAYBACK},
* {@link #MODE_QUERY}, {@link #MODE_DOWNLOAD} or {@link #MODE_RELEASE}. * {@link #MODE_QUERY}, {@link #MODE_DOWNLOAD} or {@link #MODE_RELEASE}.
*/ */
@Documented
@Retention(RetentionPolicy.SOURCE) @Retention(RetentionPolicy.SOURCE)
@IntDef({MODE_PLAYBACK, MODE_QUERY, MODE_DOWNLOAD, MODE_RELEASE}) @IntDef({MODE_PLAYBACK, MODE_QUERY, MODE_DOWNLOAD, MODE_RELEASE})
public @interface Mode {} public @interface Mode {}
......
library/core/src/main/java/com/google/android/exoplayer2/drm/DrmSession.java
...@@ -18,6 +18,7 @@ package com.google.android.exoplayer2.drm; ...@@ -18,6 +18,7 @@ package com.google.android.exoplayer2.drm;
import android.annotation.TargetApi; import android.annotation.TargetApi;
import android.media.MediaDrm; import android.media.MediaDrm;
import android.support.annotation.IntDef; import android.support.annotation.IntDef;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
import java.util.Map; import java.util.Map;
...@@ -43,6 +44,7 @@ public interface DrmSession<T extends ExoMediaCrypto> { ...@@ -43,6 +44,7 @@ public interface DrmSession<T extends ExoMediaCrypto> {
* The state of the DRM session. One of {@link #STATE_RELEASED}, {@link #STATE_ERROR}, {@link * The state of the DRM session. One of {@link #STATE_RELEASED}, {@link #STATE_ERROR}, {@link
* #STATE_OPENING}, {@link #STATE_OPENED} or {@link #STATE_OPENED_WITH_KEYS}. * #STATE_OPENING}, {@link #STATE_OPENED} or {@link #STATE_OPENED_WITH_KEYS}.
*/ */
@Documented
@Retention(RetentionPolicy.SOURCE) @Retention(RetentionPolicy.SOURCE)
@IntDef({STATE_RELEASED, STATE_ERROR, STATE_OPENING, STATE_OPENED, STATE_OPENED_WITH_KEYS}) @IntDef({STATE_RELEASED, STATE_ERROR, STATE_OPENING, STATE_OPENED, STATE_OPENED_WITH_KEYS})
@interface State {} @interface State {}
......
library/core/src/main/java/com/google/android/exoplayer2/drm/UnsupportedDrmException.java
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
package com.google.android.exoplayer2.drm; package com.google.android.exoplayer2.drm;
import android.support.annotation.IntDef; import android.support.annotation.IntDef;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
...@@ -28,6 +29,7 @@ public final class UnsupportedDrmException extends Exception { ...@@ -28,6 +29,7 @@ public final class UnsupportedDrmException extends Exception {
* The reason for the exception. One of {@link #REASON_UNSUPPORTED_SCHEME} or {@link * The reason for the exception. One of {@link #REASON_UNSUPPORTED_SCHEME} or {@link
* #REASON_INSTANTIATION_ERROR}. * #REASON_INSTANTIATION_ERROR}.
*/ */
@Documented
@Retention(RetentionPolicy.SOURCE) @Retention(RetentionPolicy.SOURCE)
@IntDef({REASON_UNSUPPORTED_SCHEME, REASON_INSTANTIATION_ERROR}) @IntDef({REASON_UNSUPPORTED_SCHEME, REASON_INSTANTIATION_ERROR})
public @interface Reason {} public @interface Reason {}
......
library/core/src/main/java/com/google/android/exoplayer2/extractor/BinarySearchSeeker.java
...@@ -21,6 +21,7 @@ import com.google.android.exoplayer2.C; ...@@ -21,6 +21,7 @@ import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.util.Assertions; import com.google.android.exoplayer2.util.Assertions;
import com.google.android.exoplayer2.util.Util; import com.google.android.exoplayer2.util.Util;
import java.io.IOException; import java.io.IOException;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
...@@ -437,6 +438,7 @@ public abstract class BinarySearchSeeker { ...@@ -437,6 +438,7 @@ public abstract class BinarySearchSeeker {
public static final int RESULT_POSITION_UNDERESTIMATED = -2; public static final int RESULT_POSITION_UNDERESTIMATED = -2;
public static final int RESULT_NO_TIMESTAMP = -3; public static final int RESULT_NO_TIMESTAMP = -3;
@Documented
@Retention(RetentionPolicy.SOURCE) @Retention(RetentionPolicy.SOURCE)
@IntDef({ @IntDef({
RESULT_TARGET_TIMESTAMP_FOUND, RESULT_TARGET_TIMESTAMP_FOUND,
......
library/core/src/main/java/com/google/android/exoplayer2/extractor/DefaultExtractorInput.java
...@@ -130,16 +130,16 @@ public final class DefaultExtractorInput implements ExtractorInput { ...@@ -130,16 +130,16 @@ public final class DefaultExtractorInput implements ExtractorInput {
public boolean advancePeekPosition(int length, boolean allowEndOfInput) public boolean advancePeekPosition(int length, boolean allowEndOfInput)
throws IOException, InterruptedException { throws IOException, InterruptedException {
ensureSpaceForPeek(length); ensureSpaceForPeek(length);
int bytesPeeked = Math.min(peekBufferLength - peekBufferPosition, length); int bytesPeeked = peekBufferLength - peekBufferPosition;
while (bytesPeeked < length) { while (bytesPeeked < length) {
bytesPeeked = readFromDataSource(peekBuffer, peekBufferPosition, length, bytesPeeked, bytesPeeked = readFromDataSource(peekBuffer, peekBufferPosition, length, bytesPeeked,
allowEndOfInput); allowEndOfInput);
if (bytesPeeked == C.RESULT_END_OF_INPUT) { if (bytesPeeked == C.RESULT_END_OF_INPUT) {
return false; return false;
} }
peekBufferLength = peekBufferPosition + bytesPeeked;
} }
peekBufferPosition += length; peekBufferPosition += length;
peekBufferLength = Math.max(peekBufferLength, peekBufferPosition);
return true; return true;
} }
......
library/core/src/main/java/com/google/android/exoplayer2/extractor/Extractor.java
...@@ -18,6 +18,7 @@ package com.google.android.exoplayer2.extractor; ...@@ -18,6 +18,7 @@ package com.google.android.exoplayer2.extractor;
import android.support.annotation.IntDef; import android.support.annotation.IntDef;
import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.C;
import java.io.IOException; import java.io.IOException;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
...@@ -48,6 +49,7 @@ public interface Extractor { ...@@ -48,6 +49,7 @@ public interface Extractor {
* Result values that can be returned by {@link #read(ExtractorInput, PositionHolder)}. One of * Result values that can be returned by {@link #read(ExtractorInput, PositionHolder)}. One of
* {@link #RESULT_CONTINUE}, {@link #RESULT_SEEK} or {@link #RESULT_END_OF_INPUT}. * {@link #RESULT_CONTINUE}, {@link #RESULT_SEEK} or {@link #RESULT_END_OF_INPUT}.
*/ */
@Documented
@Retention(RetentionPolicy.SOURCE) @Retention(RetentionPolicy.SOURCE)
@IntDef(value = {RESULT_CONTINUE, RESULT_SEEK, RESULT_END_OF_INPUT}) @IntDef(value = {RESULT_CONTINUE, RESULT_SEEK, RESULT_END_OF_INPUT})
@interface ReadResult {} @interface ReadResult {}
......
library/core/src/main/java/com/google/android/exoplayer2/extractor/GaplessInfoHolder.java
...@@ -18,7 +18,6 @@ package com.google.android.exoplayer2.extractor; ...@@ -18,7 +18,6 @@ package com.google.android.exoplayer2.extractor;
import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.Format;
import com.google.android.exoplayer2.metadata.Metadata; import com.google.android.exoplayer2.metadata.Metadata;
import com.google.android.exoplayer2.metadata.id3.CommentFrame; import com.google.android.exoplayer2.metadata.id3.CommentFrame;
import com.google.android.exoplayer2.metadata.id3.Id3Decoder.FramePredicate;
import com.google.android.exoplayer2.metadata.id3.InternalFrame; import com.google.android.exoplayer2.metadata.id3.InternalFrame;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
...@@ -28,15 +27,6 @@ import java.util.regex.Pattern; ...@@ -28,15 +27,6 @@ import java.util.regex.Pattern;
*/ */
public final class GaplessInfoHolder { public final class GaplessInfoHolder {
/**
* A {@link FramePredicate} suitable for use when decoding {@link Metadata} that will be passed to
* {@link #setFromMetadata(Metadata)}. Only frames that might contain gapless playback information
* are decoded.
*/
public static final FramePredicate GAPLESS_INFO_ID3_FRAME_PREDICATE =
(majorVersion, id0, id1, id2, id3) ->
id0 == 'C' && id1 == 'O' && id2 == 'M' && (id3 == 'M' || majorVersion == 2);
private static final String GAPLESS_DOMAIN = "com.apple.iTunes"; private static final String GAPLESS_DOMAIN = "com.apple.iTunes";
private static final String GAPLESS_DESCRIPTION = "iTunSMPB"; private static final String GAPLESS_DESCRIPTION = "iTunSMPB";
private static final Pattern GAPLESS_COMMENT_PATTERN = private static final Pattern GAPLESS_COMMENT_PATTERN =
......
library/core/src/main/java/com/google/android/exoplayer2/extractor/amr/AmrExtractor.java
...@@ -32,6 +32,7 @@ import com.google.android.exoplayer2.util.MimeTypes; ...@@ -32,6 +32,7 @@ import com.google.android.exoplayer2.util.MimeTypes;
import com.google.android.exoplayer2.util.Util; import com.google.android.exoplayer2.util.Util;
import java.io.EOFException; import java.io.EOFException;
import java.io.IOException; import java.io.IOException;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
import java.util.Arrays; import java.util.Arrays;
...@@ -51,6 +52,7 @@ public final class AmrExtractor implements Extractor { ...@@ -51,6 +52,7 @@ public final class AmrExtractor implements Extractor {
* Flags controlling the behavior of the extractor. Possible flag value is {@link * Flags controlling the behavior of the extractor. Possible flag value is {@link
* #FLAG_ENABLE_CONSTANT_BITRATE_SEEKING}. * #FLAG_ENABLE_CONSTANT_BITRATE_SEEKING}.
*/ */
@Documented
@Retention(RetentionPolicy.SOURCE) @Retention(RetentionPolicy.SOURCE)
@IntDef( @IntDef(
flag = true, flag = true,
......
library/core/src/main/java/com/google/android/exoplayer2/extractor/flv/FlvExtractor.java
...@@ -26,6 +26,7 @@ import com.google.android.exoplayer2.extractor.SeekMap; ...@@ -26,6 +26,7 @@ import com.google.android.exoplayer2.extractor.SeekMap;
import com.google.android.exoplayer2.util.ParsableByteArray; import com.google.android.exoplayer2.util.ParsableByteArray;
import com.google.android.exoplayer2.util.Util; import com.google.android.exoplayer2.util.Util;
import java.io.IOException; import java.io.IOException;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
...@@ -37,13 +38,17 @@ public final class FlvExtractor implements Extractor { ...@@ -37,13 +38,17 @@ public final class FlvExtractor implements Extractor {
/** Factory for {@link FlvExtractor} instances. */ /** Factory for {@link FlvExtractor} instances. */
public static final ExtractorsFactory FACTORY = () -> new Extractor[] {new FlvExtractor()}; public static final ExtractorsFactory FACTORY = () -> new Extractor[] {new FlvExtractor()};
/** /** Extractor states. */
* Extractor states. @Documented
*/
@Retention(RetentionPolicy.SOURCE) @Retention(RetentionPolicy.SOURCE)
@IntDef({STATE_READING_FLV_HEADER, STATE_SKIPPING_TO_TAG_HEADER, STATE_READING_TAG_HEADER, @IntDef({
STATE_READING_TAG_DATA}) STATE_READING_FLV_HEADER,
STATE_SKIPPING_TO_TAG_HEADER,
STATE_READING_TAG_HEADER,
STATE_READING_TAG_DATA
})
private @interface States {} private @interface States {}
private static final int STATE_READING_FLV_HEADER = 1; private static final int STATE_READING_FLV_HEADER = 1;
private static final int STATE_SKIPPING_TO_TAG_HEADER = 2; private static final int STATE_SKIPPING_TO_TAG_HEADER = 2;
private static final int STATE_READING_TAG_HEADER = 3; private static final int STATE_READING_TAG_HEADER = 3;
......
library/core/src/main/java/com/google/android/exoplayer2/extractor/mkv/DefaultEbmlReader.java
...@@ -22,6 +22,7 @@ import com.google.android.exoplayer2.extractor.ExtractorInput; ...@@ -22,6 +22,7 @@ import com.google.android.exoplayer2.extractor.ExtractorInput;
import com.google.android.exoplayer2.util.Assertions; import com.google.android.exoplayer2.util.Assertions;
import java.io.EOFException; import java.io.EOFException;
import java.io.IOException; import java.io.IOException;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
import java.util.ArrayDeque; import java.util.ArrayDeque;
...@@ -31,6 +32,7 @@ import java.util.ArrayDeque; ...@@ -31,6 +32,7 @@ import java.util.ArrayDeque;
*/ */
/* package */ final class DefaultEbmlReader implements EbmlReader { /* package */ final class DefaultEbmlReader implements EbmlReader {
@Documented
@Retention(RetentionPolicy.SOURCE) @Retention(RetentionPolicy.SOURCE)
@IntDef({ELEMENT_STATE_READ_ID, ELEMENT_STATE_READ_CONTENT_SIZE, ELEMENT_STATE_READ_CONTENT}) @IntDef({ELEMENT_STATE_READ_ID, ELEMENT_STATE_READ_CONTENT_SIZE, ELEMENT_STATE_READ_CONTENT})
private @interface ElementState {} private @interface ElementState {}
......
library/core/src/main/java/com/google/android/exoplayer2/extractor/mkv/EbmlReaderOutput.java
...@@ -19,6 +19,7 @@ import android.support.annotation.IntDef; ...@@ -19,6 +19,7 @@ import android.support.annotation.IntDef;
import com.google.android.exoplayer2.ParserException; import com.google.android.exoplayer2.ParserException;
import com.google.android.exoplayer2.extractor.ExtractorInput; import com.google.android.exoplayer2.extractor.ExtractorInput;
import java.io.IOException; import java.io.IOException;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
...@@ -31,6 +32,7 @@ import java.lang.annotation.RetentionPolicy; ...@@ -31,6 +32,7 @@ import java.lang.annotation.RetentionPolicy;
* EBML element types. One of {@link #TYPE_UNKNOWN}, {@link #TYPE_MASTER}, {@link * EBML element types. One of {@link #TYPE_UNKNOWN}, {@link #TYPE_MASTER}, {@link
* #TYPE_UNSIGNED_INT}, {@link #TYPE_STRING}, {@link #TYPE_BINARY} or {@link #TYPE_FLOAT}. * #TYPE_UNSIGNED_INT}, {@link #TYPE_STRING}, {@link #TYPE_BINARY} or {@link #TYPE_FLOAT}.
*/ */
@Documented
@Retention(RetentionPolicy.SOURCE) @Retention(RetentionPolicy.SOURCE)
@IntDef({TYPE_UNKNOWN, TYPE_MASTER, TYPE_UNSIGNED_INT, TYPE_STRING, TYPE_BINARY, TYPE_FLOAT}) @IntDef({TYPE_UNKNOWN, TYPE_MASTER, TYPE_UNSIGNED_INT, TYPE_STRING, TYPE_BINARY, TYPE_FLOAT})
@interface ElementType {} @interface ElementType {}
......
library/core/src/main/java/com/google/android/exoplayer2/extractor/mkv/MatroskaExtractor.java
...@@ -45,6 +45,7 @@ import com.google.android.exoplayer2.video.AvcConfig; ...@@ -45,6 +45,7 @@ import com.google.android.exoplayer2.video.AvcConfig;
import com.google.android.exoplayer2.video.ColorInfo; import com.google.android.exoplayer2.video.ColorInfo;
import com.google.android.exoplayer2.video.HevcConfig; import com.google.android.exoplayer2.video.HevcConfig;
import java.io.IOException; import java.io.IOException;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
...@@ -68,6 +69,7 @@ public final class MatroskaExtractor implements Extractor { ...@@ -68,6 +69,7 @@ public final class MatroskaExtractor implements Extractor {
* Flags controlling the behavior of the extractor. Possible flag value is {@link * Flags controlling the behavior of the extractor. Possible flag value is {@link
* #FLAG_DISABLE_SEEK_FOR_CUES}. * #FLAG_DISABLE_SEEK_FOR_CUES}.
*/ */
@Documented
@Retention(RetentionPolicy.SOURCE) @Retention(RetentionPolicy.SOURCE)
@IntDef( @IntDef(
flag = true, flag = true,
...@@ -155,6 +157,7 @@ public final class MatroskaExtractor implements Extractor { ...@@ -155,6 +157,7 @@ public final class MatroskaExtractor implements Extractor {
private static final int ID_FLAG_DEFAULT = 0x88; private static final int ID_FLAG_DEFAULT = 0x88;
private static final int ID_FLAG_FORCED = 0x55AA; private static final int ID_FLAG_FORCED = 0x55AA;
private static final int ID_DEFAULT_DURATION = 0x23E383; private static final int ID_DEFAULT_DURATION = 0x23E383;
private static final int ID_NAME = 0x536E;
private static final int ID_CODEC_ID = 0x86; private static final int ID_CODEC_ID = 0x86;
private static final int ID_CODEC_PRIVATE = 0x63A2; private static final int ID_CODEC_PRIVATE = 0x63A2;
private static final int ID_CODEC_DELAY = 0x56AA; private static final int ID_CODEC_DELAY = 0x56AA;
...@@ -813,6 +816,9 @@ public final class MatroskaExtractor implements Extractor { ...@@ -813,6 +816,9 @@ public final class MatroskaExtractor implements Extractor {
throw new ParserException("DocType " + value + " not supported"); throw new ParserException("DocType " + value + " not supported");
} }
break; break;
case ID_NAME:
currentTrack.name = value;
break;
case ID_CODEC_ID: case ID_CODEC_ID:
currentTrack.codecId = value; currentTrack.codecId = value;
break; break;
...@@ -1461,6 +1467,7 @@ public final class MatroskaExtractor implements Extractor { ...@@ -1461,6 +1467,7 @@ public final class MatroskaExtractor implements Extractor {
case ID_MAX_FALL: case ID_MAX_FALL:
return TYPE_UNSIGNED_INT; return TYPE_UNSIGNED_INT;
case ID_DOC_TYPE: case ID_DOC_TYPE:
case ID_NAME:
case ID_CODEC_ID: case ID_CODEC_ID:
case ID_LANGUAGE: case ID_LANGUAGE:
return TYPE_STRING; return TYPE_STRING;
...@@ -1607,6 +1614,7 @@ public final class MatroskaExtractor implements Extractor { ...@@ -1607,6 +1614,7 @@ public final class MatroskaExtractor implements Extractor {
private static final int DEFAULT_MAX_FALL = 200; // nits. private static final int DEFAULT_MAX_FALL = 200; // nits.
// Common elements. // Common elements.
public String name;
public String codecId; public String codecId;
public int number; public int number;
public int type; public int type;
...@@ -1831,9 +1839,33 @@ public final class MatroskaExtractor implements Extractor { ...@@ -1831,9 +1839,33 @@ public final class MatroskaExtractor implements Extractor {
byte[] hdrStaticInfo = getHdrStaticInfo(); byte[] hdrStaticInfo = getHdrStaticInfo();
colorInfo = new ColorInfo(colorSpace, colorRange, colorTransfer, hdrStaticInfo); colorInfo = new ColorInfo(colorSpace, colorRange, colorTransfer, hdrStaticInfo);
} }
format = Format.createVideoSampleFormat(Integer.toString(trackId), mimeType, null, int rotationDegrees = Format.NO_VALUE;
Format.NO_VALUE, maxInputSize, width, height, Format.NO_VALUE, initializationData, // Some HTC devices signal rotation in track names.
Format.NO_VALUE, pixelWidthHeightRatio, projectionData, stereoMode, colorInfo, if ("htc_video_rotA-000".equals(name)) {
rotationDegrees = 0;
} else if ("htc_video_rotA-090".equals(name)) {
rotationDegrees = 90;
} else if ("htc_video_rotA-180".equals(name)) {
rotationDegrees = 180;
} else if ("htc_video_rotA-270".equals(name)) {
rotationDegrees = 270;
}
format =
Format.createVideoSampleFormat(
Integer.toString(trackId),
mimeType,
/* codecs= */ null,
/* bitrate= */ Format.NO_VALUE,
maxInputSize,
width,
height,
/* frameRate= */ Format.NO_VALUE,
initializationData,
rotationDegrees,
pixelWidthHeightRatio,
projectionData,
stereoMode,
colorInfo,
drmInitData); drmInitData);
} else if (MimeTypes.APPLICATION_SUBRIP.equals(mimeType)) { } else if (MimeTypes.APPLICATION_SUBRIP.equals(mimeType)) {
type = C.TRACK_TYPE_TEXT; type = C.TRACK_TYPE_TEXT;
......
library/core/src/main/java/com/google/android/exoplayer2/extractor/mp3/ConstantBitrateSeeker.java
...@@ -39,4 +39,9 @@ import com.google.android.exoplayer2.extractor.MpegAudioHeader; ...@@ -39,4 +39,9 @@ import com.google.android.exoplayer2.extractor.MpegAudioHeader;
public long getTimeUs(long position) { public long getTimeUs(long position) {
return getTimeUsAtPosition(position); return getTimeUsAtPosition(position);
} }
@Override
public long getDataEndPosition() {
return C.POSITION_UNSET;
}
} }
library/core/src/main/java/com/google/android/exoplayer2/extractor/mp3/MlltSeeker.java 0 → 100644
/*
* 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.extractor.mp3;
import android.util.Pair;
import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.extractor.SeekPoint;
import com.google.android.exoplayer2.metadata.id3.MlltFrame;
import com.google.android.exoplayer2.util.Util;
/** MP3 seeker that uses metadata from an {@link MlltFrame}. */
/* package */ final class MlltSeeker implements Mp3Extractor.Seeker {
/**
* Returns an {@link MlltSeeker} for seeking in the stream.
*
* @param firstFramePosition The position of the start of the first frame in the stream.
* @param mlltFrame The MLLT frame with seeking metadata.
* @return An {@link MlltSeeker} for seeking in the stream.
*/
public static MlltSeeker create(long firstFramePosition, MlltFrame mlltFrame) {
int referenceCount = mlltFrame.bytesDeviations.length;
long[] referencePositions = new long[1 + referenceCount];
long[] referenceTimesMs = new long[1 + referenceCount];
referencePositions[0] = firstFramePosition;
referenceTimesMs[0] = 0;
long position = firstFramePosition;
long timeMs = 0;
for (int i = 1; i <= referenceCount; i++) {
position += mlltFrame.bytesBetweenReference + mlltFrame.bytesDeviations[i - 1];
timeMs += mlltFrame.millisecondsBetweenReference + mlltFrame.millisecondsDeviations[i - 1];
referencePositions[i] = position;
referenceTimesMs[i] = timeMs;
}
return new MlltSeeker(referencePositions, referenceTimesMs);
}
private final long[] referencePositions;
private final long[] referenceTimesMs;
private final long durationUs;
private MlltSeeker(long[] referencePositions, long[] referenceTimesMs) {
this.referencePositions = referencePositions;
this.referenceTimesMs = referenceTimesMs;
// Use the last reference point as the duration, as extrapolating variable bitrate at the end of
// the stream may give a large error.
durationUs = C.msToUs(referenceTimesMs[referenceTimesMs.length - 1]);
}
@Override
public boolean isSeekable() {
return true;
}
@Override
public SeekPoints getSeekPoints(long timeUs) {
timeUs = Util.constrainValue(timeUs, 0, durationUs);
Pair<Long, Long> timeMsAndPosition =
linearlyInterpolate(C.usToMs(timeUs), referenceTimesMs, referencePositions);
timeUs = C.msToUs(timeMsAndPosition.first);
long position = timeMsAndPosition.second;
return new SeekPoints(new SeekPoint(timeUs, position));
}
@Override
public long getTimeUs(long position) {
Pair<Long, Long> positionAndTimeMs =
linearlyInterpolate(position, referencePositions, referenceTimesMs);
return C.msToUs(positionAndTimeMs.second);
}
@Override
public long getDurationUs() {
return durationUs;
}
/**
* Given a set of reference points as coordinates in {@code xReferences} and {@code yReferences}
* and an x-axis value, linearly interpolates between corresponding reference points to give a
* y-axis value.
*
* @param x The x-axis value for which a y-axis value is needed.
* @param xReferences x coordinates of reference points.
* @param yReferences y coordinates of reference points.
* @return The linearly interpolated y-axis value.
*/
private static Pair<Long, Long> linearlyInterpolate(
long x, long[] xReferences, long[] yReferences) {
int previousReferenceIndex =
Util.binarySearchFloor(xReferences, x, /* inclusive= */ true, /* stayInBounds= */ true);
long xPreviousReference = xReferences[previousReferenceIndex];
long yPreviousReference = yReferences[previousReferenceIndex];
int nextReferenceIndex = previousReferenceIndex + 1;
if (nextReferenceIndex == xReferences.length) {
return Pair.create(xPreviousReference, yPreviousReference);
} else {
long xNextReference = xReferences[nextReferenceIndex];
long yNextReference = yReferences[nextReferenceIndex];
double proportion =
xNextReference == xPreviousReference
? 0.0
: ((double) x - xPreviousReference) / (xNextReference - xPreviousReference);
long y = (long) (proportion * (yNextReference - yPreviousReference)) + yPreviousReference;
return Pair.create(x, y);
}
}
@Override
public long getDataEndPosition() {
return C.POSITION_UNSET;
}
}
library/core/src/main/java/com/google/android/exoplayer2/extractor/mp3/Mp3Extractor.java
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
package com.google.android.exoplayer2.extractor.mp3; package com.google.android.exoplayer2.extractor.mp3;
import android.support.annotation.IntDef; import android.support.annotation.IntDef;
import android.support.annotation.Nullable;
import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.Format;
import com.google.android.exoplayer2.ParserException; import com.google.android.exoplayer2.ParserException;
...@@ -31,10 +32,13 @@ import com.google.android.exoplayer2.extractor.SeekMap; ...@@ -31,10 +32,13 @@ import com.google.android.exoplayer2.extractor.SeekMap;
import com.google.android.exoplayer2.extractor.TrackOutput; import com.google.android.exoplayer2.extractor.TrackOutput;
import com.google.android.exoplayer2.metadata.Metadata; import com.google.android.exoplayer2.metadata.Metadata;
import com.google.android.exoplayer2.metadata.id3.Id3Decoder; import com.google.android.exoplayer2.metadata.id3.Id3Decoder;
import com.google.android.exoplayer2.metadata.id3.Id3Decoder.FramePredicate;
import com.google.android.exoplayer2.metadata.id3.MlltFrame;
import com.google.android.exoplayer2.util.ParsableByteArray; import com.google.android.exoplayer2.util.ParsableByteArray;
import com.google.android.exoplayer2.util.Util; import com.google.android.exoplayer2.util.Util;
import java.io.EOFException; import java.io.EOFException;
import java.io.IOException; import java.io.IOException;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
...@@ -50,6 +54,7 @@ public final class Mp3Extractor implements Extractor { ...@@ -50,6 +54,7 @@ public final class Mp3Extractor implements Extractor {
* Flags controlling the behavior of the extractor. Possible flag values are {@link * Flags controlling the behavior of the extractor. Possible flag values are {@link
* #FLAG_ENABLE_CONSTANT_BITRATE_SEEKING} and {@link #FLAG_DISABLE_ID3_METADATA}. * #FLAG_ENABLE_CONSTANT_BITRATE_SEEKING} and {@link #FLAG_DISABLE_ID3_METADATA}.
*/ */
@Documented
@Retention(RetentionPolicy.SOURCE) @Retention(RetentionPolicy.SOURCE)
@IntDef( @IntDef(
flag = true, flag = true,
...@@ -66,6 +71,12 @@ public final class Mp3Extractor implements Extractor { ...@@ -66,6 +71,12 @@ public final class Mp3Extractor implements Extractor {
*/ */
public static final int FLAG_DISABLE_ID3_METADATA = 2; public static final int FLAG_DISABLE_ID3_METADATA = 2;
/** Predicate that matches ID3 frames containing only required gapless/seeking metadata. */
private static final FramePredicate REQUIRED_ID3_FRAME_PREDICATE =
(majorVersion, id0, id1, id2, id3) ->
((id0 == 'C' && id1 == 'O' && id2 == 'M' && (id3 == 'M' || majorVersion == 2))
|| (id0 == 'M' && id1 == 'L' && id2 == 'L' && (id3 == 'T' || majorVersion == 2)));
/** /**
* The maximum number of bytes to search when synchronizing, before giving up. * The maximum number of bytes to search when synchronizing, before giving up.
*/ */
...@@ -172,7 +183,15 @@ public final class Mp3Extractor implements Extractor { ...@@ -172,7 +183,15 @@ public final class Mp3Extractor implements Extractor {
} }
} }
if (seeker == null) { if (seeker == null) {
seeker = maybeReadSeekFrame(input); // Read past any seek frame and set the seeker based on metadata or a seek frame. Metadata
// takes priority as it can provide greater precision.
Seeker seekFrameSeeker = maybeReadSeekFrame(input);
Seeker metadataSeeker = maybeHandleSeekMetadata(metadata, input.getPosition());
if (metadataSeeker != null) {
seeker = metadataSeeker;
} else if (seekFrameSeeker != null) {
seeker = seekFrameSeeker;
}
if (seeker == null if (seeker == null
|| (!seeker.isSeekable() && (flags & FLAG_ENABLE_CONSTANT_BITRATE_SEEKING) != 0)) { || (!seeker.isSeekable() && (flags & FLAG_ENABLE_CONSTANT_BITRATE_SEEKING) != 0)) {
seeker = getConstantBitrateSeeker(input); seeker = getConstantBitrateSeeker(input);
...@@ -204,7 +223,7 @@ public final class Mp3Extractor implements Extractor { ...@@ -204,7 +223,7 @@ public final class Mp3Extractor implements Extractor {
private int readSample(ExtractorInput extractorInput) throws IOException, InterruptedException { private int readSample(ExtractorInput extractorInput) throws IOException, InterruptedException {
if (sampleBytesRemaining == 0) { if (sampleBytesRemaining == 0) {
extractorInput.resetPeekPosition(); extractorInput.resetPeekPosition();
if (!extractorInput.peekFully(scratch.data, 0, 4, true)) { if (peekEndOfStreamOrHeader(extractorInput)) {
return RESULT_END_OF_INPUT; return RESULT_END_OF_INPUT;
} }
scratch.setPosition(0); scratch.setPosition(0);
...@@ -251,11 +270,11 @@ public final class Mp3Extractor implements Extractor { ...@@ -251,11 +270,11 @@ public final class Mp3Extractor implements Extractor {
int searchLimitBytes = sniffing ? MAX_SNIFF_BYTES : MAX_SYNC_BYTES; int searchLimitBytes = sniffing ? MAX_SNIFF_BYTES : MAX_SYNC_BYTES;
input.resetPeekPosition(); input.resetPeekPosition();
if (input.getPosition() == 0) { if (input.getPosition() == 0) {
// We need to parse enough ID3 metadata to retrieve any gapless playback information even // We need to parse enough ID3 metadata to retrieve any gapless/seeking playback information
// if ID3 metadata parsing is disabled. // even if ID3 metadata parsing is disabled.
boolean onlyDecodeGaplessInfoFrames = (flags & FLAG_DISABLE_ID3_METADATA) != 0; boolean parseAllId3Frames = (flags & FLAG_DISABLE_ID3_METADATA) == 0;
Id3Decoder.FramePredicate id3FramePredicate = Id3Decoder.FramePredicate id3FramePredicate =
onlyDecodeGaplessInfoFrames ? GaplessInfoHolder.GAPLESS_INFO_ID3_FRAME_PREDICATE : null; parseAllId3Frames ? null : REQUIRED_ID3_FRAME_PREDICATE;
metadata = id3Peeker.peekId3Data(input, id3FramePredicate); metadata = id3Peeker.peekId3Data(input, id3FramePredicate);
if (metadata != null) { if (metadata != null) {
gaplessInfoHolder.setFromMetadata(metadata); gaplessInfoHolder.setFromMetadata(metadata);
...@@ -266,10 +285,13 @@ public final class Mp3Extractor implements Extractor { ...@@ -266,10 +285,13 @@ public final class Mp3Extractor implements Extractor {
} }
} }
while (true) { while (true) {
if (!input.peekFully(scratch.data, 0, 4, validFrameCount > 0)) { if (peekEndOfStreamOrHeader(input)) {
if (validFrameCount > 0) {
// We reached the end of the stream but found at least one valid frame. // We reached the end of the stream but found at least one valid frame.
break; break;
} }
throw new EOFException();
}
scratch.setPosition(0); scratch.setPosition(0);
int headerData = scratch.readInt(); int headerData = scratch.readInt();
int frameSize; int frameSize;
...@@ -314,6 +336,17 @@ public final class Mp3Extractor implements Extractor { ...@@ -314,6 +336,17 @@ public final class Mp3Extractor implements Extractor {
} }
/** /**
* Returns whether the extractor input is peeking the end of the stream. If {@code false},
* populates the scratch buffer with the next four bytes.
*/
private boolean peekEndOfStreamOrHeader(ExtractorInput extractorInput)
throws IOException, InterruptedException {
return (seeker != null && extractorInput.getPeekPosition() == seeker.getDataEndPosition())
|| !extractorInput.peekFully(
scratch.data, /* offset= */ 0, /* length= */ 4, /* allowEndOfInput= */ true);
}
/**
* Consumes the next frame from the {@code input} if it contains VBRI or Xing seeking metadata, * Consumes the next frame from the {@code input} if it contains VBRI or Xing seeking metadata,
* returning a {@link Seeker} if the metadata was present and valid, or {@code null} otherwise. * returning a {@link Seeker} if the metadata was present and valid, or {@code null} otherwise.
* After this method returns, the input position is the start of the first frame of audio. * After this method returns, the input position is the start of the first frame of audio.
...@@ -399,9 +432,24 @@ public final class Mp3Extractor implements Extractor { ...@@ -399,9 +432,24 @@ public final class Mp3Extractor implements Extractor {
return SEEK_HEADER_UNSET; return SEEK_HEADER_UNSET;
} }
@Nullable
private static MlltSeeker maybeHandleSeekMetadata(Metadata metadata, long firstFramePosition) {
if (metadata != null) {
int length = metadata.length();
for (int i = 0; i < length; i++) {
Metadata.Entry entry = metadata.get(i);
if (entry instanceof MlltFrame) {
return MlltSeeker.create(firstFramePosition, (MlltFrame) entry);
}
}
}
return null;
}
/** /**
* {@link SeekMap} that also allows mapping from position (byte offset) back to time, which can be * {@link SeekMap} that provides the end position of audio data and also allows mapping from
* used to work out the new sample basis timestamp after seeking and resynchronization. * position (byte offset) back to time, which can be used to work out the new sample basis
* timestamp after seeking and resynchronization.
*/ */
/* package */ interface Seeker extends SeekMap { /* package */ interface Seeker extends SeekMap {
...@@ -413,6 +461,11 @@ public final class Mp3Extractor implements Extractor { ...@@ -413,6 +461,11 @@ public final class Mp3Extractor implements Extractor {
*/ */
long getTimeUs(long position); long getTimeUs(long position);
/**
* Returns the position (byte offset) in the stream that is immediately after audio data, or
* {@link C#POSITION_UNSET} if not known.
*/
long getDataEndPosition();
} }
} }
library/core/src/main/java/com/google/android/exoplayer2/extractor/mp3/VbriSeeker.java
...@@ -89,17 +89,19 @@ import com.google.android.exoplayer2.util.Util; ...@@ -89,17 +89,19 @@ import com.google.android.exoplayer2.util.Util;
if (inputLength != C.LENGTH_UNSET && inputLength != position) { if (inputLength != C.LENGTH_UNSET && inputLength != position) {
Log.w(TAG, "VBRI data size mismatch: " + inputLength + ", " + position); Log.w(TAG, "VBRI data size mismatch: " + inputLength + ", " + position);
} }
return new VbriSeeker(timesUs, positions, durationUs); return new VbriSeeker(timesUs, positions, durationUs, /* dataEndPosition= */ position);
} }
private final long[] timesUs; private final long[] timesUs;
private final long[] positions; private final long[] positions;
private final long durationUs; private final long durationUs;
private final long dataEndPosition;
private VbriSeeker(long[] timesUs, long[] positions, long durationUs) { private VbriSeeker(long[] timesUs, long[] positions, long durationUs, long dataEndPosition) {
this.timesUs = timesUs; this.timesUs = timesUs;
this.positions = positions; this.positions = positions;
this.durationUs = durationUs; this.durationUs = durationUs;
this.dataEndPosition = dataEndPosition;
} }
@Override @Override
...@@ -129,4 +131,8 @@ import com.google.android.exoplayer2.util.Util; ...@@ -129,4 +131,8 @@ import com.google.android.exoplayer2.util.Util;
return durationUs; return durationUs;
} }
@Override
public long getDataEndPosition() {
return dataEndPosition;
}
} }
library/core/src/main/java/com/google/android/exoplayer2/extractor/mp3/XingSeeker.java
...@@ -75,17 +75,17 @@ import com.google.android.exoplayer2.util.Util; ...@@ -75,17 +75,17 @@ import com.google.android.exoplayer2.util.Util;
if (inputLength != C.LENGTH_UNSET && inputLength != position + dataSize) { if (inputLength != C.LENGTH_UNSET && inputLength != position + dataSize) {
Log.w(TAG, "XING data size mismatch: " + inputLength + ", " + (position + dataSize)); Log.w(TAG, "XING data size mismatch: " + inputLength + ", " + (position + dataSize));
} }
return new XingSeeker(position, mpegAudioHeader.frameSize, durationUs, dataSize, return new XingSeeker(
tableOfContents); position, mpegAudioHeader.frameSize, durationUs, dataSize, tableOfContents);
} }
private final long dataStartPosition; private final long dataStartPosition;
private final int xingFrameSize; private final int xingFrameSize;
private final long durationUs; private final long durationUs;
/** /** Data size, including the XING frame. */
* Data size, including the XING frame.
*/
private final long dataSize; private final long dataSize;
private final long dataEndPosition;
/** /**
* Entries are in the range [0, 255], but are stored as long integers for convenience. Null if the * Entries are in the range [0, 255], but are stored as long integers for convenience. Null if the
* table of contents was missing from the header, in which case seeking is not be supported. * table of contents was missing from the header, in which case seeking is not be supported.
...@@ -93,7 +93,12 @@ import com.google.android.exoplayer2.util.Util; ...@@ -93,7 +93,12 @@ import com.google.android.exoplayer2.util.Util;
private final @Nullable long[] tableOfContents; private final @Nullable long[] tableOfContents;
private XingSeeker(long dataStartPosition, int xingFrameSize, long durationUs) { private XingSeeker(long dataStartPosition, int xingFrameSize, long durationUs) {
this(dataStartPosition, xingFrameSize, durationUs, C.LENGTH_UNSET, null); this(
dataStartPosition,
xingFrameSize,
durationUs,
/* dataSize= */ C.LENGTH_UNSET,
/* tableOfContents= */ null);
} }
private XingSeeker( private XingSeeker(
...@@ -105,8 +110,9 @@ import com.google.android.exoplayer2.util.Util; ...@@ -105,8 +110,9 @@ import com.google.android.exoplayer2.util.Util;
this.dataStartPosition = dataStartPosition; this.dataStartPosition = dataStartPosition;
this.xingFrameSize = xingFrameSize; this.xingFrameSize = xingFrameSize;
this.durationUs = durationUs; this.durationUs = durationUs;
this.dataSize = dataSize;
this.tableOfContents = tableOfContents; this.tableOfContents = tableOfContents;
this.dataSize = dataSize;
dataEndPosition = dataSize == C.LENGTH_UNSET ? C.POSITION_UNSET : dataStartPosition + dataSize;
} }
@Override @Override
...@@ -166,6 +172,11 @@ import com.google.android.exoplayer2.util.Util; ...@@ -166,6 +172,11 @@ import com.google.android.exoplayer2.util.Util;
return durationUs; return durationUs;
} }
@Override
public long getDataEndPosition() {
return dataEndPosition;
}
/** /**
* Returns the time in microseconds for a given table index. * Returns the time in microseconds for a given table index.
* *
......
library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/AtomParsers.java
...@@ -221,11 +221,22 @@ import java.util.List; ...@@ -221,11 +221,22 @@ import java.util.List;
for (int i = 0; i < sampleCount; i++) { for (int i = 0; i < sampleCount; i++) {
// Advance to the next chunk if necessary. // Advance to the next chunk if necessary.
while (remainingSamplesInChunk == 0) { boolean chunkDataComplete = true;
Assertions.checkState(chunkIterator.moveNext()); while (remainingSamplesInChunk == 0 && (chunkDataComplete = chunkIterator.moveNext())) {
offset = chunkIterator.offset; offset = chunkIterator.offset;
remainingSamplesInChunk = chunkIterator.numSamples; remainingSamplesInChunk = chunkIterator.numSamples;
} }
if (!chunkDataComplete) {
Log.w(TAG, "Unexpected end of chunk data");
sampleCount = i;
offsets = Arrays.copyOf(offsets, sampleCount);
sizes = Arrays.copyOf(sizes, sampleCount);
timestamps = Arrays.copyOf(timestamps, sampleCount);
flags = Arrays.copyOf(flags, sampleCount);
remainingSamplesAtTimestampOffset = 0;
remainingTimestampOffsetChanges = 0;
break;
}
// Add on the timestamp offset if ctts is present. // Add on the timestamp offset if ctts is present.
if (ctts != null) { if (ctts != null) {
......
library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4Extractor.java
...@@ -43,6 +43,7 @@ import com.google.android.exoplayer2.util.ParsableByteArray; ...@@ -43,6 +43,7 @@ import com.google.android.exoplayer2.util.ParsableByteArray;
import com.google.android.exoplayer2.util.TimestampAdjuster; import com.google.android.exoplayer2.util.TimestampAdjuster;
import com.google.android.exoplayer2.util.Util; import com.google.android.exoplayer2.util.Util;
import java.io.IOException; import java.io.IOException;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
import java.util.ArrayDeque; import java.util.ArrayDeque;
...@@ -67,6 +68,7 @@ public final class FragmentedMp4Extractor implements Extractor { ...@@ -67,6 +68,7 @@ public final class FragmentedMp4Extractor implements Extractor {
* {@link #FLAG_ENABLE_EMSG_TRACK}, {@link #FLAG_SIDELOADED} and {@link * {@link #FLAG_ENABLE_EMSG_TRACK}, {@link #FLAG_SIDELOADED} and {@link
* #FLAG_WORKAROUND_IGNORE_EDIT_LISTS}. * #FLAG_WORKAROUND_IGNORE_EDIT_LISTS}.
*/ */
@Documented
@Retention(RetentionPolicy.SOURCE) @Retention(RetentionPolicy.SOURCE)
@IntDef( @IntDef(
flag = true, flag = true,
......
library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Mp4Extractor.java
...@@ -35,6 +35,7 @@ import com.google.android.exoplayer2.util.NalUnitUtil; ...@@ -35,6 +35,7 @@ import com.google.android.exoplayer2.util.NalUnitUtil;
import com.google.android.exoplayer2.util.ParsableByteArray; import com.google.android.exoplayer2.util.ParsableByteArray;
import com.google.android.exoplayer2.util.Util; import com.google.android.exoplayer2.util.Util;
import java.io.IOException; import java.io.IOException;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
import java.util.ArrayDeque; import java.util.ArrayDeque;
...@@ -53,6 +54,7 @@ public final class Mp4Extractor implements Extractor, SeekMap { ...@@ -53,6 +54,7 @@ public final class Mp4Extractor implements Extractor, SeekMap {
* Flags controlling the behavior of the extractor. Possible flag value is {@link * Flags controlling the behavior of the extractor. Possible flag value is {@link
* #FLAG_WORKAROUND_IGNORE_EDIT_LISTS}. * #FLAG_WORKAROUND_IGNORE_EDIT_LISTS}.
*/ */
@Documented
@Retention(RetentionPolicy.SOURCE) @Retention(RetentionPolicy.SOURCE)
@IntDef( @IntDef(
flag = true, flag = true,
...@@ -63,12 +65,12 @@ public final class Mp4Extractor implements Extractor, SeekMap { ...@@ -63,12 +65,12 @@ public final class Mp4Extractor implements Extractor, SeekMap {
*/ */
public static final int FLAG_WORKAROUND_IGNORE_EDIT_LISTS = 1; public static final int FLAG_WORKAROUND_IGNORE_EDIT_LISTS = 1;
/** /** Parser states. */
* Parser states. @Documented
*/
@Retention(RetentionPolicy.SOURCE) @Retention(RetentionPolicy.SOURCE)
@IntDef({STATE_READING_ATOM_HEADER, STATE_READING_ATOM_PAYLOAD, STATE_READING_SAMPLE}) @IntDef({STATE_READING_ATOM_HEADER, STATE_READING_ATOM_PAYLOAD, STATE_READING_SAMPLE})
private @interface State {} private @interface State {}
private static final int STATE_READING_ATOM_HEADER = 0; private static final int STATE_READING_ATOM_HEADER = 0;
private static final int STATE_READING_ATOM_PAYLOAD = 1; private static final int STATE_READING_ATOM_PAYLOAD = 1;
private static final int STATE_READING_SAMPLE = 2; private static final int STATE_READING_SAMPLE = 2;
......
library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Track.java
...@@ -19,6 +19,7 @@ import android.support.annotation.IntDef; ...@@ -19,6 +19,7 @@ import android.support.annotation.IntDef;
import android.support.annotation.Nullable; import android.support.annotation.Nullable;
import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.Format;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
...@@ -31,6 +32,7 @@ public final class Track { ...@@ -31,6 +32,7 @@ public final class Track {
* The transformation to apply to samples in the track, if any. One of {@link * The transformation to apply to samples in the track, if any. One of {@link
* #TRANSFORMATION_NONE} or {@link #TRANSFORMATION_CEA608_CDAT}. * #TRANSFORMATION_NONE} or {@link #TRANSFORMATION_CEA608_CDAT}.
*/ */
@Documented
@Retention(RetentionPolicy.SOURCE) @Retention(RetentionPolicy.SOURCE)
@IntDef({TRANSFORMATION_NONE, TRANSFORMATION_CEA608_CDAT}) @IntDef({TRANSFORMATION_NONE, TRANSFORMATION_CEA608_CDAT})
public @interface Transformation {} public @interface Transformation {}
......
library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/Ac3Reader.java
...@@ -25,6 +25,7 @@ import com.google.android.exoplayer2.extractor.TrackOutput; ...@@ -25,6 +25,7 @@ import com.google.android.exoplayer2.extractor.TrackOutput;
import com.google.android.exoplayer2.extractor.ts.TsPayloadReader.TrackIdGenerator; import com.google.android.exoplayer2.extractor.ts.TsPayloadReader.TrackIdGenerator;
import com.google.android.exoplayer2.util.ParsableBitArray; import com.google.android.exoplayer2.util.ParsableBitArray;
import com.google.android.exoplayer2.util.ParsableByteArray; import com.google.android.exoplayer2.util.ParsableByteArray;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
...@@ -33,9 +34,11 @@ import java.lang.annotation.RetentionPolicy; ...@@ -33,9 +34,11 @@ import java.lang.annotation.RetentionPolicy;
*/ */
public final class Ac3Reader implements ElementaryStreamReader { public final class Ac3Reader implements ElementaryStreamReader {
@Documented
@Retention(RetentionPolicy.SOURCE) @Retention(RetentionPolicy.SOURCE)
@IntDef({STATE_FINDING_SYNC, STATE_READING_HEADER, STATE_READING_SAMPLE}) @IntDef({STATE_FINDING_SYNC, STATE_READING_HEADER, STATE_READING_SAMPLE})
private @interface State {} private @interface State {}
private static final int STATE_FINDING_SYNC = 0; private static final int STATE_FINDING_SYNC = 0;
private static final int STATE_READING_HEADER = 1; private static final int STATE_READING_HEADER = 1;
private static final int STATE_READING_SAMPLE = 2; private static final int STATE_READING_SAMPLE = 2;
......
library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/AdtsExtractor.java
...@@ -32,6 +32,7 @@ import com.google.android.exoplayer2.util.ParsableBitArray; ...@@ -32,6 +32,7 @@ import com.google.android.exoplayer2.util.ParsableBitArray;
import com.google.android.exoplayer2.util.ParsableByteArray; import com.google.android.exoplayer2.util.ParsableByteArray;
import com.google.android.exoplayer2.util.Util; import com.google.android.exoplayer2.util.Util;
import java.io.IOException; import java.io.IOException;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
...@@ -47,6 +48,7 @@ public final class AdtsExtractor implements Extractor { ...@@ -47,6 +48,7 @@ public final class AdtsExtractor implements Extractor {
* Flags controlling the behavior of the extractor. Possible flag value is {@link * Flags controlling the behavior of the extractor. Possible flag value is {@link
* #FLAG_ENABLE_CONSTANT_BITRATE_SEEKING}. * #FLAG_ENABLE_CONSTANT_BITRATE_SEEKING}.
*/ */
@Documented
@Retention(RetentionPolicy.SOURCE) @Retention(RetentionPolicy.SOURCE)
@IntDef( @IntDef(
flag = true, flag = true,
......
library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/DefaultTsPayloadReaderFactory.java
...@@ -22,6 +22,7 @@ import com.google.android.exoplayer2.extractor.ts.TsPayloadReader.EsInfo; ...@@ -22,6 +22,7 @@ import com.google.android.exoplayer2.extractor.ts.TsPayloadReader.EsInfo;
import com.google.android.exoplayer2.text.cea.Cea708InitializationData; import com.google.android.exoplayer2.text.cea.Cea708InitializationData;
import com.google.android.exoplayer2.util.MimeTypes; import com.google.android.exoplayer2.util.MimeTypes;
import com.google.android.exoplayer2.util.ParsableByteArray; import com.google.android.exoplayer2.util.ParsableByteArray;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
import java.util.ArrayList; import java.util.ArrayList;
...@@ -39,6 +40,7 @@ public final class DefaultTsPayloadReaderFactory implements TsPayloadReader.Fact ...@@ -39,6 +40,7 @@ public final class DefaultTsPayloadReaderFactory implements TsPayloadReader.Fact
* #FLAG_IGNORE_H264_STREAM}, {@link #FLAG_DETECT_ACCESS_UNITS}, {@link * #FLAG_IGNORE_H264_STREAM}, {@link #FLAG_DETECT_ACCESS_UNITS}, {@link
* #FLAG_IGNORE_SPLICE_INFO_STREAM} and {@link #FLAG_OVERRIDE_CAPTION_DESCRIPTORS}. * #FLAG_IGNORE_SPLICE_INFO_STREAM} and {@link #FLAG_OVERRIDE_CAPTION_DESCRIPTORS}.
*/ */
@Documented
@Retention(RetentionPolicy.SOURCE) @Retention(RetentionPolicy.SOURCE)
@IntDef( @IntDef(
flag = true, flag = true,
...@@ -52,11 +54,37 @@ public final class DefaultTsPayloadReaderFactory implements TsPayloadReader.Fact ...@@ -52,11 +54,37 @@ public final class DefaultTsPayloadReaderFactory implements TsPayloadReader.Fact
}) })
public @interface Flags {} public @interface Flags {}
/**
* When extracting H.264 samples, whether to treat samples consisting of non-IDR I slices as
* synchronization samples (key-frames).
*/
public static final int FLAG_ALLOW_NON_IDR_KEYFRAMES = 1; public static final int FLAG_ALLOW_NON_IDR_KEYFRAMES = 1;
/**
* Prevents the creation of {@link AdtsReader} and {@link LatmReader} instances. This flag should
* be enabled if the transport stream contains no packets for an AAC elementary stream that is
* declared in the PMT.
*/
public static final int FLAG_IGNORE_AAC_STREAM = 1 << 1; public static final int FLAG_IGNORE_AAC_STREAM = 1 << 1;
/**
* Prevents the creation of {@link H264Reader} instances. This flag should be enabled if the
* transport stream contains no packets for an H.264 elementary stream that is declared in the
* PMT.
*/
public static final int FLAG_IGNORE_H264_STREAM = 1 << 2; public static final int FLAG_IGNORE_H264_STREAM = 1 << 2;
/**
* When extracting H.264 samples, whether to split the input stream into access units (samples)
* based on slice headers. This flag should be disabled if the stream contains access unit
* delimiters (AUDs).
*/
public static final int FLAG_DETECT_ACCESS_UNITS = 1 << 3; public static final int FLAG_DETECT_ACCESS_UNITS = 1 << 3;
/** Prevents the creation of {@link SpliceInfoSectionReader} instances. */
public static final int FLAG_IGNORE_SPLICE_INFO_STREAM = 1 << 4; public static final int FLAG_IGNORE_SPLICE_INFO_STREAM = 1 << 4;
/**
* Whether the list of {@code closedCaptionFormats} passed to {@link
* DefaultTsPayloadReaderFactory#DefaultTsPayloadReaderFactory(int, List)} should be used in spite
* of any closed captions service descriptors. If this flag is disabled, {@code
* closedCaptionFormats} will be ignored if the PMT contains closed captions service descriptors.
*/
public static final int FLAG_OVERRIDE_CAPTION_DESCRIPTORS = 1 << 5; public static final int FLAG_OVERRIDE_CAPTION_DESCRIPTORS = 1 << 5;
private static final int DESCRIPTOR_TAG_CAPTION_SERVICE = 0x86; private static final int DESCRIPTOR_TAG_CAPTION_SERVICE = 0x86;
......
library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/TsExtractor.java
...@@ -38,6 +38,7 @@ import com.google.android.exoplayer2.util.ParsableByteArray; ...@@ -38,6 +38,7 @@ import com.google.android.exoplayer2.util.ParsableByteArray;
import com.google.android.exoplayer2.util.TimestampAdjuster; import com.google.android.exoplayer2.util.TimestampAdjuster;
import com.google.android.exoplayer2.util.Util; import com.google.android.exoplayer2.util.Util;
import java.io.IOException; import java.io.IOException;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
import java.util.ArrayList; import java.util.ArrayList;
...@@ -57,6 +58,7 @@ public final class TsExtractor implements Extractor { ...@@ -57,6 +58,7 @@ public final class TsExtractor implements Extractor {
* Modes for the extractor. One of {@link #MODE_MULTI_PMT}, {@link #MODE_SINGLE_PMT} or {@link * Modes for the extractor. One of {@link #MODE_MULTI_PMT}, {@link #MODE_SINGLE_PMT} or {@link
* #MODE_HLS}. * #MODE_HLS}.
*/ */
@Documented
@Retention(RetentionPolicy.SOURCE) @Retention(RetentionPolicy.SOURCE)
@IntDef({MODE_MULTI_PMT, MODE_SINGLE_PMT, MODE_HLS}) @IntDef({MODE_MULTI_PMT, MODE_SINGLE_PMT, MODE_HLS})
public @interface Mode {} public @interface Mode {}
......
library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java
...@@ -46,6 +46,7 @@ import com.google.android.exoplayer2.util.NalUnitUtil; ...@@ -46,6 +46,7 @@ import com.google.android.exoplayer2.util.NalUnitUtil;
import com.google.android.exoplayer2.util.TimedValueQueue; import com.google.android.exoplayer2.util.TimedValueQueue;
import com.google.android.exoplayer2.util.TraceUtil; import com.google.android.exoplayer2.util.TraceUtil;
import com.google.android.exoplayer2.util.Util; import com.google.android.exoplayer2.util.Util;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
...@@ -182,6 +183,7 @@ public abstract class MediaCodecRenderer extends BaseRenderer { ...@@ -182,6 +183,7 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
* The possible return values for {@link #canKeepCodec(MediaCodec, MediaCodecInfo, Format, * The possible return values for {@link #canKeepCodec(MediaCodec, MediaCodecInfo, Format,
* Format)}. * Format)}.
*/ */
@Documented
@Retention(RetentionPolicy.SOURCE) @Retention(RetentionPolicy.SOURCE)
@IntDef({ @IntDef({
KEEP_CODEC_RESULT_NO, KEEP_CODEC_RESULT_NO,
...@@ -199,9 +201,13 @@ public abstract class MediaCodecRenderer extends BaseRenderer { ...@@ -199,9 +201,13 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
*/ */
protected static final int KEEP_CODEC_RESULT_YES_WITH_RECONFIGURATION = 3; protected static final int KEEP_CODEC_RESULT_YES_WITH_RECONFIGURATION = 3;
@Documented
@Retention(RetentionPolicy.SOURCE) @Retention(RetentionPolicy.SOURCE)
@IntDef({RECONFIGURATION_STATE_NONE, RECONFIGURATION_STATE_WRITE_PENDING, @IntDef({
RECONFIGURATION_STATE_QUEUE_PENDING}) RECONFIGURATION_STATE_NONE,
RECONFIGURATION_STATE_WRITE_PENDING,
RECONFIGURATION_STATE_QUEUE_PENDING
})
private @interface ReconfigurationState {} private @interface ReconfigurationState {}
/** /**
* There is no pending adaptive reconfiguration work. * There is no pending adaptive reconfiguration work.
...@@ -217,9 +223,13 @@ public abstract class MediaCodecRenderer extends BaseRenderer { ...@@ -217,9 +223,13 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
*/ */
private static final int RECONFIGURATION_STATE_QUEUE_PENDING = 2; private static final int RECONFIGURATION_STATE_QUEUE_PENDING = 2;
@Documented
@Retention(RetentionPolicy.SOURCE) @Retention(RetentionPolicy.SOURCE)
@IntDef({REINITIALIZATION_STATE_NONE, REINITIALIZATION_STATE_SIGNAL_END_OF_STREAM, @IntDef({
REINITIALIZATION_STATE_WAIT_END_OF_STREAM}) REINITIALIZATION_STATE_NONE,
REINITIALIZATION_STATE_SIGNAL_END_OF_STREAM,
REINITIALIZATION_STATE_WAIT_END_OF_STREAM
})
private @interface ReinitializationState {} private @interface ReinitializationState {}
/** /**
* The codec does not need to be re-initialized. * The codec does not need to be re-initialized.
...@@ -238,9 +248,13 @@ public abstract class MediaCodecRenderer extends BaseRenderer { ...@@ -238,9 +248,13 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
*/ */
private static final int REINITIALIZATION_STATE_WAIT_END_OF_STREAM = 2; private static final int REINITIALIZATION_STATE_WAIT_END_OF_STREAM = 2;
@Documented
@Retention(RetentionPolicy.SOURCE) @Retention(RetentionPolicy.SOURCE)
@IntDef({ADAPTATION_WORKAROUND_MODE_NEVER, ADAPTATION_WORKAROUND_MODE_SAME_RESOLUTION, @IntDef({
ADAPTATION_WORKAROUND_MODE_ALWAYS}) ADAPTATION_WORKAROUND_MODE_NEVER,
ADAPTATION_WORKAROUND_MODE_SAME_RESOLUTION,
ADAPTATION_WORKAROUND_MODE_ALWAYS
})
private @interface AdaptationWorkaroundMode {} private @interface AdaptationWorkaroundMode {}
/** /**
* The adaptation workaround is never used. * The adaptation workaround is never used.
......
library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/Id3Decoder.java
...@@ -21,6 +21,7 @@ import com.google.android.exoplayer2.metadata.Metadata; ...@@ -21,6 +21,7 @@ import com.google.android.exoplayer2.metadata.Metadata;
import com.google.android.exoplayer2.metadata.MetadataDecoder; import com.google.android.exoplayer2.metadata.MetadataDecoder;
import com.google.android.exoplayer2.metadata.MetadataInputBuffer; import com.google.android.exoplayer2.metadata.MetadataInputBuffer;
import com.google.android.exoplayer2.util.Log; import com.google.android.exoplayer2.util.Log;
import com.google.android.exoplayer2.util.ParsableBitArray;
import com.google.android.exoplayer2.util.ParsableByteArray; import com.google.android.exoplayer2.util.ParsableByteArray;
import com.google.android.exoplayer2.util.Util; import com.google.android.exoplayer2.util.Util;
import java.io.UnsupportedEncodingException; import java.io.UnsupportedEncodingException;
...@@ -382,6 +383,8 @@ public final class Id3Decoder implements MetadataDecoder { ...@@ -382,6 +383,8 @@ public final class Id3Decoder implements MetadataDecoder {
} else if (frameId0 == 'C' && frameId1 == 'T' && frameId2 == 'O' && frameId3 == 'C') { } else if (frameId0 == 'C' && frameId1 == 'T' && frameId2 == 'O' && frameId3 == 'C') {
frame = decodeChapterTOCFrame(id3Data, frameSize, majorVersion, unsignedIntFrameSizeHack, frame = decodeChapterTOCFrame(id3Data, frameSize, majorVersion, unsignedIntFrameSizeHack,
frameHeaderSize, framePredicate); frameHeaderSize, framePredicate);
} else if (frameId0 == 'M' && frameId1 == 'L' && frameId2 == 'L' && frameId3 == 'T') {
frame = decodeMlltFrame(id3Data, frameSize);
} else { } else {
String id = getFrameId(majorVersion, frameId0, frameId1, frameId2, frameId3); String id = getFrameId(majorVersion, frameId0, frameId1, frameId2, frameId3);
frame = decodeBinaryFrame(id3Data, frameSize, id); frame = decodeBinaryFrame(id3Data, frameSize, id);
...@@ -662,6 +665,36 @@ public final class Id3Decoder implements MetadataDecoder { ...@@ -662,6 +665,36 @@ public final class Id3Decoder implements MetadataDecoder {
return new ChapterTocFrame(elementId, isRoot, isOrdered, children, subFrameArray); return new ChapterTocFrame(elementId, isRoot, isOrdered, children, subFrameArray);
} }
private static MlltFrame decodeMlltFrame(ParsableByteArray id3Data, int frameSize) {
// See ID3v2.4.0 native frames subsection 4.6.
int mpegFramesBetweenReference = id3Data.readUnsignedShort();
int bytesBetweenReference = id3Data.readUnsignedInt24();
int millisecondsBetweenReference = id3Data.readUnsignedInt24();
int bitsForBytesDeviation = id3Data.readUnsignedByte();
int bitsForMillisecondsDeviation = id3Data.readUnsignedByte();
ParsableBitArray references = new ParsableBitArray();
references.reset(id3Data);
int referencesBits = 8 * (frameSize - 10);
int bitsPerReference = bitsForBytesDeviation + bitsForMillisecondsDeviation;
int referencesCount = referencesBits / bitsPerReference;
int[] bytesDeviations = new int[referencesCount];
int[] millisecondsDeviations = new int[referencesCount];
for (int i = 0; i < referencesCount; i++) {
int bytesDeviation = references.readBits(bitsForBytesDeviation);
int millisecondsDeviation = references.readBits(bitsForMillisecondsDeviation);
bytesDeviations[i] = bytesDeviation;
millisecondsDeviations[i] = millisecondsDeviation;
}
return new MlltFrame(
mpegFramesBetweenReference,
bytesBetweenReference,
millisecondsBetweenReference,
bytesDeviations,
millisecondsDeviations);
}
private static BinaryFrame decodeBinaryFrame(ParsableByteArray id3Data, int frameSize, private static BinaryFrame decodeBinaryFrame(ParsableByteArray id3Data, int frameSize,
String id) { String id) {
byte[] frame = new byte[frameSize]; byte[] frame = new byte[frameSize];
......
library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/MlltFrame.java 0 → 100644
/*
* 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.metadata.id3;
import android.os.Parcel;
import android.support.annotation.Nullable;
import java.util.Arrays;
/** MPEG location lookup table frame. */
public final class MlltFrame extends Id3Frame {
public static final String ID = "MLLT";
public final int mpegFramesBetweenReference;
public final int bytesBetweenReference;
public final int millisecondsBetweenReference;
public final int[] bytesDeviations;
public final int[] millisecondsDeviations;
public MlltFrame(
int mpegFramesBetweenReference,
int bytesBetweenReference,
int millisecondsBetweenReference,
int[] bytesDeviations,
int[] millisecondsDeviations) {
super(ID);
this.mpegFramesBetweenReference = mpegFramesBetweenReference;
this.bytesBetweenReference = bytesBetweenReference;
this.millisecondsBetweenReference = millisecondsBetweenReference;
this.bytesDeviations = bytesDeviations;
this.millisecondsDeviations = millisecondsDeviations;
}
/* package */ MlltFrame(Parcel in) {
super(ID);
this.mpegFramesBetweenReference = in.readInt();
this.bytesBetweenReference = in.readInt();
this.millisecondsBetweenReference = in.readInt();
this.bytesDeviations = in.createIntArray();
this.millisecondsDeviations = in.createIntArray();
}
@Override
public boolean equals(@Nullable Object obj) {
if (this == obj) {
return true;
}
if (obj == null || getClass() != obj.getClass()) {
return false;
}
MlltFrame other = (MlltFrame) obj;
return mpegFramesBetweenReference == other.mpegFramesBetweenReference
&& bytesBetweenReference == other.bytesBetweenReference
&& millisecondsBetweenReference == other.millisecondsBetweenReference
&& Arrays.equals(bytesDeviations, other.bytesDeviations)
&& Arrays.equals(millisecondsDeviations, other.millisecondsDeviations);
}
@Override
public int hashCode() {
int result = 17;
result = 31 * result + mpegFramesBetweenReference;
result = 31 * result + bytesBetweenReference;
result = 31 * result + millisecondsBetweenReference;
result = 31 * result + Arrays.hashCode(bytesDeviations);
result = 31 * result + Arrays.hashCode(millisecondsDeviations);
return result;
}
// Parcelable implementation.
@Override
public void writeToParcel(Parcel dest, int flags) {
dest.writeInt(mpegFramesBetweenReference);
dest.writeInt(bytesBetweenReference);
dest.writeInt(millisecondsBetweenReference);
dest.writeIntArray(bytesDeviations);
dest.writeIntArray(millisecondsDeviations);
}
@Override
public int describeContents() {
return 0;
}
public static final Creator<MlltFrame> CREATOR =
new Creator<MlltFrame>() {
@Override
public MlltFrame createFromParcel(Parcel in) {
return new MlltFrame(in);
}
@Override
public MlltFrame[] newArray(int size) {
return new MlltFrame[size];
}
};
}
library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
...@@ -37,6 +37,7 @@ import com.google.android.exoplayer2.util.Util; ...@@ -37,6 +37,7 @@ import com.google.android.exoplayer2.util.Util;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
import java.util.ArrayList; import java.util.ArrayList;
...@@ -532,6 +533,7 @@ public final class DownloadManager { ...@@ -532,6 +533,7 @@ public final class DownloadManager {
* -&gt; failed * -&gt; failed
* </pre> * </pre>
*/ */
@Documented
@Retention(RetentionPolicy.SOURCE) @Retention(RetentionPolicy.SOURCE)
@IntDef({STATE_QUEUED, STATE_STARTED, STATE_COMPLETED, STATE_CANCELED, STATE_FAILED}) @IntDef({STATE_QUEUED, STATE_STARTED, STATE_COMPLETED, STATE_CANCELED, STATE_FAILED})
public @interface State {} public @interface State {}
...@@ -621,6 +623,7 @@ public final class DownloadManager { ...@@ -621,6 +623,7 @@ public final class DownloadManager {
* +-----------+------+-------+---------+-----------+-----------+--------+--------+------+ * +-----------+------+-------+---------+-----------+-----------+--------+--------+------+
* </pre> * </pre>
*/ */
@Documented
@Retention(RetentionPolicy.SOURCE) @Retention(RetentionPolicy.SOURCE)
@IntDef({ @IntDef({
STATE_QUEUED, STATE_QUEUED,
......
library/core/src/main/java/com/google/android/exoplayer2/scheduler/Requirements.java
...@@ -27,6 +27,7 @@ import android.os.PowerManager; ...@@ -27,6 +27,7 @@ import android.os.PowerManager;
import android.support.annotation.IntDef; import android.support.annotation.IntDef;
import com.google.android.exoplayer2.util.Log; import com.google.android.exoplayer2.util.Log;
import com.google.android.exoplayer2.util.Util; import com.google.android.exoplayer2.util.Util;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
...@@ -39,6 +40,7 @@ public final class Requirements { ...@@ -39,6 +40,7 @@ public final class Requirements {
* Network types. One of {@link #NETWORK_TYPE_NONE}, {@link #NETWORK_TYPE_ANY}, {@link * Network types. One of {@link #NETWORK_TYPE_NONE}, {@link #NETWORK_TYPE_ANY}, {@link
* #NETWORK_TYPE_UNMETERED}, {@link #NETWORK_TYPE_NOT_ROAMING} or {@link #NETWORK_TYPE_METERED}. * #NETWORK_TYPE_UNMETERED}, {@link #NETWORK_TYPE_NOT_ROAMING} or {@link #NETWORK_TYPE_METERED}.
*/ */
@Documented
@Retention(RetentionPolicy.SOURCE) @Retention(RetentionPolicy.SOURCE)
@IntDef({ @IntDef({
NETWORK_TYPE_NONE, NETWORK_TYPE_NONE,
...@@ -185,7 +187,7 @@ public final class Requirements { ...@@ -185,7 +187,7 @@ public final class Requirements {
} }
PowerManager powerManager = (PowerManager) context.getSystemService(Context.POWER_SERVICE); PowerManager powerManager = (PowerManager) context.getSystemService(Context.POWER_SERVICE);
return Util.SDK_INT >= 23 return Util.SDK_INT >= 23
? !powerManager.isDeviceIdleMode() ? powerManager.isDeviceIdleMode()
: Util.SDK_INT >= 20 ? !powerManager.isInteractive() : !powerManager.isScreenOn(); : Util.SDK_INT >= 20 ? !powerManager.isInteractive() : !powerManager.isScreenOn();
} }
......
library/core/src/main/java/com/google/android/exoplayer2/source/ClippingMediaSource.java
...@@ -24,6 +24,7 @@ import com.google.android.exoplayer2.upstream.Allocator; ...@@ -24,6 +24,7 @@ import com.google.android.exoplayer2.upstream.Allocator;
import com.google.android.exoplayer2.upstream.TransferListener; import com.google.android.exoplayer2.upstream.TransferListener;
import com.google.android.exoplayer2.util.Assertions; import com.google.android.exoplayer2.util.Assertions;
import java.io.IOException; import java.io.IOException;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
import java.util.ArrayList; import java.util.ArrayList;
...@@ -41,6 +42,7 @@ public final class ClippingMediaSource extends CompositeMediaSource<Void> { ...@@ -41,6 +42,7 @@ public final class ClippingMediaSource extends CompositeMediaSource<Void> {
* The reason clipping failed. One of {@link #REASON_INVALID_PERIOD_COUNT}, {@link * The reason clipping failed. One of {@link #REASON_INVALID_PERIOD_COUNT}, {@link
* #REASON_NOT_SEEKABLE_TO_START} or {@link #REASON_START_EXCEEDS_END}. * #REASON_NOT_SEEKABLE_TO_START} or {@link #REASON_START_EXCEEDS_END}.
*/ */
@Documented
@Retention(RetentionPolicy.SOURCE) @Retention(RetentionPolicy.SOURCE)
@IntDef({REASON_INVALID_PERIOD_COUNT, REASON_NOT_SEEKABLE_TO_START, REASON_START_EXCEEDS_END}) @IntDef({REASON_INVALID_PERIOD_COUNT, REASON_NOT_SEEKABLE_TO_START, REASON_START_EXCEEDS_END})
public @interface Reason {} public @interface Reason {}
...@@ -346,7 +348,7 @@ public final class ClippingMediaSource extends CompositeMediaSource<Void> { ...@@ -346,7 +348,7 @@ public final class ClippingMediaSource extends CompositeMediaSource<Void> {
if (timeline.getPeriodCount() != 1) { if (timeline.getPeriodCount() != 1) {
throw new IllegalClippingException(IllegalClippingException.REASON_INVALID_PERIOD_COUNT); throw new IllegalClippingException(IllegalClippingException.REASON_INVALID_PERIOD_COUNT);
} }
Window window = timeline.getWindow(0, new Window(), false); Window window = timeline.getWindow(0, new Window());
startUs = Math.max(0, startUs); startUs = Math.max(0, startUs);
long resolvedEndUs = endUs == C.TIME_END_OF_SOURCE ? window.durationUs : Math.max(0, endUs); long resolvedEndUs = endUs == C.TIME_END_OF_SOURCE ? window.durationUs : Math.max(0, endUs);
if (window.durationUs != C.TIME_UNSET) { if (window.durationUs != C.TIME_UNSET) {
......
library/core/src/main/java/com/google/android/exoplayer2/source/ConcatenatingMediaSource.java
...@@ -18,6 +18,7 @@ package com.google.android.exoplayer2.source; ...@@ -18,6 +18,7 @@ package com.google.android.exoplayer2.source;
import android.os.Handler; import android.os.Handler;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
import android.support.annotation.Nullable; import android.support.annotation.Nullable;
import android.util.Pair;
import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.ExoPlaybackException; import com.google.android.exoplayer2.ExoPlaybackException;
import com.google.android.exoplayer2.ExoPlayer; import com.google.android.exoplayer2.ExoPlayer;
...@@ -65,6 +66,7 @@ public class ConcatenatingMediaSource extends CompositeMediaSource<MediaSourceHo ...@@ -65,6 +66,7 @@ public class ConcatenatingMediaSource extends CompositeMediaSource<MediaSourceHo
private final boolean isAtomic; private final boolean isAtomic;
private final boolean useLazyPreparation; private final boolean useLazyPreparation;
private final Timeline.Window window; private final Timeline.Window window;
private final Timeline.Period period;
private @Nullable ExoPlayer player; private @Nullable ExoPlayer player;
private @Nullable Handler playerApplicationHandler; private @Nullable Handler playerApplicationHandler;
...@@ -131,6 +133,7 @@ public class ConcatenatingMediaSource extends CompositeMediaSource<MediaSourceHo ...@@ -131,6 +133,7 @@ public class ConcatenatingMediaSource extends CompositeMediaSource<MediaSourceHo
this.isAtomic = isAtomic; this.isAtomic = isAtomic;
this.useLazyPreparation = useLazyPreparation; this.useLazyPreparation = useLazyPreparation;
window = new Timeline.Window(); window = new Timeline.Window();
period = new Timeline.Period();
addMediaSources(Arrays.asList(mediaSources)); addMediaSources(Arrays.asList(mediaSources));
} }
...@@ -499,9 +502,7 @@ public class ConcatenatingMediaSource extends CompositeMediaSource<MediaSourceHo ...@@ -499,9 +502,7 @@ public class ConcatenatingMediaSource extends CompositeMediaSource<MediaSourceHo
Assertions.checkNotNull(mediaSourceByMediaPeriod.remove(mediaPeriod)); Assertions.checkNotNull(mediaSourceByMediaPeriod.remove(mediaPeriod));
((DeferredMediaPeriod) mediaPeriod).releasePeriod(); ((DeferredMediaPeriod) mediaPeriod).releasePeriod();
holder.activeMediaPeriods.remove(mediaPeriod); holder.activeMediaPeriods.remove(mediaPeriod);
if (holder.activeMediaPeriods.isEmpty() && holder.isRemoved) { maybeReleaseChildSource(holder);
releaseChildSource(holder);
}
} }
@Override @Override
...@@ -684,21 +685,53 @@ public class ConcatenatingMediaSource extends CompositeMediaSource<MediaSourceHo ...@@ -684,21 +685,53 @@ public class ConcatenatingMediaSource extends CompositeMediaSource<MediaSourceHo
windowOffsetUpdate, windowOffsetUpdate,
periodOffsetUpdate); periodOffsetUpdate);
} }
mediaSourceHolder.timeline = deferredTimeline.cloneWithNewTimeline(timeline); if (mediaSourceHolder.isPrepared) {
if (!mediaSourceHolder.isPrepared && !timeline.isEmpty()) { mediaSourceHolder.timeline = deferredTimeline.cloneWithUpdatedTimeline(timeline);
timeline.getWindow(/* windowIndex= */ 0, window); } else if (timeline.isEmpty()) {
long defaultPeriodPositionUs = mediaSourceHolder.timeline =
window.getPositionInFirstPeriodUs() + window.getDefaultPositionUs(); DeferredTimeline.createWithRealTimeline(timeline, DeferredTimeline.DUMMY_ID);
for (int i = 0; i < mediaSourceHolder.activeMediaPeriods.size(); i++) { } else {
DeferredMediaPeriod deferredMediaPeriod = mediaSourceHolder.activeMediaPeriods.get(i); // We should have at most one deferred media period for the DummyTimeline because the duration
deferredMediaPeriod.setDefaultPreparePositionUs(defaultPeriodPositionUs); // is unset and we don't load beyond periods with unset duration. We need to figure out how to
// handle the prepare positions of multiple deferred media periods, should that ever change.
Assertions.checkState(mediaSourceHolder.activeMediaPeriods.size() <= 1);
DeferredMediaPeriod deferredMediaPeriod =
mediaSourceHolder.activeMediaPeriods.isEmpty()
? null
: mediaSourceHolder.activeMediaPeriods.get(0);
// Determine first period and the start position.
// This will be:
// 1. The default window start position if no deferred period has been created yet.
// 2. The non-zero prepare position of the deferred period under the assumption that this is
// a non-zero initial seek position in the window.
// 3. The default window start position if the deferred period has a prepare position of zero
// under the assumption that the prepare position of zero was used because it's the
// default position of the DummyTimeline window. Note that this will override an
// intentional seek to zero for a window with a non-zero default position. This is
// unlikely to be a problem as a non-zero default position usually only occurs for live
// playbacks and seeking to zero in a live window would cause BehindLiveWindowExceptions
// anyway.
long windowStartPositionUs = window.getDefaultPositionUs();
if (deferredMediaPeriod != null) {
long periodPreparePositionUs = deferredMediaPeriod.getPreparePositionUs();
if (periodPreparePositionUs != 0) {
windowStartPositionUs = periodPreparePositionUs;
}
}
Pair<Object, Long> periodPosition =
timeline.getPeriodPosition(window, period, /* windowIndex= */ 0, windowStartPositionUs);
Object periodUid = periodPosition.first;
long periodPositionUs = periodPosition.second;
mediaSourceHolder.timeline = DeferredTimeline.createWithRealTimeline(timeline, periodUid);
if (deferredMediaPeriod != null) {
deferredMediaPeriod.overridePreparePositionUs(periodPositionUs);
MediaPeriodId idInSource = MediaPeriodId idInSource =
deferredMediaPeriod.id.copyWithPeriodUid( deferredMediaPeriod.id.copyWithPeriodUid(
getChildPeriodUid(mediaSourceHolder, deferredMediaPeriod.id.periodUid)); getChildPeriodUid(mediaSourceHolder, deferredMediaPeriod.id.periodUid));
deferredMediaPeriod.createPeriod(idInSource); deferredMediaPeriod.createPeriod(idInSource);
} }
mediaSourceHolder.isPrepared = true;
} }
mediaSourceHolder.isPrepared = true;
scheduleListenerNotification(/* actionOnCompletion= */ null); scheduleListenerNotification(/* actionOnCompletion= */ null);
} }
...@@ -712,9 +745,7 @@ public class ConcatenatingMediaSource extends CompositeMediaSource<MediaSourceHo ...@@ -712,9 +745,7 @@ public class ConcatenatingMediaSource extends CompositeMediaSource<MediaSourceHo
-oldTimeline.getWindowCount(), -oldTimeline.getWindowCount(),
-oldTimeline.getPeriodCount()); -oldTimeline.getPeriodCount());
holder.isRemoved = true; holder.isRemoved = true;
if (holder.activeMediaPeriods.isEmpty()) { maybeReleaseChildSource(holder);
releaseChildSource(holder);
}
} }
private void moveMediaSourceInternal(int currentIndex, int newIndex) { private void moveMediaSourceInternal(int currentIndex, int newIndex) {
...@@ -743,6 +774,16 @@ public class ConcatenatingMediaSource extends CompositeMediaSource<MediaSourceHo ...@@ -743,6 +774,16 @@ public class ConcatenatingMediaSource extends CompositeMediaSource<MediaSourceHo
} }
} }
private void maybeReleaseChildSource(MediaSourceHolder mediaSourceHolder) {
// Release if the source has been removed from the playlist, but only if it has been previously
// prepared and only if we are not waiting for an existing media period to be released.
if (mediaSourceHolder.isRemoved
&& mediaSourceHolder.hasStartedPreparing
&& mediaSourceHolder.activeMediaPeriods.isEmpty()) {
releaseChildSource(mediaSourceHolder);
}
}
/** Return uid of media source holder from period uid of concatenated source. */ /** Return uid of media source holder from period uid of concatenated source. */
private static Object getMediaSourceHolderUid(Object periodUid) { private static Object getMediaSourceHolderUid(Object periodUid) {
return ConcatenatedTimeline.getChildTimelineUidFromConcatenatedUid(periodUid); return ConcatenatedTimeline.getChildTimelineUidFromConcatenatedUid(periodUid);
...@@ -897,18 +938,32 @@ public class ConcatenatingMediaSource extends CompositeMediaSource<MediaSourceHo ...@@ -897,18 +938,32 @@ public class ConcatenatingMediaSource extends CompositeMediaSource<MediaSourceHo
} }
/** /**
* Timeline used as placeholder for an unprepared media source. After preparation, a copy of the * Timeline used as placeholder for an unprepared media source. After preparation, a
* DeferredTimeline is used to keep the originally assigned first period ID. * DeferredTimeline is used to keep the originally assigned dummy period ID.
*/ */
private static final class DeferredTimeline extends ForwardingTimeline { private static final class DeferredTimeline extends ForwardingTimeline {
private static final Object DUMMY_ID = new Object(); private static final Object DUMMY_ID = new Object();
private static final DummyTimeline dummyTimeline = new DummyTimeline(); private static final DummyTimeline DUMMY_TIMELINE = new DummyTimeline();
private final Object replacedId; private final Object replacedId;
/**
* Returns an instance with a real timeline, replacing the provided period ID with the already
* assigned dummy period ID.
*
* @param timeline The real timeline.
* @param firstPeriodUid The period UID in the timeline which will be replaced by the already
* assigned dummy period UID.
*/
public static DeferredTimeline createWithRealTimeline(
Timeline timeline, Object firstPeriodUid) {
return new DeferredTimeline(timeline, firstPeriodUid);
}
/** Creates deferred timeline exposing a {@link DummyTimeline}. */
public DeferredTimeline() { public DeferredTimeline() {
this(dummyTimeline, DUMMY_ID); this(DUMMY_TIMELINE, DUMMY_ID);
} }
private DeferredTimeline(Timeline timeline, Object replacedId) { private DeferredTimeline(Timeline timeline, Object replacedId) {
...@@ -916,14 +971,16 @@ public class ConcatenatingMediaSource extends CompositeMediaSource<MediaSourceHo ...@@ -916,14 +971,16 @@ public class ConcatenatingMediaSource extends CompositeMediaSource<MediaSourceHo
this.replacedId = replacedId; this.replacedId = replacedId;
} }
public DeferredTimeline cloneWithNewTimeline(Timeline timeline) { /**
return new DeferredTimeline( * Returns a copy with an updated timeline. This keeps the existing period replacement.
timeline, *
replacedId == DUMMY_ID && timeline.getPeriodCount() > 0 * @param timeline The new timeline.
? timeline.getUidOfPeriod(0) */
: replacedId); public DeferredTimeline cloneWithUpdatedTimeline(Timeline timeline) {
return new DeferredTimeline(timeline, replacedId);
} }
/** Returns wrapped timeline. */
public Timeline getTimeline() { public Timeline getTimeline() {
return timeline; return timeline;
} }
......
library/core/src/main/java/com/google/android/exoplayer2/source/DeferredMediaPeriod.java
...@@ -79,23 +79,19 @@ public final class DeferredMediaPeriod implements MediaPeriod, MediaPeriod.Callb ...@@ -79,23 +79,19 @@ public final class DeferredMediaPeriod implements MediaPeriod, MediaPeriod.Callb
this.listener = listener; this.listener = listener;
} }
/** Returns the position at which the deferred media period was prepared, in microseconds. */
public long getPreparePositionUs() {
return preparePositionUs;
}
/** /**
* Sets the default prepare position at which to prepare the media period. This value is only used * Overrides the default prepare position at which to prepare the media period. This value is only
* if the call to {@link MediaPeriod#prepare(Callback, long)} is being deferred and the call was * used if the call to {@link MediaPeriod#prepare(Callback, long)} is being deferred.
* made with a (presumably default) prepare position of 0.
* *
* <p>Note that this will override an intentional seek to zero in the corresponding non-seekable * @param defaultPreparePositionUs The default prepare position to use, in microseconds.
* timeline window. This is unlikely to be a problem as a non-zero default position usually only
* occurs for live playbacks and seeking to zero in a live window would cause
* BehindLiveWindowExceptions anyway.
*
* @param defaultPreparePositionUs The actual default prepare position, in microseconds.
*/ */
public void setDefaultPreparePositionUs(long defaultPreparePositionUs) { public void overridePreparePositionUs(long defaultPreparePositionUs) {
if (preparePositionUs == 0 && defaultPreparePositionUs != 0) {
preparePositionOverrideUs = defaultPreparePositionUs; preparePositionOverrideUs = defaultPreparePositionUs;
preparePositionUs = defaultPreparePositionUs;
}
} }
/** /**
...@@ -108,6 +104,10 @@ public final class DeferredMediaPeriod implements MediaPeriod, MediaPeriod.Callb ...@@ -108,6 +104,10 @@ public final class DeferredMediaPeriod implements MediaPeriod, MediaPeriod.Callb
public void createPeriod(MediaPeriodId id) { public void createPeriod(MediaPeriodId id) {
mediaPeriod = mediaSource.createPeriod(id, allocator); mediaPeriod = mediaSource.createPeriod(id, allocator);
if (callback != null) { if (callback != null) {
long preparePositionUs =
preparePositionOverrideUs != C.TIME_UNSET
? preparePositionOverrideUs
: this.preparePositionUs;
mediaPeriod.prepare(this, preparePositionUs); mediaPeriod.prepare(this, preparePositionUs);
} }
} }
...@@ -157,7 +157,7 @@ public final class DeferredMediaPeriod implements MediaPeriod, MediaPeriod.Callb ...@@ -157,7 +157,7 @@ public final class DeferredMediaPeriod implements MediaPeriod, MediaPeriod.Callb
@Override @Override
public long selectTracks(TrackSelection[] selections, boolean[] mayRetainStreamFlags, public long selectTracks(TrackSelection[] selections, boolean[] mayRetainStreamFlags,
SampleStream[] streams, boolean[] streamResetFlags, long positionUs) { SampleStream[] streams, boolean[] streamResetFlags, long positionUs) {
if (preparePositionOverrideUs != C.TIME_UNSET && positionUs == 0) { if (preparePositionOverrideUs != C.TIME_UNSET && positionUs == preparePositionUs) {
positionUs = preparePositionOverrideUs; positionUs = preparePositionOverrideUs;
preparePositionOverrideUs = C.TIME_UNSET; preparePositionOverrideUs = C.TIME_UNSET;
} }
......
library/core/src/main/java/com/google/android/exoplayer2/source/MergingMediaSource.java
...@@ -22,6 +22,7 @@ import com.google.android.exoplayer2.Timeline; ...@@ -22,6 +22,7 @@ import com.google.android.exoplayer2.Timeline;
import com.google.android.exoplayer2.upstream.Allocator; import com.google.android.exoplayer2.upstream.Allocator;
import com.google.android.exoplayer2.upstream.TransferListener; import com.google.android.exoplayer2.upstream.TransferListener;
import java.io.IOException; import java.io.IOException;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
import java.util.ArrayList; import java.util.ArrayList;
...@@ -41,6 +42,7 @@ public final class MergingMediaSource extends CompositeMediaSource<Integer> { ...@@ -41,6 +42,7 @@ public final class MergingMediaSource extends CompositeMediaSource<Integer> {
public static final class IllegalMergeException extends IOException { public static final class IllegalMergeException extends IOException {
/** The reason the merge failed. One of {@link #REASON_PERIOD_COUNT_MISMATCH}. */ /** The reason the merge failed. One of {@link #REASON_PERIOD_COUNT_MISMATCH}. */
@Documented
@Retention(RetentionPolicy.SOURCE) @Retention(RetentionPolicy.SOURCE)
@IntDef({REASON_PERIOD_COUNT_MISMATCH}) @IntDef({REASON_PERIOD_COUNT_MISMATCH})
public @interface Reason {} public @interface Reason {}
......
library/core/src/main/java/com/google/android/exoplayer2/source/ads/AdPlaybackState.java
...@@ -20,6 +20,7 @@ import android.support.annotation.CheckResult; ...@@ -20,6 +20,7 @@ import android.support.annotation.CheckResult;
import android.support.annotation.IntDef; import android.support.annotation.IntDef;
import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.util.Assertions; import com.google.android.exoplayer2.util.Assertions;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
import java.util.Arrays; import java.util.Arrays;
...@@ -239,6 +240,7 @@ public final class AdPlaybackState { ...@@ -239,6 +240,7 @@ public final class AdPlaybackState {
* #AD_STATE_AVAILABLE}, {@link #AD_STATE_SKIPPED}, {@link #AD_STATE_PLAYED} or {@link * #AD_STATE_AVAILABLE}, {@link #AD_STATE_SKIPPED}, {@link #AD_STATE_PLAYED} or {@link
* #AD_STATE_ERROR}. * #AD_STATE_ERROR}.
*/ */
@Documented
@Retention(RetentionPolicy.SOURCE) @Retention(RetentionPolicy.SOURCE)
@IntDef({ @IntDef({
AD_STATE_UNAVAILABLE, AD_STATE_UNAVAILABLE,
......
library/core/src/main/java/com/google/android/exoplayer2/source/ads/AdsMediaSource.java
...@@ -39,6 +39,7 @@ import com.google.android.exoplayer2.upstream.DataSpec; ...@@ -39,6 +39,7 @@ import com.google.android.exoplayer2.upstream.DataSpec;
import com.google.android.exoplayer2.upstream.TransferListener; import com.google.android.exoplayer2.upstream.TransferListener;
import com.google.android.exoplayer2.util.Assertions; import com.google.android.exoplayer2.util.Assertions;
import java.io.IOException; import java.io.IOException;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
import java.util.ArrayList; import java.util.ArrayList;
...@@ -87,6 +88,7 @@ public final class AdsMediaSource extends CompositeMediaSource<MediaPeriodId> { ...@@ -87,6 +88,7 @@ public final class AdsMediaSource extends CompositeMediaSource<MediaPeriodId> {
* Types of ad load exceptions. One of {@link #TYPE_AD}, {@link #TYPE_AD_GROUP}, {@link * Types of ad load exceptions. One of {@link #TYPE_AD}, {@link #TYPE_AD_GROUP}, {@link
* #TYPE_ALL_ADS} or {@link #TYPE_UNEXPECTED}. * #TYPE_ALL_ADS} or {@link #TYPE_UNEXPECTED}.
*/ */
@Documented
@Retention(RetentionPolicy.SOURCE) @Retention(RetentionPolicy.SOURCE)
@IntDef({TYPE_AD, TYPE_AD_GROUP, TYPE_ALL_ADS, TYPE_UNEXPECTED}) @IntDef({TYPE_AD, TYPE_AD_GROUP, TYPE_ALL_ADS, TYPE_UNEXPECTED})
public @interface Type {} public @interface Type {}
......
library/core/src/main/java/com/google/android/exoplayer2/source/chunk/ChunkSampleStream.java
...@@ -308,7 +308,7 @@ public class ChunkSampleStream<T extends ChunkSource> implements SampleStream, S ...@@ -308,7 +308,7 @@ public class ChunkSampleStream<T extends ChunkSource> implements SampleStream, S
// chunk even if the sample timestamps are slightly offset from the chunk start times. // chunk even if the sample timestamps are slightly offset from the chunk start times.
seekInsideBuffer = seekInsideBuffer =
primarySampleQueue.setReadPosition(seekToMediaChunk.getFirstSampleIndex(0)); primarySampleQueue.setReadPosition(seekToMediaChunk.getFirstSampleIndex(0));
decodeOnlyUntilPositionUs = Long.MIN_VALUE; decodeOnlyUntilPositionUs = 0;
} else { } else {
seekInsideBuffer = seekInsideBuffer =
primarySampleQueue.advanceTo( primarySampleQueue.advanceTo(
...@@ -583,7 +583,7 @@ public class ChunkSampleStream<T extends ChunkSource> implements SampleStream, S ...@@ -583,7 +583,7 @@ public class ChunkSampleStream<T extends ChunkSource> implements SampleStream, S
if (pendingReset) { if (pendingReset) {
boolean resetToMediaChunk = mediaChunk.startTimeUs == pendingResetPositionUs; boolean resetToMediaChunk = mediaChunk.startTimeUs == pendingResetPositionUs;
// Only enable setting of the decode only flag if we're not resetting to a chunk boundary. // Only enable setting of the decode only flag if we're not resetting to a chunk boundary.
decodeOnlyUntilPositionUs = resetToMediaChunk ? Long.MIN_VALUE : pendingResetPositionUs; decodeOnlyUntilPositionUs = resetToMediaChunk ? 0 : pendingResetPositionUs;
pendingResetPositionUs = C.TIME_UNSET; pendingResetPositionUs = C.TIME_UNSET;
} }
mediaChunk.init(mediaChunkOutput); mediaChunk.init(mediaChunkOutput);
......
library/core/src/main/java/com/google/android/exoplayer2/text/CaptionStyleCompat.java
...@@ -22,6 +22,7 @@ import android.support.annotation.IntDef; ...@@ -22,6 +22,7 @@ import android.support.annotation.IntDef;
import android.view.accessibility.CaptioningManager; import android.view.accessibility.CaptioningManager;
import android.view.accessibility.CaptioningManager.CaptionStyle; import android.view.accessibility.CaptioningManager.CaptionStyle;
import com.google.android.exoplayer2.util.Util; import com.google.android.exoplayer2.util.Util;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
...@@ -35,6 +36,7 @@ public final class CaptionStyleCompat { ...@@ -35,6 +36,7 @@ public final class CaptionStyleCompat {
* #EDGE_TYPE_OUTLINE}, {@link #EDGE_TYPE_DROP_SHADOW}, {@link #EDGE_TYPE_RAISED} or {@link * #EDGE_TYPE_OUTLINE}, {@link #EDGE_TYPE_DROP_SHADOW}, {@link #EDGE_TYPE_RAISED} or {@link
* #EDGE_TYPE_DEPRESSED}. * #EDGE_TYPE_DEPRESSED}.
*/ */
@Documented
@Retention(RetentionPolicy.SOURCE) @Retention(RetentionPolicy.SOURCE)
@IntDef({ @IntDef({
EDGE_TYPE_NONE, EDGE_TYPE_NONE,
......
library/core/src/main/java/com/google/android/exoplayer2/text/Cue.java
...@@ -19,6 +19,7 @@ import android.graphics.Bitmap; ...@@ -19,6 +19,7 @@ import android.graphics.Bitmap;
import android.graphics.Color; import android.graphics.Color;
import android.support.annotation.IntDef; import android.support.annotation.IntDef;
import android.text.Layout.Alignment; import android.text.Layout.Alignment;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
...@@ -36,6 +37,7 @@ public class Cue { ...@@ -36,6 +37,7 @@ public class Cue {
* The type of anchor, which may be unset. One of {@link #TYPE_UNSET}, {@link #ANCHOR_TYPE_START}, * The type of anchor, which may be unset. One of {@link #TYPE_UNSET}, {@link #ANCHOR_TYPE_START},
* {@link #ANCHOR_TYPE_MIDDLE} or {@link #ANCHOR_TYPE_END}. * {@link #ANCHOR_TYPE_MIDDLE} or {@link #ANCHOR_TYPE_END}.
*/ */
@Documented
@Retention(RetentionPolicy.SOURCE) @Retention(RetentionPolicy.SOURCE)
@IntDef({TYPE_UNSET, ANCHOR_TYPE_START, ANCHOR_TYPE_MIDDLE, ANCHOR_TYPE_END}) @IntDef({TYPE_UNSET, ANCHOR_TYPE_START, ANCHOR_TYPE_MIDDLE, ANCHOR_TYPE_END})
public @interface AnchorType {} public @interface AnchorType {}
...@@ -66,6 +68,7 @@ public class Cue { ...@@ -66,6 +68,7 @@ public class Cue {
* The type of line, which may be unset. One of {@link #TYPE_UNSET}, {@link #LINE_TYPE_FRACTION} * The type of line, which may be unset. One of {@link #TYPE_UNSET}, {@link #LINE_TYPE_FRACTION}
* or {@link #LINE_TYPE_NUMBER}. * or {@link #LINE_TYPE_NUMBER}.
*/ */
@Documented
@Retention(RetentionPolicy.SOURCE) @Retention(RetentionPolicy.SOURCE)
@IntDef({TYPE_UNSET, LINE_TYPE_FRACTION, LINE_TYPE_NUMBER}) @IntDef({TYPE_UNSET, LINE_TYPE_FRACTION, LINE_TYPE_NUMBER})
public @interface LineType {} public @interface LineType {}
...@@ -85,6 +88,7 @@ public class Cue { ...@@ -85,6 +88,7 @@ public class Cue {
* {@link #TEXT_SIZE_TYPE_FRACTIONAL}, {@link #TEXT_SIZE_TYPE_FRACTIONAL_IGNORE_PADDING} or {@link * {@link #TEXT_SIZE_TYPE_FRACTIONAL}, {@link #TEXT_SIZE_TYPE_FRACTIONAL_IGNORE_PADDING} or {@link
* #TEXT_SIZE_TYPE_ABSOLUTE}. * #TEXT_SIZE_TYPE_ABSOLUTE}.
*/ */
@Documented
@Retention(RetentionPolicy.SOURCE) @Retention(RetentionPolicy.SOURCE)
@IntDef({ @IntDef({
TYPE_UNSET, TYPE_UNSET,
......
library/core/src/main/java/com/google/android/exoplayer2/text/TextRenderer.java
...@@ -29,6 +29,7 @@ import com.google.android.exoplayer2.FormatHolder; ...@@ -29,6 +29,7 @@ import com.google.android.exoplayer2.FormatHolder;
import com.google.android.exoplayer2.util.Assertions; import com.google.android.exoplayer2.util.Assertions;
import com.google.android.exoplayer2.util.MimeTypes; import com.google.android.exoplayer2.util.MimeTypes;
import com.google.android.exoplayer2.util.Util; import com.google.android.exoplayer2.util.Util;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
import java.util.Collections; import java.util.Collections;
...@@ -49,9 +50,13 @@ public final class TextRenderer extends BaseRenderer implements Callback { ...@@ -49,9 +50,13 @@ public final class TextRenderer extends BaseRenderer implements Callback {
@Deprecated @Deprecated
public interface Output extends TextOutput {} public interface Output extends TextOutput {}
@Documented
@Retention(RetentionPolicy.SOURCE) @Retention(RetentionPolicy.SOURCE)
@IntDef({REPLACEMENT_STATE_NONE, REPLACEMENT_STATE_SIGNAL_END_OF_STREAM, @IntDef({
REPLACEMENT_STATE_WAIT_END_OF_STREAM}) REPLACEMENT_STATE_NONE,
REPLACEMENT_STATE_SIGNAL_END_OF_STREAM,
REPLACEMENT_STATE_WAIT_END_OF_STREAM
})
private @interface ReplacementState {} private @interface ReplacementState {}
/** /**
* The decoder does not need to be replaced. * The decoder does not need to be replaced.
......
library/core/src/main/java/com/google/android/exoplayer2/text/cea/Cea708Decoder.java
...@@ -272,7 +272,10 @@ public final class Cea708Decoder extends CeaDecoder { ...@@ -272,7 +272,10 @@ public final class Cea708Decoder extends CeaDecoder {
if (serviceNumber == 7) { if (serviceNumber == 7) {
// extended service numbers // extended service numbers
serviceBlockPacket.skipBits(2); serviceBlockPacket.skipBits(2);
serviceNumber += serviceBlockPacket.readBits(6); serviceNumber = serviceBlockPacket.readBits(6);
if (serviceNumber < 7) {
Log.w(TAG, "Invalid extended service number: " + serviceNumber);
}
} }
// Ignore packets in which blockSize is 0 // Ignore packets in which blockSize is 0
......
library/core/src/main/java/com/google/android/exoplayer2/text/subrip/SubripDecoder.java
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
*/ */
package com.google.android.exoplayer2.text.subrip; package com.google.android.exoplayer2.text.subrip;
import android.support.annotation.Nullable;
import android.text.Html; import android.text.Html;
import android.text.Spanned; import android.text.Spanned;
import android.text.TextUtils; import android.text.TextUtils;
...@@ -32,17 +33,38 @@ import java.util.regex.Pattern; ...@@ -32,17 +33,38 @@ import java.util.regex.Pattern;
*/ */
public final class SubripDecoder extends SimpleSubtitleDecoder { public final class SubripDecoder extends SimpleSubtitleDecoder {
// Fractional positions for use when alignment tags are present.
/* package */ static final float START_FRACTION = 0.08f;
/* package */ static final float END_FRACTION = 1 - START_FRACTION;
/* package */ static final float MID_FRACTION = 0.5f;
private static final String TAG = "SubripDecoder"; private static final String TAG = "SubripDecoder";
private static final String SUBRIP_TIMECODE = "(?:(\\d+):)?(\\d+):(\\d+),(\\d+)"; private static final String SUBRIP_TIMECODE = "(?:(\\d+):)?(\\d+):(\\d+),(\\d+)";
private static final Pattern SUBRIP_TIMING_LINE = private static final Pattern SUBRIP_TIMING_LINE =
Pattern.compile("\\s*(" + SUBRIP_TIMECODE + ")\\s*-->\\s*(" + SUBRIP_TIMECODE + ")?\\s*"); Pattern.compile("\\s*(" + SUBRIP_TIMECODE + ")\\s*-->\\s*(" + SUBRIP_TIMECODE + ")?\\s*");
private static final Pattern SUBRIP_TAG_PATTERN = Pattern.compile("\\{\\\\.*?\\}");
private static final String SUBRIP_ALIGNMENT_TAG = "\\{\\\\an[1-9]\\}";
// Alignment tags for SSA V4+.
private static final String ALIGN_BOTTOM_LEFT = "{\\an1}";
private static final String ALIGN_BOTTOM_MID = "{\\an2}";
private static final String ALIGN_BOTTOM_RIGHT = "{\\an3}";
private static final String ALIGN_MID_LEFT = "{\\an4}";
private static final String ALIGN_MID_MID = "{\\an5}";
private static final String ALIGN_MID_RIGHT = "{\\an6}";
private static final String ALIGN_TOP_LEFT = "{\\an7}";
private static final String ALIGN_TOP_MID = "{\\an8}";
private static final String ALIGN_TOP_RIGHT = "{\\an9}";
private final StringBuilder textBuilder; private final StringBuilder textBuilder;
private final ArrayList<String> tags;
public SubripDecoder() { public SubripDecoder() {
super("SubripDecoder"); super("SubripDecoder");
textBuilder = new StringBuilder(); textBuilder = new StringBuilder();
tags = new ArrayList<>();
} }
@Override @Override
...@@ -86,17 +108,29 @@ public final class SubripDecoder extends SimpleSubtitleDecoder { ...@@ -86,17 +108,29 @@ public final class SubripDecoder extends SimpleSubtitleDecoder {
continue; continue;
} }
// Read and parse the text. // Read and parse the text and tags.
textBuilder.setLength(0); textBuilder.setLength(0);
tags.clear();
while (!TextUtils.isEmpty(currentLine = subripData.readLine())) { while (!TextUtils.isEmpty(currentLine = subripData.readLine())) {
if (textBuilder.length() > 0) { if (textBuilder.length() > 0) {
textBuilder.append("<br>"); textBuilder.append("<br>");
} }
textBuilder.append(currentLine.trim()); textBuilder.append(processLine(currentLine, tags));
} }
Spanned text = Html.fromHtml(textBuilder.toString()); Spanned text = Html.fromHtml(textBuilder.toString());
cues.add(new Cue(text));
String alignmentTag = null;
for (int i = 0; i < tags.size(); i++) {
String tag = tags.get(i);
if (tag.matches(SUBRIP_ALIGNMENT_TAG)) {
alignmentTag = tag;
// Subsequent alignment tags should be ignored.
break;
}
}
cues.add(buildCue(text, alignmentTag));
if (haveEndTimecode) { if (haveEndTimecode) {
cues.add(null); cues.add(null);
} }
...@@ -108,6 +142,96 @@ public final class SubripDecoder extends SimpleSubtitleDecoder { ...@@ -108,6 +142,96 @@ public final class SubripDecoder extends SimpleSubtitleDecoder {
return new SubripSubtitle(cuesArray, cueTimesUsArray); return new SubripSubtitle(cuesArray, cueTimesUsArray);
} }
/**
* Trims and removes tags from the given line. The removed tags are added to {@code tags}.
*
* @param line The line to process.
* @param tags A list to which removed tags will be added.
* @return The processed line.
*/
private String processLine(String line, ArrayList<String> tags) {
line = line.trim();
int removedCharacterCount = 0;
StringBuilder processedLine = new StringBuilder(line);
Matcher matcher = SUBRIP_TAG_PATTERN.matcher(line);
while (matcher.find()) {
String tag = matcher.group();
tags.add(tag);
int start = matcher.start() - removedCharacterCount;
int tagLength = tag.length();
processedLine.replace(start, /* end= */ start + tagLength, /* str= */ "");
removedCharacterCount += tagLength;
}
return processedLine.toString();
}
/**
* Build a {@link Cue} based on the given text and alignment tag.
*
* @param text The text.
* @param alignmentTag The alignment tag, or {@code null} if no alignment tag is available.
* @return Built cue
*/
private Cue buildCue(Spanned text, @Nullable String alignmentTag) {
if (alignmentTag == null) {
return new Cue(text);
}
// Horizontal alignment.
@Cue.AnchorType int positionAnchor;
switch (alignmentTag) {
case ALIGN_BOTTOM_LEFT:
case ALIGN_MID_LEFT:
case ALIGN_TOP_LEFT:
positionAnchor = Cue.ANCHOR_TYPE_START;
break;
case ALIGN_BOTTOM_RIGHT:
case ALIGN_MID_RIGHT:
case ALIGN_TOP_RIGHT:
positionAnchor = Cue.ANCHOR_TYPE_END;
break;
case ALIGN_BOTTOM_MID:
case ALIGN_MID_MID:
case ALIGN_TOP_MID:
default:
positionAnchor = Cue.ANCHOR_TYPE_MIDDLE;
break;
}
// Vertical alignment.
@Cue.AnchorType int lineAnchor;
switch (alignmentTag) {
case ALIGN_BOTTOM_LEFT:
case ALIGN_BOTTOM_MID:
case ALIGN_BOTTOM_RIGHT:
lineAnchor = Cue.ANCHOR_TYPE_END;
break;
case ALIGN_TOP_LEFT:
case ALIGN_TOP_MID:
case ALIGN_TOP_RIGHT:
lineAnchor = Cue.ANCHOR_TYPE_START;
break;
case ALIGN_MID_LEFT:
case ALIGN_MID_MID:
case ALIGN_MID_RIGHT:
default:
lineAnchor = Cue.ANCHOR_TYPE_MIDDLE;
break;
}
return new Cue(
text,
/* textAlignment= */ null,
getFractionalPositionForAnchorType(lineAnchor),
Cue.LINE_TYPE_FRACTION,
lineAnchor,
getFractionalPositionForAnchorType(positionAnchor),
positionAnchor,
Cue.DIMEN_UNSET);
}
private static long parseTimecode(Matcher matcher, int groupOffset) { private static long parseTimecode(Matcher matcher, int groupOffset) {
long timestampMs = Long.parseLong(matcher.group(groupOffset + 1)) * 60 * 60 * 1000; long timestampMs = Long.parseLong(matcher.group(groupOffset + 1)) * 60 * 60 * 1000;
timestampMs += Long.parseLong(matcher.group(groupOffset + 2)) * 60 * 1000; timestampMs += Long.parseLong(matcher.group(groupOffset + 2)) * 60 * 1000;
...@@ -116,4 +240,15 @@ public final class SubripDecoder extends SimpleSubtitleDecoder { ...@@ -116,4 +240,15 @@ public final class SubripDecoder extends SimpleSubtitleDecoder {
return timestampMs * 1000; return timestampMs * 1000;
} }
/* package */ static float getFractionalPositionForAnchorType(@Cue.AnchorType int anchorType) {
switch (anchorType) {
case Cue.ANCHOR_TYPE_START:
return SubripDecoder.START_FRACTION;
case Cue.ANCHOR_TYPE_MIDDLE:
return SubripDecoder.MID_FRACTION;
case Cue.ANCHOR_TYPE_END:
default:
return SubripDecoder.END_FRACTION;
}
}
} }
library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlStyle.java
...@@ -19,6 +19,7 @@ import android.graphics.Typeface; ...@@ -19,6 +19,7 @@ import android.graphics.Typeface;
import android.support.annotation.IntDef; import android.support.annotation.IntDef;
import android.text.Layout; import android.text.Layout;
import com.google.android.exoplayer2.util.Assertions; import com.google.android.exoplayer2.util.Assertions;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
...@@ -29,25 +30,32 @@ import java.lang.annotation.RetentionPolicy; ...@@ -29,25 +30,32 @@ import java.lang.annotation.RetentionPolicy;
public static final int UNSPECIFIED = -1; public static final int UNSPECIFIED = -1;
@Documented
@Retention(RetentionPolicy.SOURCE) @Retention(RetentionPolicy.SOURCE)
@IntDef(flag = true, value = {UNSPECIFIED, STYLE_NORMAL, STYLE_BOLD, STYLE_ITALIC, @IntDef(
STYLE_BOLD_ITALIC}) flag = true,
value = {UNSPECIFIED, STYLE_NORMAL, STYLE_BOLD, STYLE_ITALIC, STYLE_BOLD_ITALIC})
public @interface StyleFlags {} public @interface StyleFlags {}
public static final int STYLE_NORMAL = Typeface.NORMAL; public static final int STYLE_NORMAL = Typeface.NORMAL;
public static final int STYLE_BOLD = Typeface.BOLD; public static final int STYLE_BOLD = Typeface.BOLD;
public static final int STYLE_ITALIC = Typeface.ITALIC; public static final int STYLE_ITALIC = Typeface.ITALIC;
public static final int STYLE_BOLD_ITALIC = Typeface.BOLD_ITALIC; public static final int STYLE_BOLD_ITALIC = Typeface.BOLD_ITALIC;
@Documented
@Retention(RetentionPolicy.SOURCE) @Retention(RetentionPolicy.SOURCE)
@IntDef({UNSPECIFIED, FONT_SIZE_UNIT_PIXEL, FONT_SIZE_UNIT_EM, FONT_SIZE_UNIT_PERCENT}) @IntDef({UNSPECIFIED, FONT_SIZE_UNIT_PIXEL, FONT_SIZE_UNIT_EM, FONT_SIZE_UNIT_PERCENT})
public @interface FontSizeUnit {} public @interface FontSizeUnit {}
public static final int FONT_SIZE_UNIT_PIXEL = 1; public static final int FONT_SIZE_UNIT_PIXEL = 1;
public static final int FONT_SIZE_UNIT_EM = 2; public static final int FONT_SIZE_UNIT_EM = 2;
public static final int FONT_SIZE_UNIT_PERCENT = 3; public static final int FONT_SIZE_UNIT_PERCENT = 3;
@Documented
@Retention(RetentionPolicy.SOURCE) @Retention(RetentionPolicy.SOURCE)
@IntDef({UNSPECIFIED, OFF, ON}) @IntDef({UNSPECIFIED, OFF, ON})
private @interface OptionalBoolean {} private @interface OptionalBoolean {}
private static final int OFF = 0; private static final int OFF = 0;
private static final int ON = 1; private static final int ON = 1;
......
library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttCssStyle.java
...@@ -19,6 +19,7 @@ import android.graphics.Typeface; ...@@ -19,6 +19,7 @@ import android.graphics.Typeface;
import android.support.annotation.IntDef; import android.support.annotation.IntDef;
import android.text.Layout; import android.text.Layout;
import com.google.android.exoplayer2.util.Util; import com.google.android.exoplayer2.util.Util;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
import java.util.Arrays; import java.util.Arrays;
...@@ -39,6 +40,7 @@ public final class WebvttCssStyle { ...@@ -39,6 +40,7 @@ public final class WebvttCssStyle {
* Style flag enum. Possible flag values are {@link #UNSPECIFIED}, {@link #STYLE_NORMAL}, {@link * Style flag enum. Possible flag values are {@link #UNSPECIFIED}, {@link #STYLE_NORMAL}, {@link
* #STYLE_BOLD}, {@link #STYLE_ITALIC} and {@link #STYLE_BOLD_ITALIC}. * #STYLE_BOLD}, {@link #STYLE_ITALIC} and {@link #STYLE_BOLD_ITALIC}.
*/ */
@Documented
@Retention(RetentionPolicy.SOURCE) @Retention(RetentionPolicy.SOURCE)
@IntDef( @IntDef(
flag = true, flag = true,
...@@ -54,6 +56,7 @@ public final class WebvttCssStyle { ...@@ -54,6 +56,7 @@ public final class WebvttCssStyle {
* Font size unit enum. One of {@link #UNSPECIFIED}, {@link #FONT_SIZE_UNIT_PIXEL}, {@link * Font size unit enum. One of {@link #UNSPECIFIED}, {@link #FONT_SIZE_UNIT_PIXEL}, {@link
* #FONT_SIZE_UNIT_EM} or {@link #FONT_SIZE_UNIT_PERCENT}. * #FONT_SIZE_UNIT_EM} or {@link #FONT_SIZE_UNIT_PERCENT}.
*/ */
@Documented
@Retention(RetentionPolicy.SOURCE) @Retention(RetentionPolicy.SOURCE)
@IntDef({UNSPECIFIED, FONT_SIZE_UNIT_PIXEL, FONT_SIZE_UNIT_EM, FONT_SIZE_UNIT_PERCENT}) @IntDef({UNSPECIFIED, FONT_SIZE_UNIT_PIXEL, FONT_SIZE_UNIT_EM, FONT_SIZE_UNIT_PERCENT})
public @interface FontSizeUnit {} public @interface FontSizeUnit {}
...@@ -62,9 +65,11 @@ public final class WebvttCssStyle { ...@@ -62,9 +65,11 @@ public final class WebvttCssStyle {
public static final int FONT_SIZE_UNIT_EM = 2; public static final int FONT_SIZE_UNIT_EM = 2;
public static final int FONT_SIZE_UNIT_PERCENT = 3; public static final int FONT_SIZE_UNIT_PERCENT = 3;
@Documented
@Retention(RetentionPolicy.SOURCE) @Retention(RetentionPolicy.SOURCE)
@IntDef({UNSPECIFIED, OFF, ON}) @IntDef({UNSPECIFIED, OFF, ON})
private @interface OptionalBoolean {} private @interface OptionalBoolean {}
private static final int OFF = 0; private static final int OFF = 0;
private static final int ON = 1; private static final int ON = 1;
......
library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java
...@@ -2141,7 +2141,7 @@ public class DefaultTrackSelector extends MappingTrackSelector { ...@@ -2141,7 +2141,7 @@ public class DefaultTrackSelector extends MappingTrackSelector {
} }
/** Represents how well an audio track matches the selection {@link Parameters}. */ /** Represents how well an audio track matches the selection {@link Parameters}. */
private static final class AudioTrackScore implements Comparable<AudioTrackScore> { protected static final class AudioTrackScore implements Comparable<AudioTrackScore> {
private final Parameters parameters; private final Parameters parameters;
private final int withinRendererCapabilitiesScore; private final int withinRendererCapabilitiesScore;
......
library/core/src/main/java/com/google/android/exoplayer2/trackselection/MappingTrackSelector.java
...@@ -26,6 +26,7 @@ import com.google.android.exoplayer2.RendererConfiguration; ...@@ -26,6 +26,7 @@ import com.google.android.exoplayer2.RendererConfiguration;
import com.google.android.exoplayer2.source.TrackGroup; import com.google.android.exoplayer2.source.TrackGroup;
import com.google.android.exoplayer2.source.TrackGroupArray; import com.google.android.exoplayer2.source.TrackGroupArray;
import com.google.android.exoplayer2.util.Util; import com.google.android.exoplayer2.util.Util;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
import java.util.Arrays; import java.util.Arrays;
...@@ -48,6 +49,7 @@ public abstract class MappingTrackSelector extends TrackSelector { ...@@ -48,6 +49,7 @@ public abstract class MappingTrackSelector extends TrackSelector {
* {@link #RENDERER_SUPPORT_NO_TRACKS}, {@link #RENDERER_SUPPORT_UNSUPPORTED_TRACKS}, {@link * {@link #RENDERER_SUPPORT_NO_TRACKS}, {@link #RENDERER_SUPPORT_UNSUPPORTED_TRACKS}, {@link
* #RENDERER_SUPPORT_EXCEEDS_CAPABILITIES_TRACKS} or {@link #RENDERER_SUPPORT_PLAYABLE_TRACKS}. * #RENDERER_SUPPORT_EXCEEDS_CAPABILITIES_TRACKS} or {@link #RENDERER_SUPPORT_PLAYABLE_TRACKS}.
*/ */
@Documented
@Retention(RetentionPolicy.SOURCE) @Retention(RetentionPolicy.SOURCE)
@IntDef({ @IntDef({
RENDERER_SUPPORT_NO_TRACKS, RENDERER_SUPPORT_NO_TRACKS,
......
library/core/src/main/java/com/google/android/exoplayer2/upstream/DataSpec.java
...@@ -20,6 +20,7 @@ import android.support.annotation.IntDef; ...@@ -20,6 +20,7 @@ import android.support.annotation.IntDef;
import android.support.annotation.Nullable; import android.support.annotation.Nullable;
import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.util.Assertions; import com.google.android.exoplayer2.util.Assertions;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
import java.util.Arrays; import java.util.Arrays;
...@@ -33,6 +34,7 @@ public final class DataSpec { ...@@ -33,6 +34,7 @@ public final class DataSpec {
* The flags that apply to any request for data. Possible flag values are {@link #FLAG_ALLOW_GZIP} * The flags that apply to any request for data. Possible flag values are {@link #FLAG_ALLOW_GZIP}
* and {@link #FLAG_ALLOW_CACHING_UNKNOWN_LENGTH}. * and {@link #FLAG_ALLOW_CACHING_UNKNOWN_LENGTH}.
*/ */
@Documented
@Retention(RetentionPolicy.SOURCE) @Retention(RetentionPolicy.SOURCE)
@IntDef( @IntDef(
flag = true, flag = true,
...@@ -61,6 +63,7 @@ public final class DataSpec { ...@@ -61,6 +63,7 @@ public final class DataSpec {
* The set of HTTP methods that are supported by ExoPlayer {@link HttpDataSource}s. One of {@link * The set of HTTP methods that are supported by ExoPlayer {@link HttpDataSource}s. One of {@link
* #HTTP_METHOD_GET}, {@link #HTTP_METHOD_POST} or {@link #HTTP_METHOD_HEAD}. * #HTTP_METHOD_GET}, {@link #HTTP_METHOD_POST} or {@link #HTTP_METHOD_HEAD}.
*/ */
@Documented
@Retention(RetentionPolicy.SOURCE) @Retention(RetentionPolicy.SOURCE)
@IntDef({HTTP_METHOD_GET, HTTP_METHOD_POST, HTTP_METHOD_HEAD}) @IntDef({HTTP_METHOD_GET, HTTP_METHOD_POST, HTTP_METHOD_HEAD})
public @interface HttpMethod {} public @interface HttpMethod {}
......
library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultAllocator.java
...@@ -117,19 +117,6 @@ public final class DefaultAllocator implements Allocator { ...@@ -117,19 +117,6 @@ public final class DefaultAllocator implements Allocator {
Math.max(availableAllocations.length * 2, availableCount + allocations.length)); Math.max(availableAllocations.length * 2, availableCount + allocations.length));
} }
for (Allocation allocation : allocations) { for (Allocation allocation : allocations) {
// Weak sanity check that the allocation probably originated from this pool.
if (allocation.data != initialAllocationBlock
&& allocation.data.length != individualAllocationSize) {
throw new IllegalArgumentException(
"Unexpected allocation: "
+ System.identityHashCode(allocation.data)
+ ", "
+ System.identityHashCode(initialAllocationBlock)
+ ", "
+ allocation.data.length
+ ", "
+ individualAllocationSize);
}
availableAllocations[availableCount++] = allocation; availableAllocations[availableCount++] = allocation;
} }
allocatedCount -= allocations.length; allocatedCount -= allocations.length;
......
library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultDataSource.java
...@@ -23,6 +23,7 @@ import com.google.android.exoplayer2.util.Log; ...@@ -23,6 +23,7 @@ import com.google.android.exoplayer2.util.Log;
import com.google.android.exoplayer2.util.Util; import com.google.android.exoplayer2.util.Util;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
...@@ -261,9 +262,7 @@ public final class DefaultDataSource implements DataSource { ...@@ -261,9 +262,7 @@ public final class DefaultDataSource implements DataSource {
@Override @Override
public Map<String, List<String>> getResponseHeaders() { public Map<String, List<String>> getResponseHeaders() {
return dataSource == null return dataSource == null ? Collections.emptyMap() : dataSource.getResponseHeaders();
? DataSource.super.getResponseHeaders()
: dataSource.getResponseHeaders();
} }
@Override @Override
......
library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultHttpDataSource.java
...@@ -283,8 +283,10 @@ public class DefaultHttpDataSource extends BaseDataSource implements HttpDataSou ...@@ -283,8 +283,10 @@ public class DefaultHttpDataSource extends BaseDataSource implements HttpDataSou
} }
int responseCode; int responseCode;
String responseMessage;
try { try {
responseCode = connection.getResponseCode(); responseCode = connection.getResponseCode();
responseMessage = connection.getResponseMessage();
} catch (IOException e) { } catch (IOException e) {
closeConnectionQuietly(); closeConnectionQuietly();
throw new HttpDataSourceException("Unable to connect to " + dataSpec.uri.toString(), e, throw new HttpDataSourceException("Unable to connect to " + dataSpec.uri.toString(), e,
...@@ -296,7 +298,7 @@ public class DefaultHttpDataSource extends BaseDataSource implements HttpDataSou ...@@ -296,7 +298,7 @@ public class DefaultHttpDataSource extends BaseDataSource implements HttpDataSou
Map<String, List<String>> headers = connection.getHeaderFields(); Map<String, List<String>> headers = connection.getHeaderFields();
closeConnectionQuietly(); closeConnectionQuietly();
InvalidResponseCodeException exception = InvalidResponseCodeException exception =
new InvalidResponseCodeException(responseCode, headers, dataSpec); new InvalidResponseCodeException(responseCode, responseMessage, headers, dataSpec);
if (responseCode == 416) { if (responseCode == 416) {
exception.initCause(new DataSourceException(DataSourceException.POSITION_OUT_OF_RANGE)); exception.initCause(new DataSourceException(DataSourceException.POSITION_OUT_OF_RANGE));
} }
......
library/core/src/main/java/com/google/android/exoplayer2/upstream/HttpDataSource.java
...@@ -16,10 +16,12 @@ ...@@ -16,10 +16,12 @@
package com.google.android.exoplayer2.upstream; package com.google.android.exoplayer2.upstream;
import android.support.annotation.IntDef; import android.support.annotation.IntDef;
import android.support.annotation.Nullable;
import android.text.TextUtils; import android.text.TextUtils;
import com.google.android.exoplayer2.util.Predicate; import com.google.android.exoplayer2.util.Predicate;
import com.google.android.exoplayer2.util.Util; import com.google.android.exoplayer2.util.Util;
import java.io.IOException; import java.io.IOException;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
import java.util.Collections; import java.util.Collections;
...@@ -226,9 +228,11 @@ public interface HttpDataSource extends DataSource { ...@@ -226,9 +228,11 @@ public interface HttpDataSource extends DataSource {
*/ */
class HttpDataSourceException extends IOException { class HttpDataSourceException extends IOException {
@Documented
@Retention(RetentionPolicy.SOURCE) @Retention(RetentionPolicy.SOURCE)
@IntDef({TYPE_OPEN, TYPE_READ, TYPE_CLOSE}) @IntDef({TYPE_OPEN, TYPE_READ, TYPE_CLOSE})
public @interface Type {} public @interface Type {}
public static final int TYPE_OPEN = 1; public static final int TYPE_OPEN = 1;
public static final int TYPE_READ = 2; public static final int TYPE_READ = 2;
public static final int TYPE_CLOSE = 3; public static final int TYPE_CLOSE = 3;
...@@ -291,15 +295,29 @@ public interface HttpDataSource extends DataSource { ...@@ -291,15 +295,29 @@ public interface HttpDataSource extends DataSource {
*/ */
public final int responseCode; public final int responseCode;
/** The http status message. */
@Nullable public final String responseMessage;
/** /**
* An unmodifiable map of the response header fields and values. * An unmodifiable map of the response header fields and values.
*/ */
public final Map<String, List<String>> headerFields; public final Map<String, List<String>> headerFields;
public InvalidResponseCodeException(int responseCode, Map<String, List<String>> headerFields, /** @deprecated Use {@link #InvalidResponseCodeException(int, String, Map, DataSpec)}. */
@Deprecated
public InvalidResponseCodeException(
int responseCode, Map<String, List<String>> headerFields, DataSpec dataSpec) {
this(responseCode, /* responseMessage= */ null, headerFields, dataSpec);
}
public InvalidResponseCodeException(
int responseCode,
@Nullable String responseMessage,
Map<String, List<String>> headerFields,
DataSpec dataSpec) { DataSpec dataSpec) {
super("Response code: " + responseCode, dataSpec, TYPE_OPEN); super("Response code: " + responseCode, dataSpec, TYPE_OPEN);
this.responseCode = responseCode; this.responseCode = responseCode;
this.responseMessage = responseMessage;
this.headerFields = headerFields; this.headerFields = headerFields;
} }
......
library/core/src/main/java/com/google/android/exoplayer2/upstream/Loader.java
...@@ -28,6 +28,7 @@ import com.google.android.exoplayer2.util.Log; ...@@ -28,6 +28,7 @@ import com.google.android.exoplayer2.util.Log;
import com.google.android.exoplayer2.util.TraceUtil; import com.google.android.exoplayer2.util.TraceUtil;
import com.google.android.exoplayer2.util.Util; import com.google.android.exoplayer2.util.Util;
import java.io.IOException; import java.io.IOException;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
import java.util.concurrent.ExecutorService; import java.util.concurrent.ExecutorService;
...@@ -136,6 +137,7 @@ public final class Loader implements LoaderErrorThrower { ...@@ -136,6 +137,7 @@ public final class Loader implements LoaderErrorThrower {
} }
/** Types of action that can be taken in response to a load error. */ /** Types of action that can be taken in response to a load error. */
@Documented
@Retention(RetentionPolicy.SOURCE) @Retention(RetentionPolicy.SOURCE)
@IntDef({ @IntDef({
ACTION_TYPE_RETRY, ACTION_TYPE_RETRY,
......
library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSource.java
...@@ -31,8 +31,10 @@ import com.google.android.exoplayer2.upstream.cache.Cache.CacheException; ...@@ -31,8 +31,10 @@ import com.google.android.exoplayer2.upstream.cache.Cache.CacheException;
import com.google.android.exoplayer2.util.Assertions; import com.google.android.exoplayer2.util.Assertions;
import java.io.IOException; import java.io.IOException;
import java.io.InterruptedIOException; import java.io.InterruptedIOException;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
...@@ -59,6 +61,7 @@ public final class CacheDataSource implements DataSource { ...@@ -59,6 +61,7 @@ public final class CacheDataSource implements DataSource {
* Flags controlling the cache's behavior. Possible flag values are {@link #FLAG_BLOCK_ON_CACHE}, * Flags controlling the cache's behavior. Possible flag values are {@link #FLAG_BLOCK_ON_CACHE},
* {@link #FLAG_IGNORE_CACHE_ON_ERROR} and {@link #FLAG_IGNORE_CACHE_FOR_UNSET_LENGTH_REQUESTS}. * {@link #FLAG_IGNORE_CACHE_ON_ERROR} and {@link #FLAG_IGNORE_CACHE_FOR_UNSET_LENGTH_REQUESTS}.
*/ */
@Documented
@Retention(RetentionPolicy.SOURCE) @Retention(RetentionPolicy.SOURCE)
@IntDef( @IntDef(
flag = true, flag = true,
...@@ -91,6 +94,7 @@ public final class CacheDataSource implements DataSource { ...@@ -91,6 +94,7 @@ public final class CacheDataSource implements DataSource {
* Reasons the cache may be ignored. One of {@link #CACHE_IGNORED_REASON_ERROR} or {@link * Reasons the cache may be ignored. One of {@link #CACHE_IGNORED_REASON_ERROR} or {@link
* #CACHE_IGNORED_REASON_UNSET_LENGTH}. * #CACHE_IGNORED_REASON_UNSET_LENGTH}.
*/ */
@Documented
@Retention(RetentionPolicy.SOURCE) @Retention(RetentionPolicy.SOURCE)
@IntDef({CACHE_IGNORED_REASON_ERROR, CACHE_IGNORED_REASON_UNSET_LENGTH}) @IntDef({CACHE_IGNORED_REASON_ERROR, CACHE_IGNORED_REASON_UNSET_LENGTH})
public @interface CacheIgnoredReason {} public @interface CacheIgnoredReason {}
...@@ -358,7 +362,7 @@ public final class CacheDataSource implements DataSource { ...@@ -358,7 +362,7 @@ public final class CacheDataSource implements DataSource {
// TODO: Implement. // TODO: Implement.
return isReadingFromUpstream() return isReadingFromUpstream()
? upstreamDataSource.getResponseHeaders() ? upstreamDataSource.getResponseHeaders()
: DataSource.super.getResponseHeaders(); : Collections.emptyMap();
} }
@Override @Override
......
library/core/src/main/java/com/google/android/exoplayer2/util/EGLSurfaceTexture.java
...@@ -26,6 +26,7 @@ import android.opengl.GLES20; ...@@ -26,6 +26,7 @@ import android.opengl.GLES20;
import android.os.Handler; import android.os.Handler;
import android.support.annotation.IntDef; import android.support.annotation.IntDef;
import android.support.annotation.Nullable; import android.support.annotation.Nullable;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
...@@ -43,6 +44,7 @@ public final class EGLSurfaceTexture implements SurfaceTexture.OnFrameAvailableL ...@@ -43,6 +44,7 @@ public final class EGLSurfaceTexture implements SurfaceTexture.OnFrameAvailableL
* Secure mode to be used by the EGL surface and context. One of {@link #SECURE_MODE_NONE}, {@link * Secure mode to be used by the EGL surface and context. One of {@link #SECURE_MODE_NONE}, {@link
* #SECURE_MODE_SURFACELESS_CONTEXT} or {@link #SECURE_MODE_PROTECTED_PBUFFER}. * #SECURE_MODE_SURFACELESS_CONTEXT} or {@link #SECURE_MODE_PROTECTED_PBUFFER}.
*/ */
@Documented
@Retention(RetentionPolicy.SOURCE) @Retention(RetentionPolicy.SOURCE)
@IntDef({SECURE_MODE_NONE, SECURE_MODE_SURFACELESS_CONTEXT, SECURE_MODE_PROTECTED_PBUFFER}) @IntDef({SECURE_MODE_NONE, SECURE_MODE_SURFACELESS_CONTEXT, SECURE_MODE_PROTECTED_PBUFFER})
public @interface SecureMode {} public @interface SecureMode {}
......
library/core/src/main/java/com/google/android/exoplayer2/util/EventDispatcher.java
...@@ -39,22 +39,23 @@ public final class EventDispatcher<T> { ...@@ -39,22 +39,23 @@ public final class EventDispatcher<T> {
/** The list of listeners and handlers. */ /** The list of listeners and handlers. */
private final CopyOnWriteArrayList<HandlerAndListener<T>> listeners; private final CopyOnWriteArrayList<HandlerAndListener<T>> listeners;
/** Creates event dispatcher. */ /** Creates an event dispatcher. */
public EventDispatcher() { public EventDispatcher() {
listeners = new CopyOnWriteArrayList<>(); listeners = new CopyOnWriteArrayList<>();
} }
/** Adds listener to event dispatcher. */ /** Adds a listener to the event dispatcher. */
public void addListener(Handler handler, T eventListener) { public void addListener(Handler handler, T eventListener) {
Assertions.checkArgument(handler != null && eventListener != null); Assertions.checkArgument(handler != null && eventListener != null);
removeListener(eventListener); removeListener(eventListener);
listeners.add(new HandlerAndListener<>(handler, eventListener)); listeners.add(new HandlerAndListener<>(handler, eventListener));
} }
/** Removes listener from event dispatcher. */ /** Removes a listener from the event dispatcher. */
public void removeListener(T eventListener) { public void removeListener(T eventListener) {
for (HandlerAndListener<T> handlerAndListener : listeners) { for (HandlerAndListener<T> handlerAndListener : listeners) {
if (handlerAndListener.listener == eventListener) { if (handlerAndListener.listener == eventListener) {
handlerAndListener.release();
listeners.remove(handlerAndListener); listeners.remove(handlerAndListener);
} }
} }
...@@ -67,19 +68,33 @@ public final class EventDispatcher<T> { ...@@ -67,19 +68,33 @@ public final class EventDispatcher<T> {
*/ */
public void dispatch(Event<T> event) { public void dispatch(Event<T> event) {
for (HandlerAndListener<T> handlerAndListener : listeners) { for (HandlerAndListener<T> handlerAndListener : listeners) {
T eventListener = handlerAndListener.listener; handlerAndListener.dispatch(event);
handlerAndListener.handler.post(() -> event.sendTo(eventListener));
} }
} }
private static final class HandlerAndListener<T> { private static final class HandlerAndListener<T> {
public final Handler handler; private final Handler handler;
public final T listener; private final T listener;
private boolean released;
public HandlerAndListener(Handler handler, T eventListener) { public HandlerAndListener(Handler handler, T eventListener) {
this.handler = handler; this.handler = handler;
this.listener = eventListener; this.listener = eventListener;
} }
public void release() {
released = true;
}
public void dispatch(Event<T> event) {
handler.post(
() -> {
if (!released) {
event.sendTo(listener);
}
});
}
} }
} }
library/core/src/main/java/com/google/android/exoplayer2/util/Log.java
...@@ -18,6 +18,7 @@ package com.google.android.exoplayer2.util; ...@@ -18,6 +18,7 @@ package com.google.android.exoplayer2.util;
import android.support.annotation.IntDef; import android.support.annotation.IntDef;
import android.support.annotation.Nullable; import android.support.annotation.Nullable;
import android.text.TextUtils; import android.text.TextUtils;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
...@@ -28,6 +29,7 @@ public final class Log { ...@@ -28,6 +29,7 @@ public final class Log {
* Log level for ExoPlayer logcat logging. One of {@link #LOG_LEVEL_ALL}, {@link #LOG_LEVEL_INFO}, * Log level for ExoPlayer logcat logging. One of {@link #LOG_LEVEL_ALL}, {@link #LOG_LEVEL_INFO},
* {@link #LOG_LEVEL_WARNING}, {@link #LOG_LEVEL_ERROR} or {@link #LOG_LEVEL_OFF}. * {@link #LOG_LEVEL_WARNING}, {@link #LOG_LEVEL_ERROR} or {@link #LOG_LEVEL_OFF}.
*/ */
@Documented
@Retention(RetentionPolicy.SOURCE) @Retention(RetentionPolicy.SOURCE)
@IntDef({LOG_LEVEL_ALL, LOG_LEVEL_INFO, LOG_LEVEL_WARNING, LOG_LEVEL_ERROR, LOG_LEVEL_OFF}) @IntDef({LOG_LEVEL_ALL, LOG_LEVEL_INFO, LOG_LEVEL_WARNING, LOG_LEVEL_ERROR, LOG_LEVEL_OFF})
@interface LogLevel {} @interface LogLevel {}
......
library/core/src/main/java/com/google/android/exoplayer2/util/NotificationUtil.java
...@@ -24,6 +24,7 @@ import android.content.Intent; ...@@ -24,6 +24,7 @@ import android.content.Intent;
import android.support.annotation.IntDef; import android.support.annotation.IntDef;
import android.support.annotation.Nullable; import android.support.annotation.Nullable;
import android.support.annotation.StringRes; import android.support.annotation.StringRes;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
...@@ -36,6 +37,7 @@ public final class NotificationUtil { ...@@ -36,6 +37,7 @@ public final class NotificationUtil {
* #IMPORTANCE_NONE}, {@link #IMPORTANCE_MIN}, {@link #IMPORTANCE_LOW}, {@link * #IMPORTANCE_NONE}, {@link #IMPORTANCE_MIN}, {@link #IMPORTANCE_LOW}, {@link
* #IMPORTANCE_DEFAULT} or {@link #IMPORTANCE_HIGH}. * #IMPORTANCE_DEFAULT} or {@link #IMPORTANCE_HIGH}.
*/ */
@Documented
@Retention(RetentionPolicy.SOURCE) @Retention(RetentionPolicy.SOURCE)
@IntDef({ @IntDef({
IMPORTANCE_UNSPECIFIED, IMPORTANCE_UNSPECIFIED,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment