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

Improve TrueHD syncframe detection

Browse source 
Also increase the chunking size to sixteen samples.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=191768169
This commit is contained in:
andrewlewis 2018-04-05 11:09:19 -07:00 committed by Oliver Woodman
parent 6b82d1c2bd
commit 1b84544264
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
library/core/src/main/java/com/google/android/exoplayer2/audio/Ac3Util.java
View file

@ -95,7 +95,7 @@ public final class Ac3Util {
* of samples extracted from the container corresponding to one syncframe must be an integer * of samples extracted from the container corresponding to one syncframe must be an integer
* multiple of this value. * multiple of this value.
*/ */
public static final int TRUEHD_RECHUNK_SAMPLE_COUNT = 8; public static final int TRUEHD_RECHUNK_SAMPLE_COUNT = 16;
/** /**
* The number of bytes that must be parsed from a TrueHD syncframe to calculate the sample count. * The number of bytes that must be parsed from a TrueHD syncframe to calculate the sample count.
*/ */
@ -474,10 +474,11 @@ public final class Ac3Util {
*/ */
public static int parseTrueHdSyncframeAudioSampleCount(byte[] syncframe) { public static int parseTrueHdSyncframeAudioSampleCount(byte[] syncframe) {
// TODO: Link to specification if available. // TODO: Link to specification if available.
// The syncword ends 0xBA for TrueHD or 0xBB for MLP.
if (syncframe[4] != (byte) 0xF8 if (syncframe[4] != (byte) 0xF8
|| syncframe[5] != (byte) 0x72 || syncframe[5] != (byte) 0x72
|| syncframe[6] != (byte) 0x6F || syncframe[6] != (byte) 0x6F
|| syncframe[7] != (byte) 0xBA) { || (syncframe[7] & 0xFE) != 0xBA) {
return 0; return 0;
} }
return 40 << (syncframe[8] & 7); return 40 << (syncframe[8] & 7);
@ -494,7 +495,8 @@ public final class Ac3Util {
*/ */
public static int parseTrueHdSyncframeAudioSampleCount(ByteBuffer buffer) { public static int parseTrueHdSyncframeAudioSampleCount(ByteBuffer buffer) {
// TODO: Link to specification if available. // TODO: Link to specification if available.
if (buffer.getInt(buffer.position() + 4) != 0xBA6F72F8) { // The syncword ends 0xBA for TrueHD or 0xBB for MLP.
if ((buffer.getInt(buffer.position() + 4) & 0xFEFFFFFF) != 0xBA6F72F8) {
return 0; return 0;
} }
return 40 << (buffer.get(buffer.position() + 8) & 0x07); return 40 << (buffer.get(buffer.position() + 8) & 0x07);