Commit 09471def by olly Committed by Oliver Woodman

Enabled EMSG and CEA-608 embedded streams for DASH

Issue: #2362
Issue: #2176

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=149524412
parent 99e19a92
......@@ -35,7 +35,7 @@ import com.google.android.exoplayer2.source.chunk.ChunkExtractorWrapper.TrackOut
* @param trackTypes The track types of the individual track outputs.
* @param trackOutputs The individual track outputs.
*/
public BaseMediaChunkOutput(int[] trackTypes, DefaultTrackOutput... trackOutputs) {
public BaseMediaChunkOutput(int[] trackTypes, DefaultTrackOutput[] trackOutputs) {
this.trackTypes = trackTypes;
this.trackOutputs = trackOutputs;
}
......
......@@ -185,8 +185,8 @@ import java.util.ArrayList;
int streamElementIndex = trackGroups.indexOf(selection.getTrackGroup());
SsChunkSource chunkSource = chunkSourceFactory.createChunkSource(manifestLoaderErrorThrower,
manifest, streamElementIndex, selection, trackEncryptionBoxes);
return new ChunkSampleStream<>(manifest.streamElements[streamElementIndex].type, chunkSource,
this, allocator, positionUs, minLoadableRetryCount, eventDispatcher);
return new ChunkSampleStream<>(manifest.streamElements[streamElementIndex].type, null,
chunkSource, this, allocator, positionUs, minLoadableRetryCount, eventDispatcher);
}
private static TrackGroupArray buildTrackGroups(SsManifest manifest) {
......
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