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

Fix Ac3 extractor sniff

Browse source 
Issue:#1875

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=135100986
This commit is contained in:
aquilescanta 2016-10-04 06:57:20 -07:00 committed by Oliver Woodman
parent f2beec4c82
commit e288880aaf
2 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -15,6 +15,7 @@
*/ */
package com.google.android.exoplayer2.audio; package com.google.android.exoplayer2.audio;
import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.Format;
import com.google.android.exoplayer2.drm.DrmInitData; import com.google.android.exoplayer2.drm.DrmInitData;
import com.google.android.exoplayer2.util.MimeTypes; import com.google.android.exoplayer2.util.MimeTypes;
@ -175,9 +176,12 @@ public final class Ac3Util {
* Returns the size in bytes of the given AC-3 syncframe. * Returns the size in bytes of the given AC-3 syncframe.
* *
* @param data The syncframe to parse. * @param data The syncframe to parse.
* @return The syncframe size in bytes. * @return The syncframe size in bytes. {@link C#LENGTH_UNSET} if the input is invalid.
*/ */
public static int parseAc3SyncframeSize(byte[] data) { public static int parseAc3SyncframeSize(byte[] data) {
if (data.length < 5) {
return C.LENGTH_UNSET;
}
int fscod = (data[4] & 0xC0) >> 6; int fscod = (data[4] & 0xC0) >> 6;
int frmsizecod = data[4] & 0x3F; int frmsizecod = data[4] & 0x3F;
return getAc3SyncframeSize(fscod, frmsizecod); return getAc3SyncframeSize(fscod, frmsizecod);
@ -227,11 +231,17 @@ public final class Ac3Util {
} }
private static int getAc3SyncframeSize(int fscod, int frmsizecod) { private static int getAc3SyncframeSize(int fscod, int frmsizecod) {
int halfFrmsizecod = frmsizecod / 2;
if (fscod < 0 || fscod >= SAMPLE_RATE_BY_FSCOD.length || frmsizecod < 0
|| halfFrmsizecod >= SYNCFRAME_SIZE_WORDS_BY_HALF_FRMSIZECOD_44_1.length) {
// Invalid values provided.
return C.LENGTH_UNSET;
}
int sampleRate = SAMPLE_RATE_BY_FSCOD[fscod]; int sampleRate = SAMPLE_RATE_BY_FSCOD[fscod];
if (sampleRate == 44100) { if (sampleRate == 44100) {
return 2 * (SYNCFRAME_SIZE_WORDS_BY_HALF_FRMSIZECOD_44_1[frmsizecod / 2] + (frmsizecod % 2)); return 2 * (SYNCFRAME_SIZE_WORDS_BY_HALF_FRMSIZECOD_44_1[halfFrmsizecod] + (frmsizecod % 2));
} }
int bitrate = BITRATE_BY_HALF_FRMSIZECOD[frmsizecod / 2]; int bitrate = BITRATE_BY_HALF_FRMSIZECOD[halfFrmsizecod];
if (sampleRate == 32000) { if (sampleRate == 32000) {
return 6 * bitrate; return 6 * bitrate;
} else { // sampleRate == 48000 } else { // sampleRate == 48000

3
library/src/main/java/com/google/android/exoplayer2/extractor/ts/Ac3Extractor.java
View file

@ -107,6 +107,9 @@ public final class Ac3Extractor implements Extractor {
return true; return true;
} }
int frameSize = Ac3Util.parseAc3SyncframeSize(scratch.data); int frameSize = Ac3Util.parseAc3SyncframeSize(scratch.data);
if (frameSize == C.LENGTH_UNSET) {
return false;
}
input.advancePeekPosition(frameSize - 5); input.advancePeekPosition(frameSize - 5);
} }
} }