From e33345e5b80074f7c960ace0b1055ebc83c6f0dd Mon Sep 17 00:00:00 2001 From: Ian Bird Date: Mon, 4 Jan 2016 08:58:57 +0000 Subject: [PATCH 1/2] Add support to identify (E)AC3 streams via TS descriptor tag --- .../google/android/exoplayer/extractor/ts/TsExtractor.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/library/src/main/java/com/google/android/exoplayer/extractor/ts/TsExtractor.java b/library/src/main/java/com/google/android/exoplayer/extractor/ts/TsExtractor.java index 1227e801a2..728197c6ab 100644 --- a/library/src/main/java/com/google/android/exoplayer/extractor/ts/TsExtractor.java +++ b/library/src/main/java/com/google/android/exoplayer/extractor/ts/TsExtractor.java @@ -392,7 +392,14 @@ public final class TsExtractor implements Extractor { streamType = TS_STREAM_TYPE_H265; } break; + } else if (descriptorTag == 0x6a) { + streamType = TS_STREAM_TYPE_AC3; + } else if (descriptorTag == 0x7a) { + streamType = TS_STREAM_TYPE_E_AC3; + } else if (descriptorTag == 0x7b) { + // TODO: TS_STREAM_TYPE_DTS; } + data.skipBytes(descriptorLength); } data.setPosition(descriptorsEndPosition); From 2b1816c1f286fa29770008c1a24b6173062e4477 Mon Sep 17 00:00:00 2001 From: Ian Bird Date: Mon, 4 Jan 2016 08:59:36 +0000 Subject: [PATCH 2/2] Skip substream id field when parsing EAC3 sync frame format --- .../main/java/com/google/android/exoplayer/util/Ac3Util.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/src/main/java/com/google/android/exoplayer/util/Ac3Util.java b/library/src/main/java/com/google/android/exoplayer/util/Ac3Util.java index 72062a51ac..ac28222015 100644 --- a/library/src/main/java/com/google/android/exoplayer/util/Ac3Util.java +++ b/library/src/main/java/com/google/android/exoplayer/util/Ac3Util.java @@ -152,7 +152,7 @@ public final class Ac3Util { */ public static MediaFormat parseEac3SyncframeFormat(ParsableBitArray data, String trackId, long durationUs, String language) { - data.skipBits(16 + 2 + 11); // syncword, strmtype, frmsiz + data.skipBits(16 + 2 + 3 + 11); // syncword, strmtype, strmid, frmsiz int sampleRate; int fscod = data.readBits(2); if (fscod == 3) {