sjs/media
1
0
Fork 0
mirror of https://github.com/samsonjs/media.git synced 2026-04-27 15:07:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1105 from IanDBird/eac3-fixes

Browse source 
Improve identification of (E)AC3 content in MPEGTS and tweak EAC3 parsing
This commit is contained in:
Andrew Lewis 2016-01-04 13:27:52 +00:00
commit 6eea4bdbc3
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
library/src/main/java/com/google/android/exoplayer/extractor/ts/TsExtractor.java
View file

@ -392,7 +392,14 @@ public final class TsExtractor implements Extractor {
streamType = TS_STREAM_TYPE_H265; streamType = TS_STREAM_TYPE_H265;
} }
break; 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.skipBytes(descriptorLength);
} }
data.setPosition(descriptorsEndPosition); data.setPosition(descriptorsEndPosition);

2
library/src/main/java/com/google/android/exoplayer/util/Ac3Util.java
View file

@ -152,7 +152,7 @@ public final class Ac3Util {
*/ */
public static MediaFormat parseEac3SyncframeFormat(ParsableBitArray data, String trackId, public static MediaFormat parseEac3SyncframeFormat(ParsableBitArray data, String trackId,
long durationUs, String language) { 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 sampleRate;
int fscod = data.readBits(2); int fscod = data.readBits(2);
if (fscod == 3) { if (fscod == 3) {