loliball/media3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix treating all DVB data as AC-3.

Browse Source 
Issue #434
This commit is contained in:
Oliver Woodman 2015-05-08 17:06:59 +01:00
parent 7437ee39d8
commit d8af120b98
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
library/src/main/java/com/google/android/exoplayer/extractor/ts/TsExtractor.java
View File

@ -43,7 +43,6 @@ public final class TsExtractor implements Extractor, SeekMap {
private static final int TS_STREAM_TYPE_AAC = 0x0F; private static final int TS_STREAM_TYPE_AAC = 0x0F;
private static final int TS_STREAM_TYPE_ATSC_AC3 = 0x81; private static final int TS_STREAM_TYPE_ATSC_AC3 = 0x81;
private static final int TS_STREAM_TYPE_DVB_AC3 = 0x06;
private static final int TS_STREAM_TYPE_H264 = 0x1B; private static final int TS_STREAM_TYPE_H264 = 0x1B;
private static final int TS_STREAM_TYPE_ID3 = 0x15; private static final int TS_STREAM_TYPE_ID3 = 0x15;
private static final int TS_STREAM_TYPE_EIA608 = 0x100; // 0xFF + 1 private static final int TS_STREAM_TYPE_EIA608 = 0x100; // 0xFF + 1
@ -308,13 +307,13 @@ public final class TsExtractor implements Extractor, SeekMap {
continue; continue;
} }
// TODO: Detect and read DVB AC-3 streams with Ac3Reader.
ElementaryStreamReader pesPayloadReader = null; ElementaryStreamReader pesPayloadReader = null;
switch (streamType) { switch (streamType) {
case TS_STREAM_TYPE_AAC: case TS_STREAM_TYPE_AAC:
pesPayloadReader = new AdtsReader(output.track(TS_STREAM_TYPE_AAC)); pesPayloadReader = new AdtsReader(output.track(TS_STREAM_TYPE_AAC));
break; break;
case TS_STREAM_TYPE_ATSC_AC3: case TS_STREAM_TYPE_ATSC_AC3:
case TS_STREAM_TYPE_DVB_AC3:
pesPayloadReader = new Ac3Reader(output.track(streamType)); pesPayloadReader = new Ac3Reader(output.track(streamType));
break; break;
case TS_STREAM_TYPE_H264: case TS_STREAM_TYPE_H264: