Stop auto-generating a CEA-608 track for standalone TS

PiperOrigin-RevId: 323811839
This commit is contained in:
aquilescanta 2020-07-29 18:10:38 +01:00 committed by Oliver Woodman
parent d6ee5b84d3
commit 6d0696a3c8
39 changed files with 43 additions and 264 deletions

View File

@ -150,6 +150,10 @@
* Recreate the decoder when handling & swallowing decode errors in
`TextRenderer`
([#7590](https://github.com/google/ExoPlayer/issues/7590)).
* Stop auto-generating a CEA-608 track when playing standalone Transport
Stream files. Users that require Closed Captions tracks being
auto-generated should manually inject a customized
`DefaultTsPayloadReaderFactory` into their `TsExtractor`.
* DRM:
* Add support for attaching DRM sessions to clear content in the demo app.
* Remove `DrmSessionManager` references from all renderers.

View File

@ -23,11 +23,11 @@ import com.google.android.exoplayer2.extractor.ts.TsPayloadReader.EsInfo;
import com.google.android.exoplayer2.util.CodecSpecificDataUtil;
import com.google.android.exoplayer2.util.MimeTypes;
import com.google.android.exoplayer2.util.ParsableByteArray;
import com.google.common.collect.ImmutableList;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
/**
@ -112,10 +112,7 @@ public final class DefaultTsPayloadReaderFactory implements TsPayloadReader.Fact
* readers.
*/
public DefaultTsPayloadReaderFactory(@Flags int flags) {
this(
flags,
Collections.singletonList(
new Format.Builder().setSampleMimeType(MimeTypes.APPLICATION_CEA608).build()));
this(flags, ImmutableList.of());
}
/**

View File

@ -5,7 +5,7 @@ seekMap:
getPosition(1) = [[timeUs=1, position=0]]
getPosition(33366) = [[timeUs=33366, position=25709]]
getPosition(66733) = [[timeUs=66733, position=51606]]
numberOfTracks = 3
numberOfTracks = 2
track 256:
total output bytes = 45026
sample count = 2
@ -50,10 +50,4 @@ track 257:
time = 100822
flags = 1
data = length 1254, hash 73FB07B8
track 8448:
total output bytes = 0
sample count = 0
format 0:
id = 1/8448
sampleMimeType = application/cea-608
tracksEnded = true

View File

@ -5,7 +5,7 @@ seekMap:
getPosition(1) = [[timeUs=1, position=0]]
getPosition(33366) = [[timeUs=33366, position=25709]]
getPosition(66733) = [[timeUs=66733, position=51606]]
numberOfTracks = 3
numberOfTracks = 2
track 256:
total output bytes = 45026
sample count = 2
@ -50,10 +50,4 @@ track 257:
time = 123066
flags = 1
data = length 1254, hash 73FB07B8
track 8448:
total output bytes = 0
sample count = 0
format 0:
id = 1/8448
sampleMimeType = application/cea-608
tracksEnded = true

View File

@ -5,7 +5,7 @@ seekMap:
getPosition(1) = [[timeUs=1, position=0]]
getPosition(33366) = [[timeUs=33366, position=25709]]
getPosition(66733) = [[timeUs=66733, position=51606]]
numberOfTracks = 3
numberOfTracks = 2
track 256:
total output bytes = 45026
sample count = 2
@ -50,10 +50,4 @@ track 257:
time = 145310
flags = 1
data = length 1254, hash 73FB07B8
track 8448:
total output bytes = 0
sample count = 0
format 0:
id = 1/8448
sampleMimeType = application/cea-608
tracksEnded = true

View File

@ -5,7 +5,7 @@ seekMap:
getPosition(1) = [[timeUs=1, position=0]]
getPosition(33366) = [[timeUs=33366, position=25709]]
getPosition(66733) = [[timeUs=66733, position=51606]]
numberOfTracks = 3
numberOfTracks = 2
track 256:
total output bytes = 0
sample count = 0
@ -34,10 +34,4 @@ track 257:
time = 92855
flags = 1
data = length 1254, hash 73FB07B8
track 8448:
total output bytes = 0
sample count = 0
format 0:
id = 1/8448
sampleMimeType = application/cea-608
tracksEnded = true

View File

@ -2,7 +2,7 @@ seekMap:
isSeekable = false
duration = UNSET TIME
getPosition(0) = [[timeUs=0, position=0]]
numberOfTracks = 3
numberOfTracks = 2
track 256:
total output bytes = 45026
sample count = 2
@ -47,10 +47,4 @@ track 257:
time = 100822
flags = 1
data = length 1254, hash 73FB07B8
track 8448:
total output bytes = 0
sample count = 0
format 0:
id = 1/8448
sampleMimeType = application/cea-608
tracksEnded = true

View File

@ -5,7 +5,7 @@ seekMap:
getPosition(1) = [[timeUs=1, position=0]]
getPosition(480000) = [[timeUs=480000, position=21958]]
getPosition(960000) = [[timeUs=960000, position=44104]]
numberOfTracks = 2
numberOfTracks = 1
track 256:
total output bytes = 39002
sample count = 24
@ -112,10 +112,4 @@ track 256:
time = 920000
flags = 0
data = length 222, hash 7E77BF79
track 8448:
total output bytes = 0
sample count = 0
format 0:
id = 1/8448
sampleMimeType = application/cea-608
tracksEnded = true

View File

@ -5,7 +5,7 @@ seekMap:
getPosition(1) = [[timeUs=1, position=0]]
getPosition(480000) = [[timeUs=480000, position=21958]]
getPosition(960000) = [[timeUs=960000, position=44104]]
numberOfTracks = 2
numberOfTracks = 1
track 256:
total output bytes = 27354
sample count = 18
@ -88,10 +88,4 @@ track 256:
time = 1000000
flags = 0
data = length 222, hash 7E77BF79
track 8448:
total output bytes = 0
sample count = 0
format 0:
id = 1/8448
sampleMimeType = application/cea-608
tracksEnded = true

View File

@ -5,7 +5,7 @@ seekMap:
getPosition(1) = [[timeUs=1, position=0]]
getPosition(480000) = [[timeUs=480000, position=21958]]
getPosition(960000) = [[timeUs=960000, position=44104]]
numberOfTracks = 2
numberOfTracks = 1
track 256:
total output bytes = 13592
sample count = 8
@ -48,10 +48,4 @@ track 256:
time = 920000
flags = 0
data = length 222, hash 7E77BF79
track 8448:
total output bytes = 0
sample count = 0
format 0:
id = 1/8448
sampleMimeType = application/cea-608
tracksEnded = true

View File

@ -5,7 +5,7 @@ seekMap:
getPosition(1) = [[timeUs=1, position=0]]
getPosition(480000) = [[timeUs=480000, position=21958]]
getPosition(960000) = [[timeUs=960000, position=44104]]
numberOfTracks = 2
numberOfTracks = 1
track 256:
total output bytes = 0
sample count = 0
@ -16,10 +16,4 @@ track 256:
height = 360
initializationData:
data = length 47, hash 7696BF67
track 8448:
total output bytes = 0
sample count = 0
format 0:
id = 1/8448
sampleMimeType = application/cea-608
tracksEnded = true

View File

@ -2,7 +2,7 @@ seekMap:
isSeekable = false
duration = UNSET TIME
getPosition(0) = [[timeUs=0, position=0]]
numberOfTracks = 2
numberOfTracks = 1
track 256:
total output bytes = 39002
sample count = 24
@ -109,10 +109,4 @@ track 256:
time = 920000
flags = 0
data = length 222, hash 7E77BF79
track 8448:
total output bytes = 0
sample count = 0
format 0:
id = 1/8448
sampleMimeType = application/cea-608
tracksEnded = true

View File

@ -5,7 +5,7 @@ seekMap:
getPosition(1) = [[timeUs=1, position=0]]
getPosition(0) = [[timeUs=0, position=0]]
getPosition(0) = [[timeUs=0, position=0]]
numberOfTracks = 3
numberOfTracks = 2
track 256:
total output bytes = 13650
sample count = 2
@ -72,10 +72,4 @@ track 257:
time = 159611
flags = 1
data = length 2048, hash 88866F81
track 8448:
total output bytes = 0
sample count = 0
format 0:
id = 1/8448
sampleMimeType = application/cea-608
tracksEnded = true

View File

@ -2,7 +2,7 @@ seekMap:
isSeekable = false
duration = UNSET TIME
getPosition(0) = [[timeUs=0, position=0]]
numberOfTracks = 3
numberOfTracks = 2
track 256:
total output bytes = 13650
sample count = 2
@ -69,10 +69,4 @@ track 257:
time = 159611
flags = 1
data = length 2048, hash 88866F81
track 8448:
total output bytes = 0
sample count = 0
format 0:
id = 1/8448
sampleMimeType = application/cea-608
tracksEnded = true

View File

@ -5,7 +5,7 @@ seekMap:
getPosition(1) = [[timeUs=1, position=0]]
getPosition(33366) = [[timeUs=33366, position=9545]]
getPosition(66733) = [[timeUs=66733, position=19279]]
numberOfTracks = 3
numberOfTracks = 2
track 256:
total output bytes = 13650
sample count = 2
@ -52,10 +52,4 @@ track 257:
time = 145099
flags = 1
data = length 1254, hash 73FB07B8
track 8448:
total output bytes = 0
sample count = 0
format 0:
id = 1/8448
sampleMimeType = application/cea-608
tracksEnded = true

View File

@ -5,7 +5,7 @@ seekMap:
getPosition(1) = [[timeUs=1, position=0]]
getPosition(33366) = [[timeUs=33366, position=9545]]
getPosition(66733) = [[timeUs=66733, position=19279]]
numberOfTracks = 3
numberOfTracks = 2
track 256:
total output bytes = 13650
sample count = 2
@ -52,10 +52,4 @@ track 257:
time = 167343
flags = 1
data = length 1254, hash 73FB07B8
track 8448:
total output bytes = 0
sample count = 0
format 0:
id = 1/8448
sampleMimeType = application/cea-608
tracksEnded = true

View File

@ -5,7 +5,7 @@ seekMap:
getPosition(1) = [[timeUs=1, position=0]]
getPosition(33366) = [[timeUs=33366, position=9545]]
getPosition(66733) = [[timeUs=66733, position=19279]]
numberOfTracks = 3
numberOfTracks = 2
track 256:
total output bytes = 13650
sample count = 2
@ -52,10 +52,4 @@ track 257:
time = 189587
flags = 1
data = length 1254, hash 73FB07B8
track 8448:
total output bytes = 0
sample count = 0
format 0:
id = 1/8448
sampleMimeType = application/cea-608
tracksEnded = true

View File

@ -5,7 +5,7 @@ seekMap:
getPosition(1) = [[timeUs=1, position=0]]
getPosition(33366) = [[timeUs=33366, position=9545]]
getPosition(66733) = [[timeUs=66733, position=19279]]
numberOfTracks = 3
numberOfTracks = 2
track 256:
total output bytes = 0
sample count = 0
@ -28,10 +28,4 @@ track 257:
channelCount = 1
sampleRate = 44100
language = und
track 8448:
total output bytes = 0
sample count = 0
format 0:
id = 1/8448
sampleMimeType = application/cea-608
tracksEnded = true

View File

@ -2,7 +2,7 @@ seekMap:
isSeekable = false
duration = UNSET TIME
getPosition(0) = [[timeUs=0, position=0]]
numberOfTracks = 3
numberOfTracks = 2
track 256:
total output bytes = 13650
sample count = 2
@ -49,10 +49,4 @@ track 257:
time = 145099
flags = 1
data = length 1254, hash 73FB07B8
track 8448:
total output bytes = 0
sample count = 0
format 0:
id = 1/8448
sampleMimeType = application/cea-608
tracksEnded = true

View File

@ -5,7 +5,7 @@ seekMap:
getPosition(1) = [[timeUs=1, position=0]]
getPosition(33366) = [[timeUs=33366, position=6420]]
getPosition(66733) = [[timeUs=66733, position=13028]]
numberOfTracks = 2
numberOfTracks = 1
track 256:
total output bytes = 12451
sample count = 4
@ -34,10 +34,4 @@ track 256:
time = 133466
flags = 0
data = length 518, hash 546C177
track 8448:
total output bytes = 0
sample count = 0
format 0:
id = 1/8448
sampleMimeType = application/cea-608
tracksEnded = true

View File

@ -5,7 +5,7 @@ seekMap:
getPosition(1) = [[timeUs=1, position=0]]
getPosition(33366) = [[timeUs=33366, position=6420]]
getPosition(66733) = [[timeUs=66733, position=13028]]
numberOfTracks = 2
numberOfTracks = 1
track 256:
total output bytes = 12451
sample count = 4
@ -34,10 +34,4 @@ track 256:
time = 155710
flags = 0
data = length 518, hash 546C177
track 8448:
total output bytes = 0
sample count = 0
format 0:
id = 1/8448
sampleMimeType = application/cea-608
tracksEnded = true

View File

@ -5,7 +5,7 @@ seekMap:
getPosition(1) = [[timeUs=1, position=0]]
getPosition(33366) = [[timeUs=33366, position=6420]]
getPosition(66733) = [[timeUs=66733, position=13028]]
numberOfTracks = 2
numberOfTracks = 1
track 256:
total output bytes = 12451
sample count = 4
@ -34,10 +34,4 @@ track 256:
time = 177954
flags = 0
data = length 518, hash 546C177
track 8448:
total output bytes = 0
sample count = 0
format 0:
id = 1/8448
sampleMimeType = application/cea-608
tracksEnded = true

View File

@ -5,7 +5,7 @@ seekMap:
getPosition(1) = [[timeUs=1, position=0]]
getPosition(33366) = [[timeUs=33366, position=6420]]
getPosition(66733) = [[timeUs=66733, position=13028]]
numberOfTracks = 2
numberOfTracks = 1
track 256:
total output bytes = 255
sample count = 0
@ -18,10 +18,4 @@ track 256:
initializationData:
data = length 29, hash 4C2CAE9C
data = length 9, hash D971CD89
track 8448:
total output bytes = 0
sample count = 0
format 0:
id = 1/8448
sampleMimeType = application/cea-608
tracksEnded = true

View File

@ -2,7 +2,7 @@ seekMap:
isSeekable = false
duration = UNSET TIME
getPosition(0) = [[timeUs=0, position=0]]
numberOfTracks = 2
numberOfTracks = 1
track 256:
total output bytes = 12451
sample count = 4
@ -31,10 +31,4 @@ track 256:
time = 133466
flags = 0
data = length 518, hash 546C177
track 8448:
total output bytes = 0
sample count = 0
format 0:
id = 1/8448
sampleMimeType = application/cea-608
tracksEnded = true

View File

@ -5,7 +5,7 @@ seekMap:
getPosition(1) = [[timeUs=1, position=0]]
getPosition(450000) = [[timeUs=450000, position=11421]]
getPosition(900000) = [[timeUs=900000, position=23030]]
numberOfTracks = 2
numberOfTracks = 1
track 256:
total output bytes = 19364
sample count = 29
@ -132,10 +132,4 @@ track 256:
time = 933333
flags = 0
data = length 87, hash EEC4D98C
track 8448:
total output bytes = 0
sample count = 0
format 0:
id = 1/8448
sampleMimeType = application/cea-608
tracksEnded = true

View File

@ -5,7 +5,7 @@ seekMap:
getPosition(1) = [[timeUs=1, position=0]]
getPosition(450000) = [[timeUs=450000, position=11421]]
getPosition(900000) = [[timeUs=900000, position=23030]]
numberOfTracks = 2
numberOfTracks = 1
track 256:
total output bytes = 3806
sample count = 20
@ -96,10 +96,4 @@ track 256:
time = 933333
flags = 0
data = length 87, hash EEC4D98C
track 8448:
total output bytes = 0
sample count = 0
format 0:
id = 1/8448
sampleMimeType = application/cea-608
tracksEnded = true

View File

@ -5,7 +5,7 @@ seekMap:
getPosition(1) = [[timeUs=1, position=0]]
getPosition(450000) = [[timeUs=450000, position=11421]]
getPosition(900000) = [[timeUs=900000, position=23030]]
numberOfTracks = 2
numberOfTracks = 1
track 256:
total output bytes = 1796
sample count = 11
@ -60,10 +60,4 @@ track 256:
time = 933333
flags = 0
data = length 87, hash EEC4D98C
track 8448:
total output bytes = 0
sample count = 0
format 0:
id = 1/8448
sampleMimeType = application/cea-608
tracksEnded = true

View File

@ -5,7 +5,7 @@ seekMap:
getPosition(1) = [[timeUs=1, position=0]]
getPosition(450000) = [[timeUs=450000, position=11421]]
getPosition(900000) = [[timeUs=900000, position=23030]]
numberOfTracks = 2
numberOfTracks = 1
track 256:
total output bytes = 396
sample count = 2
@ -24,10 +24,4 @@ track 256:
time = 933333
flags = 0
data = length 87, hash EEC4D98C
track 8448:
total output bytes = 0
sample count = 0
format 0:
id = 1/8448
sampleMimeType = application/cea-608
tracksEnded = true

View File

@ -2,7 +2,7 @@ seekMap:
isSeekable = false
duration = UNSET TIME
getPosition(0) = [[timeUs=0, position=0]]
numberOfTracks = 2
numberOfTracks = 1
track 256:
total output bytes = 19364
sample count = 29
@ -129,10 +129,4 @@ track 256:
time = 933333
flags = 0
data = length 87, hash EEC4D98C
track 8448:
total output bytes = 0
sample count = 0
format 0:
id = 1/8448
sampleMimeType = application/cea-608
tracksEnded = true

View File

@ -5,7 +5,7 @@ seekMap:
getPosition(1) = [[timeUs=1, position=0]]
getPosition(33366) = [[timeUs=33366, position=25887]]
getPosition(66733) = [[timeUs=66733, position=51963]]
numberOfTracks = 4
numberOfTracks = 3
track 256:
total output bytes = 45026
sample count = 2
@ -68,10 +68,4 @@ track 600:
time = 33366
flags = 1
data = length 35, hash DFA3EF74
track 8448:
total output bytes = 0
sample count = 0
format 0:
id = 1/8448
sampleMimeType = application/cea-608
tracksEnded = true

View File

@ -5,7 +5,7 @@ seekMap:
getPosition(1) = [[timeUs=1, position=0]]
getPosition(33366) = [[timeUs=33366, position=25887]]
getPosition(66733) = [[timeUs=66733, position=51963]]
numberOfTracks = 4
numberOfTracks = 3
track 256:
total output bytes = 45026
sample count = 2
@ -68,10 +68,4 @@ track 600:
time = 55610
flags = 1
data = length 35, hash DFA3EF74
track 8448:
total output bytes = 0
sample count = 0
format 0:
id = 1/8448
sampleMimeType = application/cea-608
tracksEnded = true

View File

@ -5,7 +5,7 @@ seekMap:
getPosition(1) = [[timeUs=1, position=0]]
getPosition(33366) = [[timeUs=33366, position=25887]]
getPosition(66733) = [[timeUs=66733, position=51963]]
numberOfTracks = 4
numberOfTracks = 3
track 256:
total output bytes = 45026
sample count = 2
@ -68,10 +68,4 @@ track 600:
time = 77854
flags = 1
data = length 35, hash DFA3EF74
track 8448:
total output bytes = 0
sample count = 0
format 0:
id = 1/8448
sampleMimeType = application/cea-608
tracksEnded = true

View File

@ -5,7 +5,7 @@ seekMap:
getPosition(1) = [[timeUs=1, position=0]]
getPosition(33366) = [[timeUs=33366, position=25887]]
getPosition(66733) = [[timeUs=66733, position=51963]]
numberOfTracks = 4
numberOfTracks = 3
track 256:
total output bytes = 0
sample count = 0
@ -40,10 +40,4 @@ track 600:
format 0:
sampleMimeType = application/x-scte35
subsampleOffsetUs = -1355512
track 8448:
total output bytes = 0
sample count = 0
format 0:
id = 1/8448
sampleMimeType = application/cea-608
tracksEnded = true

View File

@ -2,7 +2,7 @@ seekMap:
isSeekable = false
duration = UNSET TIME
getPosition(0) = [[timeUs=0, position=0]]
numberOfTracks = 4
numberOfTracks = 3
track 256:
total output bytes = 45026
sample count = 2
@ -65,10 +65,4 @@ track 600:
time = 33366
flags = 1
data = length 35, hash DFA3EF74
track 8448:
total output bytes = 0
sample count = 0
format 0:
id = 1/8448
sampleMimeType = application/cea-608
tracksEnded = true

View File

@ -5,7 +5,7 @@ seekMap:
getPosition(1) = [[timeUs=1, position=0]]
getPosition(33366) = [[timeUs=33366, position=28281]]
getPosition(66733) = [[timeUs=66733, position=56751]]
numberOfTracks = 3
numberOfTracks = 2
track 256:
total output bytes = 45026
sample count = 2
@ -50,10 +50,4 @@ track 257:
time = 100822
flags = 1
data = length 1254, hash 73FB07B8
track 8448:
total output bytes = 0
sample count = 0
format 0:
id = 1/8448
sampleMimeType = application/cea-608
tracksEnded = true

View File

@ -5,7 +5,7 @@ seekMap:
getPosition(1) = [[timeUs=1, position=0]]
getPosition(33366) = [[timeUs=33366, position=28281]]
getPosition(66733) = [[timeUs=66733, position=56751]]
numberOfTracks = 3
numberOfTracks = 2
track 256:
total output bytes = 45026
sample count = 2
@ -50,10 +50,4 @@ track 257:
time = 123066
flags = 1
data = length 1254, hash 73FB07B8
track 8448:
total output bytes = 0
sample count = 0
format 0:
id = 1/8448
sampleMimeType = application/cea-608
tracksEnded = true

View File

@ -5,7 +5,7 @@ seekMap:
getPosition(1) = [[timeUs=1, position=0]]
getPosition(33366) = [[timeUs=33366, position=28281]]
getPosition(66733) = [[timeUs=66733, position=56751]]
numberOfTracks = 3
numberOfTracks = 2
track 256:
total output bytes = 45026
sample count = 2
@ -50,10 +50,4 @@ track 257:
time = 145310
flags = 1
data = length 1254, hash 73FB07B8
track 8448:
total output bytes = 0
sample count = 0
format 0:
id = 1/8448
sampleMimeType = application/cea-608
tracksEnded = true

View File

@ -5,7 +5,7 @@ seekMap:
getPosition(1) = [[timeUs=1, position=0]]
getPosition(33366) = [[timeUs=33366, position=28281]]
getPosition(66733) = [[timeUs=66733, position=56751]]
numberOfTracks = 3
numberOfTracks = 2
track 256:
total output bytes = 0
sample count = 0
@ -34,10 +34,4 @@ track 257:
time = 92855
flags = 1
data = length 1254, hash 73FB07B8
track 8448:
total output bytes = 0
sample count = 0
format 0:
id = 1/8448
sampleMimeType = application/cea-608
tracksEnded = true

View File

@ -2,7 +2,7 @@ seekMap:
isSeekable = false
duration = UNSET TIME
getPosition(0) = [[timeUs=0, position=0]]
numberOfTracks = 3
numberOfTracks = 2
track 256:
total output bytes = 45026
sample count = 2
@ -47,10 +47,4 @@ track 257:
time = 100822
flags = 1
data = length 1254, hash 73FB07B8
track 8448:
total output bytes = 0
sample count = 0
format 0:
id = 1/8448
sampleMimeType = application/cea-608
tracksEnded = true