Skip to content

SDK / exoplayer

Go to a project
Commit a70c1f1a by Oliver Woodman
Options

Remove requirement to specify downstream renderer count. 

This makes it so that it's no longer necessary to specify the number
of downstream renderers to HlsSampleSource, FrameworkSampleSource and
ExtractorSampleSource, by forcing the downstream renderers to register
with the SampleSource instances in their constructors. This eliminates
a common source of subtle client bugs where the passed value is incorrect.
parent 15dc87b0
Inline Side-by-side
Showing with 123 additions and 79 deletions
demo/src/main/java/com/google/android/exoplayer/demo/player/ExtractorRendererBuilder.java
...@@ -57,7 +57,7 @@ public class ExtractorRendererBuilder implements RendererBuilder { ...@@ -57,7 +57,7 @@ public class ExtractorRendererBuilder implements RendererBuilder {
DefaultBandwidthMeter bandwidthMeter = new DefaultBandwidthMeter(player.getMainHandler(), DefaultBandwidthMeter bandwidthMeter = new DefaultBandwidthMeter(player.getMainHandler(),
null); null);
DataSource dataSource = new DefaultUriDataSource(context, bandwidthMeter, userAgent); DataSource dataSource = new DefaultUriDataSource(context, bandwidthMeter, userAgent);
ExtractorSampleSource sampleSource = new ExtractorSampleSource(uri, dataSource, extractor, 2, ExtractorSampleSource sampleSource = new ExtractorSampleSource(uri, dataSource, extractor,
BUFFER_SIZE); BUFFER_SIZE);
MediaCodecVideoTrackRenderer videoRenderer = new MediaCodecVideoTrackRenderer(sampleSource, MediaCodecVideoTrackRenderer videoRenderer = new MediaCodecVideoTrackRenderer(sampleSource,
null, true, MediaCodec.VIDEO_SCALING_MODE_SCALE_TO_FIT, 5000, null, player.getMainHandler(), null, true, MediaCodec.VIDEO_SCALING_MODE_SCALE_TO_FIT, 5000, null, player.getMainHandler(),
......
demo/src/main/java/com/google/android/exoplayer/demo/player/HlsRendererBuilder.java
...@@ -108,7 +108,7 @@ public class HlsRendererBuilder implements RendererBuilder, ManifestCallback<Hls ...@@ -108,7 +108,7 @@ public class HlsRendererBuilder implements RendererBuilder, ManifestCallback<Hls
HlsChunkSource chunkSource = new HlsChunkSource(dataSource, url, manifest, bandwidthMeter, HlsChunkSource chunkSource = new HlsChunkSource(dataSource, url, manifest, bandwidthMeter,
variantIndices, HlsChunkSource.ADAPTIVE_MODE_SPLICE, audioCapabilities); variantIndices, HlsChunkSource.ADAPTIVE_MODE_SPLICE, audioCapabilities);
HlsSampleSource sampleSource = new HlsSampleSource(chunkSource, loadControl, HlsSampleSource sampleSource = new HlsSampleSource(chunkSource, loadControl,
BUFFER_SEGMENTS * BUFFER_SEGMENT_SIZE, true, 3, mainHandler, player, DemoPlayer.TYPE_VIDEO); BUFFER_SEGMENTS * BUFFER_SEGMENT_SIZE, true, mainHandler, player, DemoPlayer.TYPE_VIDEO);
MediaCodecVideoTrackRenderer videoRenderer = new MediaCodecVideoTrackRenderer(sampleSource, MediaCodecVideoTrackRenderer videoRenderer = new MediaCodecVideoTrackRenderer(sampleSource,
MediaCodec.VIDEO_SCALING_MODE_SCALE_TO_FIT, 5000, mainHandler, player, 50); MediaCodec.VIDEO_SCALING_MODE_SCALE_TO_FIT, 5000, mainHandler, player, 50);
MediaCodecAudioTrackRenderer audioRenderer = new MediaCodecAudioTrackRenderer(sampleSource); MediaCodecAudioTrackRenderer audioRenderer = new MediaCodecAudioTrackRenderer(sampleSource);
......
demo_misc/webm_sw_decoder/src/main/java/com/google/android/exoplayer/demo/webm/VideoPlayer.java
...@@ -161,7 +161,7 @@ public class VideoPlayer extends Activity implements OnClickListener, ...@@ -161,7 +161,7 @@ public class VideoPlayer extends Activity implements OnClickListener,
ExtractorSampleSource sampleSource = new ExtractorSampleSource( ExtractorSampleSource sampleSource = new ExtractorSampleSource(
Uri.fromFile(new File(filename)), Uri.fromFile(new File(filename)),
new DefaultUriDataSource(this, Util.getUserAgent(this, "ExoPlayerExtWebMDemo")), new DefaultUriDataSource(this, Util.getUserAgent(this, "ExoPlayerExtWebMDemo")),
new WebmExtractor(), 2, EXTRACTOR_BUFFER_SIZE); new WebmExtractor(), EXTRACTOR_BUFFER_SIZE);
TrackRenderer videoRenderer = TrackRenderer videoRenderer =
new LibvpxVideoTrackRenderer(sampleSource, true, handler, this, 50); new LibvpxVideoTrackRenderer(sampleSource, true, handler, this, 50);
if (useOpenGL) { if (useOpenGL) {
......
extensions/opus/src/main/java/com/google/android/exoplayer/ext/opus/LibopusAudioTrackRenderer.java
...@@ -20,6 +20,7 @@ import com.google.android.exoplayer.ExoPlayer; ...@@ -20,6 +20,7 @@ import com.google.android.exoplayer.ExoPlayer;
import com.google.android.exoplayer.MediaFormat; import com.google.android.exoplayer.MediaFormat;
import com.google.android.exoplayer.MediaFormatHolder; import com.google.android.exoplayer.MediaFormatHolder;
import com.google.android.exoplayer.SampleSource; import com.google.android.exoplayer.SampleSource;
import com.google.android.exoplayer.SampleSource.SampleSourceReader;
import com.google.android.exoplayer.TrackRenderer; import com.google.android.exoplayer.TrackRenderer;
import com.google.android.exoplayer.audio.AudioTrack; import com.google.android.exoplayer.audio.AudioTrack;
import com.google.android.exoplayer.ext.opus.OpusDecoderWrapper.InputBuffer; import com.google.android.exoplayer.ext.opus.OpusDecoderWrapper.InputBuffer;
...@@ -74,7 +75,7 @@ public class LibopusAudioTrackRenderer extends TrackRenderer { ...@@ -74,7 +75,7 @@ public class LibopusAudioTrackRenderer extends TrackRenderer {
*/ */
public static final int MSG_SET_VOLUME = 1; public static final int MSG_SET_VOLUME = 1;
private final SampleSource source; private final SampleSourceReader source;
private final Handler eventHandler; private final Handler eventHandler;
private final EventListener eventListener; private final EventListener eventListener;
private final MediaFormatHolder formatHolder; private final MediaFormatHolder formatHolder;
...@@ -109,7 +110,7 @@ public class LibopusAudioTrackRenderer extends TrackRenderer { ...@@ -109,7 +110,7 @@ public class LibopusAudioTrackRenderer extends TrackRenderer {
*/ */
public LibopusAudioTrackRenderer(SampleSource source, Handler eventHandler, public LibopusAudioTrackRenderer(SampleSource source, Handler eventHandler,
EventListener eventListener) { EventListener eventListener) {
this.source = source; this.source = source.register();
this.eventHandler = eventHandler; this.eventHandler = eventHandler;
this.eventListener = eventListener; this.eventListener = eventListener;
this.audioSessionId = AudioTrack.SESSION_ID_NOT_SET; this.audioSessionId = AudioTrack.SESSION_ID_NOT_SET;
......
extensions/vp9/src/main/java/com/google/android/exoplayer/ext/vp9/LibvpxVideoTrackRenderer.java
...@@ -20,6 +20,7 @@ import com.google.android.exoplayer.ExoPlayer; ...@@ -20,6 +20,7 @@ import com.google.android.exoplayer.ExoPlayer;
import com.google.android.exoplayer.MediaFormat; import com.google.android.exoplayer.MediaFormat;
import com.google.android.exoplayer.MediaFormatHolder; import com.google.android.exoplayer.MediaFormatHolder;
import com.google.android.exoplayer.SampleSource; import com.google.android.exoplayer.SampleSource;
import com.google.android.exoplayer.SampleSource.SampleSourceReader;
import com.google.android.exoplayer.TrackRenderer; import com.google.android.exoplayer.TrackRenderer;
import com.google.android.exoplayer.ext.vp9.VpxDecoderWrapper.InputBuffer; import com.google.android.exoplayer.ext.vp9.VpxDecoderWrapper.InputBuffer;
import com.google.android.exoplayer.ext.vp9.VpxDecoderWrapper.OutputBuffer; import com.google.android.exoplayer.ext.vp9.VpxDecoderWrapper.OutputBuffer;
...@@ -90,7 +91,7 @@ public class LibvpxVideoTrackRenderer extends TrackRenderer { ...@@ -90,7 +91,7 @@ public class LibvpxVideoTrackRenderer extends TrackRenderer {
public static final int MSG_SET_SURFACE = 1; public static final int MSG_SET_SURFACE = 1;
public static final int MSG_SET_VPX_SURFACE_VIEW = 2; public static final int MSG_SET_VPX_SURFACE_VIEW = 2;
private final SampleSource source; private final SampleSourceReader source;
private final boolean scaleToFit; private final boolean scaleToFit;
private final Handler eventHandler; private final Handler eventHandler;
private final EventListener eventListener; private final EventListener eventListener;
...@@ -141,7 +142,7 @@ public class LibvpxVideoTrackRenderer extends TrackRenderer { ...@@ -141,7 +142,7 @@ public class LibvpxVideoTrackRenderer extends TrackRenderer {
*/ */
public LibvpxVideoTrackRenderer(SampleSource source, boolean scaleToFit, public LibvpxVideoTrackRenderer(SampleSource source, boolean scaleToFit,
Handler eventHandler, EventListener eventListener, int maxDroppedFrameCountToNotify) { Handler eventHandler, EventListener eventListener, int maxDroppedFrameCountToNotify) {
this.source = source; this.source = source.register();
this.scaleToFit = scaleToFit; this.scaleToFit = scaleToFit;
this.eventHandler = eventHandler; this.eventHandler = eventHandler;
this.eventListener = eventListener; this.eventListener = eventListener;
......
library/src/main/java/com/google/android/exoplayer/FrameworkSampleSource.java
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
*/ */
package com.google.android.exoplayer; package com.google.android.exoplayer;
import com.google.android.exoplayer.SampleSource.SampleSourceReader;
import com.google.android.exoplayer.drm.DrmInitData; import com.google.android.exoplayer.drm.DrmInitData;
import com.google.android.exoplayer.extractor.ExtractorSampleSource; import com.google.android.exoplayer.extractor.ExtractorSampleSource;
import com.google.android.exoplayer.extractor.mp4.Mp4Extractor; import com.google.android.exoplayer.extractor.mp4.Mp4Extractor;
...@@ -48,6 +49,7 @@ import java.util.UUID; ...@@ -48,6 +49,7 @@ import java.util.UUID;
* <li>Playing media whose container format is unknown and so needs to be inferred automatically. * <li>Playing media whose container format is unknown and so needs to be inferred automatically.
* </li> * </li>
* </ul> * </ul>
* <p>
* Over time we hope to enhance {@link ExtractorSampleSource} to support these use cases, and hence * Over time we hope to enhance {@link ExtractorSampleSource} to support these use cases, and hence
* make use of this class unnecessary. * make use of this class unnecessary.
*/ */
...@@ -55,7 +57,7 @@ import java.util.UUID; ...@@ -55,7 +57,7 @@ import java.util.UUID;
// through use of a background thread, or through changes to the framework's MediaExtractor API). // through use of a background thread, or through changes to the framework's MediaExtractor API).
@Deprecated @Deprecated
@TargetApi(16) @TargetApi(16)
public final class FrameworkSampleSource implements SampleSource { public final class FrameworkSampleSource implements SampleSource, SampleSourceReader {
private static final int ALLOWED_FLAGS_MASK = C.SAMPLE_FLAG_SYNC | C.SAMPLE_FLAG_ENCRYPTED; private static final int ALLOWED_FLAGS_MASK = C.SAMPLE_FLAG_SYNC | C.SAMPLE_FLAG_ENCRYPTED;
...@@ -88,17 +90,12 @@ public final class FrameworkSampleSource implements SampleSource { ...@@ -88,17 +90,12 @@ public final class FrameworkSampleSource implements SampleSource {
* @param context Context for resolving {@code uri}. * @param context Context for resolving {@code uri}.
* @param uri The content URI from which to extract data. * @param uri The content URI from which to extract data.
* @param headers Headers to send with requests for data. * @param headers Headers to send with requests for data.
* @param downstreamRendererCount Number of track renderers dependent on this sample source.
*/ */
public FrameworkSampleSource(Context context, Uri uri, Map<String, String> headers, public FrameworkSampleSource(Context context, Uri uri, Map<String, String> headers) {
int downstreamRendererCount) {
Assertions.checkState(Util.SDK_INT >= 16); Assertions.checkState(Util.SDK_INT >= 16);
this.remainingReleaseCount = downstreamRendererCount;
this.context = Assertions.checkNotNull(context); this.context = Assertions.checkNotNull(context);
this.uri = Assertions.checkNotNull(uri); this.uri = Assertions.checkNotNull(uri);
this.headers = headers; this.headers = headers;
fileDescriptor = null; fileDescriptor = null;
fileDescriptorOffset = 0; fileDescriptorOffset = 0;
fileDescriptorLength = 0; fileDescriptorLength = 0;
...@@ -109,22 +106,24 @@ public final class FrameworkSampleSource implements SampleSource { ...@@ -109,22 +106,24 @@ public final class FrameworkSampleSource implements SampleSource {
* The caller is responsible for releasing the file descriptor. * The caller is responsible for releasing the file descriptor.
* *
* @param fileDescriptor File descriptor from which to read. * @param fileDescriptor File descriptor from which to read.
* @param offset The offset in bytes into the file where the data to be extracted starts. * @param fileDescriptorOffset The offset in bytes where the data to be extracted starts.
* @param length The length in bytes of the data to be extracted. * @param fileDescriptorLength The length in bytes of the data to be extracted.
* @param downstreamRendererCount Number of track renderers dependent on this sample source.
*/ */
public FrameworkSampleSource(FileDescriptor fileDescriptor, long offset, long length, public FrameworkSampleSource(FileDescriptor fileDescriptor, long fileDescriptorOffset,
int downstreamRendererCount) { long fileDescriptorLength) {
Assertions.checkState(Util.SDK_INT >= 16); Assertions.checkState(Util.SDK_INT >= 16);
this.remainingReleaseCount = downstreamRendererCount; this.fileDescriptor = Assertions.checkNotNull(fileDescriptor);
this.fileDescriptorOffset = fileDescriptorOffset;
this.fileDescriptorLength = fileDescriptorLength;
context = null; context = null;
uri = null; uri = null;
headers = null; headers = null;
}
this.fileDescriptor = Assertions.checkNotNull(fileDescriptor); @Override
fileDescriptorOffset = offset; public SampleSourceReader register() {
fileDescriptorLength = length; remainingReleaseCount++;
return this;
} }
@Override @Override
......
library/src/main/java/com/google/android/exoplayer/MediaCodecTrackRenderer.java
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
package com.google.android.exoplayer; package com.google.android.exoplayer;
import com.google.android.exoplayer.MediaCodecUtil.DecoderQueryException; import com.google.android.exoplayer.MediaCodecUtil.DecoderQueryException;
import com.google.android.exoplayer.SampleSource.SampleSourceReader;
import com.google.android.exoplayer.drm.DrmInitData; import com.google.android.exoplayer.drm.DrmInitData;
import com.google.android.exoplayer.drm.DrmSessionManager; import com.google.android.exoplayer.drm.DrmSessionManager;
import com.google.android.exoplayer.util.Assertions; import com.google.android.exoplayer.util.Assertions;
...@@ -182,7 +183,7 @@ public abstract class MediaCodecTrackRenderer extends TrackRenderer { ...@@ -182,7 +183,7 @@ public abstract class MediaCodecTrackRenderer extends TrackRenderer {
private final DrmSessionManager drmSessionManager; private final DrmSessionManager drmSessionManager;
private final boolean playClearSamplesWithoutKeys; private final boolean playClearSamplesWithoutKeys;
private final SampleSource source; private final SampleSourceReader source;
private final SampleHolder sampleHolder; private final SampleHolder sampleHolder;
private final MediaFormatHolder formatHolder; private final MediaFormatHolder formatHolder;
private final List<Long> decodeOnlyPresentationTimestamps; private final List<Long> decodeOnlyPresentationTimestamps;
...@@ -229,7 +230,7 @@ public abstract class MediaCodecTrackRenderer extends TrackRenderer { ...@@ -229,7 +230,7 @@ public abstract class MediaCodecTrackRenderer extends TrackRenderer {
public MediaCodecTrackRenderer(SampleSource source, DrmSessionManager drmSessionManager, public MediaCodecTrackRenderer(SampleSource source, DrmSessionManager drmSessionManager,
boolean playClearSamplesWithoutKeys, Handler eventHandler, EventListener eventListener) { boolean playClearSamplesWithoutKeys, Handler eventHandler, EventListener eventListener) {
Assertions.checkState(Util.SDK_INT >= 16); Assertions.checkState(Util.SDK_INT >= 16);
this.source = source; this.source = source.register();
this.drmSessionManager = drmSessionManager; this.drmSessionManager = drmSessionManager;
this.playClearSamplesWithoutKeys = playClearSamplesWithoutKeys; this.playClearSamplesWithoutKeys = playClearSamplesWithoutKeys;
this.eventHandler = eventHandler; this.eventHandler = eventHandler;
......
library/src/main/java/com/google/android/exoplayer/SampleSource.java
...@@ -21,8 +21,8 @@ import java.io.IOException; ...@@ -21,8 +21,8 @@ import java.io.IOException;
* A source of media samples. * A source of media samples.
* <p> * <p>
* A {@link SampleSource} may expose one or multiple tracks. The number of tracks and information * A {@link SampleSource} may expose one or multiple tracks. The number of tracks and information
* about each can be queried using {@link #getTrackCount()} and {@link #getTrackInfo(int)} * about each can be queried using {@link SampleSourceReader#getTrackCount()} and
* respectively. * {@link SampleSourceReader#getTrackInfo(int)} respectively.
*/ */
public interface SampleSource { public interface SampleSource {
...@@ -51,11 +51,28 @@ public interface SampleSource { ...@@ -51,11 +51,28 @@ public interface SampleSource {
public static final int DISCONTINUITY_READ = -5; public static final int DISCONTINUITY_READ = -5;
/** /**
* A consumer of samples should call this method to register themselves and gain access to the
* source through the returned {@link SampleSourceReader}.
* <p>
* {@link SampleSourceReader#release()} should be called on the returned object when access is no
* longer required.
*
* @return A {@link SampleSourceReader} that provides access to the source.
*/
public SampleSourceReader register();
/**
* An interface providing read access to a {@link SampleSource}.
*/
public interface SampleSourceReader {
/**
* Prepares the source. * Prepares the source.
* <p> * <p>
* Preparation may require reading from the data source (e.g. to determine the available tracks * Preparation may require reading from the data source (e.g. to determine the available tracks
* and formats). If insufficient data is available then the call will return {@code false} rather * and formats). If insufficient data is available then the call will return {@code false}
* than block. The method can be called repeatedly until the return value indicates success. * rather than block. The method can be called repeatedly until the return value indicates
* success.
* *
* @param positionUs The player's current playback position. * @param positionUs The player's current playback position.
* @return True if the source was prepared successfully, false otherwise. * @return True if the source was prepared successfully, false otherwise.
...@@ -103,8 +120,8 @@ public interface SampleSource { ...@@ -103,8 +120,8 @@ public interface SampleSource {
* Indicates to the source that it should still be buffering data. * Indicates to the source that it should still be buffering data.
* *
* @param positionUs The current playback position. * @param positionUs The current playback position.
* @return True if the source has available samples, or if the end of the stream has been reached. * @return True if the source has available samples, or if the end of the stream has been
* False if more data needs to be buffered for samples to become available. * reached. False if more data needs to be buffered for samples to become available.
* @throws IOException If an error occurred reading from the source. * @throws IOException If an error occurred reading from the source.
*/ */
public boolean continueBuffering(long positionUs) throws IOException; public boolean continueBuffering(long positionUs) throws IOException;
...@@ -120,9 +137,10 @@ public interface SampleSource { ...@@ -120,9 +137,10 @@ public interface SampleSource {
* *
* @param track The track from which to read. * @param track The track from which to read.
* @param positionUs The current playback position. * @param positionUs The current playback position.
* @param formatHolder A {@link MediaFormatHolder} object to populate in the case of a new format. * @param formatHolder A {@link MediaFormatHolder} object to populate in the case of a new
* @param sampleHolder A {@link SampleHolder} object to populate in the case of a new sample. If * format.
* the caller requires the sample data then it must ensure that {@link SampleHolder#data} * @param sampleHolder A {@link SampleHolder} object to populate in the case of a new sample.
* If the caller requires the sample data then it must ensure that {@link SampleHolder#data}
* references a valid output buffer. * references a valid output buffer.
* @param onlyReadDiscontinuity Whether to only read a discontinuity. If true, only * @param onlyReadDiscontinuity Whether to only read a discontinuity. If true, only
* {@link #DISCONTINUITY_READ} or {@link #NOTHING_READ} can be returned. * {@link #DISCONTINUITY_READ} or {@link #NOTHING_READ} can be returned.
...@@ -148,14 +166,18 @@ public interface SampleSource { ...@@ -148,14 +166,18 @@ public interface SampleSource {
* This method should not be called until after the source has been successfully prepared. * This method should not be called until after the source has been successfully prepared.
* *
* @return An estimate of the absolute position in microseconds up to which data is buffered, * @return An estimate of the absolute position in microseconds up to which data is buffered,
* or {@link TrackRenderer#END_OF_TRACK_US} if data is buffered to the end of the stream, or * or {@link TrackRenderer#END_OF_TRACK_US} if data is buffered to the end of the stream,
* {@link TrackRenderer#UNKNOWN_TIME_US} if no estimate is available. * or {@link TrackRenderer#UNKNOWN_TIME_US} if no estimate is available.
*/ */
public long getBufferedPositionUs(); public long getBufferedPositionUs();
/** /**
* Releases the {@link SampleSource}. * Releases the {@link SampleSourceReader}.
* <p>
* This method should be called when access to the {@link SampleSource} is no longer required.
*/ */
public void release(); public void release();
}
} }
library/src/main/java/com/google/android/exoplayer/chunk/BaseChunkSampleSourceEventListener.java
...@@ -17,6 +17,7 @@ package com.google.android.exoplayer.chunk; ...@@ -17,6 +17,7 @@ package com.google.android.exoplayer.chunk;
import com.google.android.exoplayer.C; import com.google.android.exoplayer.C;
import com.google.android.exoplayer.SampleSource; import com.google.android.exoplayer.SampleSource;
import com.google.android.exoplayer.SampleSource.SampleSourceReader;
import java.io.IOException; import java.io.IOException;
...@@ -90,7 +91,7 @@ public interface BaseChunkSampleSourceEventListener { ...@@ -90,7 +91,7 @@ public interface BaseChunkSampleSourceEventListener {
/** /**
* Invoked when the downstream format changes (i.e. when the format being supplied to the * Invoked when the downstream format changes (i.e. when the format being supplied to the
* caller of {@link SampleSource#readData} changes). * caller of {@link SampleSourceReader#readData} changes).
* *
* @param sourceId The id of the reporting {@link SampleSource}. * @param sourceId The id of the reporting {@link SampleSource}.
* @param format The format. * @param format The format.
......
library/src/main/java/com/google/android/exoplayer/chunk/ChunkSampleSource.java
...@@ -21,6 +21,7 @@ import com.google.android.exoplayer.MediaFormat; ...@@ -21,6 +21,7 @@ import com.google.android.exoplayer.MediaFormat;
import com.google.android.exoplayer.MediaFormatHolder; import com.google.android.exoplayer.MediaFormatHolder;
import com.google.android.exoplayer.SampleHolder; import com.google.android.exoplayer.SampleHolder;
import com.google.android.exoplayer.SampleSource; import com.google.android.exoplayer.SampleSource;
import com.google.android.exoplayer.SampleSource.SampleSourceReader;
import com.google.android.exoplayer.TrackInfo; import com.google.android.exoplayer.TrackInfo;
import com.google.android.exoplayer.TrackRenderer; import com.google.android.exoplayer.TrackRenderer;
import com.google.android.exoplayer.extractor.DefaultTrackOutput; import com.google.android.exoplayer.extractor.DefaultTrackOutput;
...@@ -40,7 +41,7 @@ import java.util.List; ...@@ -40,7 +41,7 @@ import java.util.List;
* A {@link SampleSource} that loads media in {@link Chunk}s, which are themselves obtained from a * A {@link SampleSource} that loads media in {@link Chunk}s, which are themselves obtained from a
* {@link ChunkSource}. * {@link ChunkSource}.
*/ */
public class ChunkSampleSource implements SampleSource, Loader.Callback { public class ChunkSampleSource implements SampleSource, SampleSourceReader, Loader.Callback {
/** /**
* Interface definition for a callback to be notified of {@link ChunkSampleSource} events. * Interface definition for a callback to be notified of {@link ChunkSampleSource} events.
...@@ -52,9 +53,10 @@ public class ChunkSampleSource implements SampleSource, Loader.Callback { ...@@ -52,9 +53,10 @@ public class ChunkSampleSource implements SampleSource, Loader.Callback {
*/ */
public static final int DEFAULT_MIN_LOADABLE_RETRY_COUNT = 3; public static final int DEFAULT_MIN_LOADABLE_RETRY_COUNT = 3;
private static final int STATE_UNPREPARED = 0; private static final int STATE_IDLE = 0;
private static final int STATE_PREPARED = 1; private static final int STATE_INITIALIZED = 1;
private static final int STATE_ENABLED = 2; private static final int STATE_PREPARED = 2;
private static final int STATE_ENABLED = 3;
private static final int NO_RESET_PENDING = -1; private static final int NO_RESET_PENDING = -1;
...@@ -116,13 +118,23 @@ public class ChunkSampleSource implements SampleSource, Loader.Callback { ...@@ -116,13 +118,23 @@ public class ChunkSampleSource implements SampleSource, Loader.Callback {
mediaChunks = new LinkedList<>(); mediaChunks = new LinkedList<>();
readOnlyMediaChunks = Collections.unmodifiableList(mediaChunks); readOnlyMediaChunks = Collections.unmodifiableList(mediaChunks);
sampleQueue = new DefaultTrackOutput(loadControl.getAllocator()); sampleQueue = new DefaultTrackOutput(loadControl.getAllocator());
state = STATE_UNPREPARED; state = STATE_IDLE;
pendingResetPositionUs = NO_RESET_PENDING; pendingResetPositionUs = NO_RESET_PENDING;
} }
@Override @Override
public SampleSourceReader register() {
Assertions.checkState(state == STATE_IDLE);
state = STATE_INITIALIZED;
return this;
}
@Override
public boolean prepare(long positionUs) { public boolean prepare(long positionUs) {
Assertions.checkState(state == STATE_UNPREPARED); Assertions.checkState(state == STATE_INITIALIZED || state == STATE_PREPARED);
if (state == STATE_PREPARED) {
return true;
}
loader = new Loader("Loader:" + chunkSource.getTrackInfo().mimeType); loader = new Loader("Loader:" + chunkSource.getTrackInfo().mimeType);
state = STATE_PREPARED; state = STATE_PREPARED;
return true; return true;
...@@ -130,13 +142,13 @@ public class ChunkSampleSource implements SampleSource, Loader.Callback { ...@@ -130,13 +142,13 @@ public class ChunkSampleSource implements SampleSource, Loader.Callback {
@Override @Override
public int getTrackCount() { public int getTrackCount() {
Assertions.checkState(state != STATE_UNPREPARED); Assertions.checkState(state == STATE_PREPARED || state == STATE_ENABLED);
return 1; return 1;
} }
@Override @Override
public TrackInfo getTrackInfo(int track) { public TrackInfo getTrackInfo(int track) {
Assertions.checkState(state != STATE_UNPREPARED); Assertions.checkState(state == STATE_PREPARED || state == STATE_ENABLED);
Assertions.checkState(track == 0); Assertions.checkState(track == 0);
return chunkSource.getTrackInfo(); return chunkSource.getTrackInfo();
} }
...@@ -315,7 +327,7 @@ public class ChunkSampleSource implements SampleSource, Loader.Callback { ...@@ -315,7 +327,7 @@ public class ChunkSampleSource implements SampleSource, Loader.Callback {
loader.release(); loader.release();
loader = null; loader = null;
} }
state = STATE_UNPREPARED; state = STATE_IDLE;
} }
@Override @Override
......
library/src/main/java/com/google/android/exoplayer/extractor/ExtractorSampleSource.java
...@@ -20,6 +20,7 @@ import com.google.android.exoplayer.MediaFormat; ...@@ -20,6 +20,7 @@ import com.google.android.exoplayer.MediaFormat;
import com.google.android.exoplayer.MediaFormatHolder; import com.google.android.exoplayer.MediaFormatHolder;
import com.google.android.exoplayer.SampleHolder; import com.google.android.exoplayer.SampleHolder;
import com.google.android.exoplayer.SampleSource; import com.google.android.exoplayer.SampleSource;
import com.google.android.exoplayer.SampleSource.SampleSourceReader;
import com.google.android.exoplayer.TrackInfo; import com.google.android.exoplayer.TrackInfo;
import com.google.android.exoplayer.TrackRenderer; import com.google.android.exoplayer.TrackRenderer;
import com.google.android.exoplayer.drm.DrmInitData; import com.google.android.exoplayer.drm.DrmInitData;
...@@ -40,7 +41,8 @@ import java.io.IOException; ...@@ -40,7 +41,8 @@ import java.io.IOException;
/** /**
* A {@link SampleSource} that extracts sample data using an {@link Extractor} * A {@link SampleSource} that extracts sample data using an {@link Extractor}
*/ */
public class ExtractorSampleSource implements SampleSource, ExtractorOutput, Loader.Callback { public class ExtractorSampleSource implements SampleSource, SampleSourceReader, ExtractorOutput,
Loader.Callback {
/** /**
* The default minimum number of times to retry loading prior to failing for on-demand streams. * The default minimum number of times to retry loading prior to failing for on-demand streams.
...@@ -102,32 +104,28 @@ public class ExtractorSampleSource implements SampleSource, ExtractorOutput, Loa ...@@ -102,32 +104,28 @@ public class ExtractorSampleSource implements SampleSource, ExtractorOutput, Loa
* @param uri The {@link Uri} of the media stream. * @param uri The {@link Uri} of the media stream.
* @param dataSource A data source to read the media stream. * @param dataSource A data source to read the media stream.
* @param extractor An {@link Extractor} to extract the media stream. * @param extractor An {@link Extractor} to extract the media stream.
* @param downstreamRendererCount Number of track renderers dependent on this sample source.
* @param requestedBufferSize The requested total buffer size for storing sample data, in bytes. * @param requestedBufferSize The requested total buffer size for storing sample data, in bytes.
* The actual allocated size may exceed the value passed in if the implementation requires it. * The actual allocated size may exceed the value passed in if the implementation requires it.
*/ */
public ExtractorSampleSource(Uri uri, DataSource dataSource, Extractor extractor, public ExtractorSampleSource(Uri uri, DataSource dataSource, Extractor extractor,
int downstreamRendererCount, int requestedBufferSize) { int requestedBufferSize) {
this(uri, dataSource, extractor, downstreamRendererCount, requestedBufferSize, this(uri, dataSource, extractor, requestedBufferSize, MIN_RETRY_COUNT_DEFAULT_FOR_MEDIA);
MIN_RETRY_COUNT_DEFAULT_FOR_MEDIA);
} }
/** /**
* @param uri The {@link Uri} of the media stream. * @param uri The {@link Uri} of the media stream.
* @param dataSource A data source to read the media stream. * @param dataSource A data source to read the media stream.
* @param extractor An {@link Extractor} to extract the media stream. * @param extractor An {@link Extractor} to extract the media stream.
* @param downstreamRendererCount Number of track renderers dependent on this sample source.
* @param requestedBufferSize The requested total buffer size for storing sample data, in bytes. * @param requestedBufferSize The requested total buffer size for storing sample data, in bytes.
* The actual allocated size may exceed the value passed in if the implementation requires it. * The actual allocated size may exceed the value passed in if the implementation requires it.
* @param minLoadableRetryCount The minimum number of times that the sample source will retry * @param minLoadableRetryCount The minimum number of times that the sample source will retry
* if a loading error occurs. * if a loading error occurs.
*/ */
public ExtractorSampleSource(Uri uri, DataSource dataSource, Extractor extractor, public ExtractorSampleSource(Uri uri, DataSource dataSource, Extractor extractor,
int downstreamRendererCount, int requestedBufferSize, int minLoadableRetryCount) { int requestedBufferSize, int minLoadableRetryCount) {
this.uri = uri; this.uri = uri;
this.dataSource = dataSource; this.dataSource = dataSource;
this.extractor = extractor; this.extractor = extractor;
this.remainingReleaseCount = downstreamRendererCount;
this.requestedBufferSize = requestedBufferSize; this.requestedBufferSize = requestedBufferSize;
this.minLoadableRetryCount = minLoadableRetryCount; this.minLoadableRetryCount = minLoadableRetryCount;
sampleQueues = new SparseArray<>(); sampleQueues = new SparseArray<>();
...@@ -138,6 +136,12 @@ public class ExtractorSampleSource implements SampleSource, ExtractorOutput, Loa ...@@ -138,6 +136,12 @@ public class ExtractorSampleSource implements SampleSource, ExtractorOutput, Loa
} }
@Override @Override
public SampleSourceReader register() {
remainingReleaseCount++;
return this;
}
@Override
public boolean prepare(long positionUs) throws IOException { public boolean prepare(long positionUs) throws IOException {
if (prepared) { if (prepared) {
return true; return true;
...@@ -148,9 +152,6 @@ public class ExtractorSampleSource implements SampleSource, ExtractorOutput, Loa ...@@ -148,9 +152,6 @@ public class ExtractorSampleSource implements SampleSource, ExtractorOutput, Loa
continueBufferingInternal(); continueBufferingInternal();
// TODO: Support non-seekable content? Or at least avoid getting stuck here if a seekMap doesn't
// arrive (we may end up filling the sample buffers whilst we're still not prepared, and then
// getting stuck).
if (seekMap != null && tracksBuilt && haveFormatsForAllTracks()) { if (seekMap != null && tracksBuilt && haveFormatsForAllTracks()) {
int trackCount = sampleQueues.size(); int trackCount = sampleQueues.size();
trackEnabledStates = new boolean[trackCount]; trackEnabledStates = new boolean[trackCount];
......
library/src/main/java/com/google/android/exoplayer/hls/HlsSampleSource.java
...@@ -21,6 +21,7 @@ import com.google.android.exoplayer.MediaFormat; ...@@ -21,6 +21,7 @@ import com.google.android.exoplayer.MediaFormat;
import com.google.android.exoplayer.MediaFormatHolder; import com.google.android.exoplayer.MediaFormatHolder;
import com.google.android.exoplayer.SampleHolder; import com.google.android.exoplayer.SampleHolder;
import com.google.android.exoplayer.SampleSource; import com.google.android.exoplayer.SampleSource;
import com.google.android.exoplayer.SampleSource.SampleSourceReader;
import com.google.android.exoplayer.TrackInfo; import com.google.android.exoplayer.TrackInfo;
import com.google.android.exoplayer.TrackRenderer; import com.google.android.exoplayer.TrackRenderer;
import com.google.android.exoplayer.chunk.BaseChunkSampleSourceEventListener; import com.google.android.exoplayer.chunk.BaseChunkSampleSourceEventListener;
...@@ -39,7 +40,7 @@ import java.util.LinkedList; ...@@ -39,7 +40,7 @@ import java.util.LinkedList;
/** /**
* A {@link SampleSource} for HLS streams. * A {@link SampleSource} for HLS streams.
*/ */
public class HlsSampleSource implements SampleSource, Loader.Callback { public class HlsSampleSource implements SampleSource, SampleSourceReader, Loader.Callback {
/** /**
* Interface definition for a callback to be notified of {@link HlsSampleSource} events. * Interface definition for a callback to be notified of {@link HlsSampleSource} events.
...@@ -91,28 +92,24 @@ public class HlsSampleSource implements SampleSource, Loader.Callback { ...@@ -91,28 +92,24 @@ public class HlsSampleSource implements SampleSource, Loader.Callback {
private long currentLoadStartTimeMs; private long currentLoadStartTimeMs;
public HlsSampleSource(HlsChunkSource chunkSource, LoadControl loadControl, public HlsSampleSource(HlsChunkSource chunkSource, LoadControl loadControl,
int bufferSizeContribution, boolean frameAccurateSeeking, int downstreamRendererCount) { int bufferSizeContribution, boolean frameAccurateSeeking) {
this(chunkSource, loadControl, bufferSizeContribution, frameAccurateSeeking, this(chunkSource, loadControl, bufferSizeContribution, frameAccurateSeeking, null, null, 0);
downstreamRendererCount, null, null, 0);
} }
public HlsSampleSource(HlsChunkSource chunkSource, LoadControl loadControl, public HlsSampleSource(HlsChunkSource chunkSource, LoadControl loadControl,
int bufferSizeContribution, boolean frameAccurateSeeking, int downstreamRendererCount, int bufferSizeContribution, boolean frameAccurateSeeking, Handler eventHandler,
Handler eventHandler, EventListener eventListener, int eventSourceId) { EventListener eventListener, int eventSourceId) {
this(chunkSource, loadControl, bufferSizeContribution, frameAccurateSeeking, this(chunkSource, loadControl, bufferSizeContribution, frameAccurateSeeking, eventHandler,
downstreamRendererCount, eventHandler, eventListener, eventSourceId, eventListener, eventSourceId, DEFAULT_MIN_LOADABLE_RETRY_COUNT);
DEFAULT_MIN_LOADABLE_RETRY_COUNT);
} }
public HlsSampleSource(HlsChunkSource chunkSource, LoadControl loadControl, public HlsSampleSource(HlsChunkSource chunkSource, LoadControl loadControl,
int bufferSizeContribution, boolean frameAccurateSeeking, int downstreamRendererCount, int bufferSizeContribution, boolean frameAccurateSeeking, Handler eventHandler,
Handler eventHandler, EventListener eventListener, int eventSourceId, EventListener eventListener, int eventSourceId, int minLoadableRetryCount) {
int minLoadableRetryCount) {
this.chunkSource = chunkSource; this.chunkSource = chunkSource;
this.loadControl = loadControl; this.loadControl = loadControl;
this.bufferSizeContribution = bufferSizeContribution; this.bufferSizeContribution = bufferSizeContribution;
this.frameAccurateSeeking = frameAccurateSeeking; this.frameAccurateSeeking = frameAccurateSeeking;
this.remainingReleaseCount = downstreamRendererCount;
this.minLoadableRetryCount = minLoadableRetryCount; this.minLoadableRetryCount = minLoadableRetryCount;
this.eventHandler = eventHandler; this.eventHandler = eventHandler;
this.eventListener = eventListener; this.eventListener = eventListener;
...@@ -122,6 +119,12 @@ public class HlsSampleSource implements SampleSource, Loader.Callback { ...@@ -122,6 +119,12 @@ public class HlsSampleSource implements SampleSource, Loader.Callback {
} }
@Override @Override
public SampleSourceReader register() {
remainingReleaseCount++;
return this;
}
@Override
public boolean prepare(long positionUs) throws IOException { public boolean prepare(long positionUs) throws IOException {
if (prepared) { if (prepared) {
return true; return true;
......
library/src/main/java/com/google/android/exoplayer/metadata/MetadataTrackRenderer.java
...@@ -19,6 +19,7 @@ import com.google.android.exoplayer.ExoPlaybackException; ...@@ -19,6 +19,7 @@ import com.google.android.exoplayer.ExoPlaybackException;
import com.google.android.exoplayer.MediaFormatHolder; import com.google.android.exoplayer.MediaFormatHolder;
import com.google.android.exoplayer.SampleHolder; import com.google.android.exoplayer.SampleHolder;
import com.google.android.exoplayer.SampleSource; import com.google.android.exoplayer.SampleSource;
import com.google.android.exoplayer.SampleSource.SampleSourceReader;
import com.google.android.exoplayer.TrackRenderer; import com.google.android.exoplayer.TrackRenderer;
import com.google.android.exoplayer.util.Assertions; import com.google.android.exoplayer.util.Assertions;
...@@ -54,7 +55,7 @@ public class MetadataTrackRenderer<T> extends TrackRenderer implements Callback ...@@ -54,7 +55,7 @@ public class MetadataTrackRenderer<T> extends TrackRenderer implements Callback
private static final int MSG_INVOKE_RENDERER = 0; private static final int MSG_INVOKE_RENDERER = 0;
private final SampleSource source; private final SampleSourceReader source;
private final MetadataParser<T> metadataParser; private final MetadataParser<T> metadataParser;
private final MetadataRenderer<T> metadataRenderer; private final MetadataRenderer<T> metadataRenderer;
private final Handler metadataHandler; private final Handler metadataHandler;
...@@ -80,7 +81,7 @@ public class MetadataTrackRenderer<T> extends TrackRenderer implements Callback ...@@ -80,7 +81,7 @@ public class MetadataTrackRenderer<T> extends TrackRenderer implements Callback
*/ */
public MetadataTrackRenderer(SampleSource source, MetadataParser<T> metadataParser, public MetadataTrackRenderer(SampleSource source, MetadataParser<T> metadataParser,
MetadataRenderer<T> metadataRenderer, Looper metadataRendererLooper) { MetadataRenderer<T> metadataRenderer, Looper metadataRendererLooper) {
this.source = Assertions.checkNotNull(source); this.source = source.register();
this.metadataParser = Assertions.checkNotNull(metadataParser); this.metadataParser = Assertions.checkNotNull(metadataParser);
this.metadataRenderer = Assertions.checkNotNull(metadataRenderer); this.metadataRenderer = Assertions.checkNotNull(metadataRenderer);
this.metadataHandler = metadataRendererLooper == null ? null this.metadataHandler = metadataRendererLooper == null ? null
......
library/src/main/java/com/google/android/exoplayer/text/TextTrackRenderer.java
...@@ -19,6 +19,7 @@ import com.google.android.exoplayer.ExoPlaybackException; ...@@ -19,6 +19,7 @@ import com.google.android.exoplayer.ExoPlaybackException;
import com.google.android.exoplayer.MediaFormatHolder; import com.google.android.exoplayer.MediaFormatHolder;
import com.google.android.exoplayer.SampleHolder; import com.google.android.exoplayer.SampleHolder;
import com.google.android.exoplayer.SampleSource; import com.google.android.exoplayer.SampleSource;
import com.google.android.exoplayer.SampleSource.SampleSourceReader;
import com.google.android.exoplayer.TrackRenderer; import com.google.android.exoplayer.TrackRenderer;
import com.google.android.exoplayer.util.Assertions; import com.google.android.exoplayer.util.Assertions;
...@@ -44,7 +45,7 @@ public class TextTrackRenderer extends TrackRenderer implements Callback { ...@@ -44,7 +45,7 @@ public class TextTrackRenderer extends TrackRenderer implements Callback {
private final Handler textRendererHandler; private final Handler textRendererHandler;
private final TextRenderer textRenderer; private final TextRenderer textRenderer;
private final SampleSource source; private final SampleSourceReader source;
private final MediaFormatHolder formatHolder; private final MediaFormatHolder formatHolder;
private final SubtitleParser[] subtitleParsers; private final SubtitleParser[] subtitleParsers;
...@@ -73,7 +74,7 @@ public class TextTrackRenderer extends TrackRenderer implements Callback { ...@@ -73,7 +74,7 @@ public class TextTrackRenderer extends TrackRenderer implements Callback {
*/ */
public TextTrackRenderer(SampleSource source, TextRenderer textRenderer, public TextTrackRenderer(SampleSource source, TextRenderer textRenderer,
Looper textRendererLooper, SubtitleParser... subtitleParsers) { Looper textRendererLooper, SubtitleParser... subtitleParsers) {
this.source = Assertions.checkNotNull(source); this.source = source.register();
this.textRenderer = Assertions.checkNotNull(textRenderer); this.textRenderer = Assertions.checkNotNull(textRenderer);
this.textRendererHandler = textRendererLooper == null ? null this.textRendererHandler = textRendererLooper == null ? null
: new Handler(textRendererLooper, this); : new Handler(textRendererLooper, this);
......
library/src/main/java/com/google/android/exoplayer/text/eia608/Eia608TrackRenderer.java
...@@ -20,6 +20,7 @@ import com.google.android.exoplayer.ExoPlaybackException; ...@@ -20,6 +20,7 @@ import com.google.android.exoplayer.ExoPlaybackException;
import com.google.android.exoplayer.MediaFormatHolder; import com.google.android.exoplayer.MediaFormatHolder;
import com.google.android.exoplayer.SampleHolder; import com.google.android.exoplayer.SampleHolder;
import com.google.android.exoplayer.SampleSource; import com.google.android.exoplayer.SampleSource;
import com.google.android.exoplayer.SampleSource.SampleSourceReader;
import com.google.android.exoplayer.TrackRenderer; import com.google.android.exoplayer.TrackRenderer;
import com.google.android.exoplayer.text.Cue; import com.google.android.exoplayer.text.Cue;
import com.google.android.exoplayer.text.TextRenderer; import com.google.android.exoplayer.text.TextRenderer;
...@@ -52,7 +53,7 @@ public class Eia608TrackRenderer extends TrackRenderer implements Callback { ...@@ -52,7 +53,7 @@ public class Eia608TrackRenderer extends TrackRenderer implements Callback {
// The maximum duration that captions are parsed ahead of the current position. // The maximum duration that captions are parsed ahead of the current position.
private static final int MAX_SAMPLE_READAHEAD_US = 5000000; private static final int MAX_SAMPLE_READAHEAD_US = 5000000;
private final SampleSource source; private final SampleSourceReader source;
private final Eia608Parser eia608Parser; private final Eia608Parser eia608Parser;
private final TextRenderer textRenderer; private final TextRenderer textRenderer;
private final Handler textRendererHandler; private final Handler textRendererHandler;
...@@ -81,7 +82,7 @@ public class Eia608TrackRenderer extends TrackRenderer implements Callback { ...@@ -81,7 +82,7 @@ public class Eia608TrackRenderer extends TrackRenderer implements Callback {
*/ */
public Eia608TrackRenderer(SampleSource source, TextRenderer textRenderer, public Eia608TrackRenderer(SampleSource source, TextRenderer textRenderer,
Looper textRendererLooper) { Looper textRendererLooper) {
this.source = Assertions.checkNotNull(source); this.source = source.register();
this.textRenderer = Assertions.checkNotNull(textRenderer); this.textRenderer = Assertions.checkNotNull(textRenderer);
textRendererHandler = textRendererLooper == null ? null : new Handler(textRendererLooper, this); textRendererHandler = textRendererLooper == null ? null : new Handler(textRendererLooper, this);
eia608Parser = new Eia608Parser(); eia608Parser = new Eia608Parser();
......
library/src/test/java/com/google/android/exoplayer/extractor/mp4/Mp4ExtractorTest.java
...@@ -570,7 +570,7 @@ public class Mp4ExtractorTest extends TestCase { ...@@ -570,7 +570,7 @@ public class Mp4ExtractorTest extends TestCase {
@Override @Override
public void run() { public void run() {
final ExtractorSampleSource source = new ExtractorSampleSource(FAKE_URI, dataSource, final ExtractorSampleSource source = new ExtractorSampleSource(FAKE_URI, dataSource,
new Mp4Extractor(), 1, 2 * 1024 * 1024); new Mp4Extractor(), 2 * 1024 * 1024);
Looper.prepare(); Looper.prepare();
handler = new Handler() { handler = new Handler() {
......
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