loliball/media
1
0
Fork 0
mirror of https://github.com/androidx/media.git synced 2025-05-05 06:30:24 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add encoding constant for AAC ER BSAC

Browse Source 
PiperOrigin-RevId: 320601157
This commit is contained in:
olly 2020-07-10 15:42:56 +01:00 committed by kim-vde
parent 33cf96cfdf
commit a0703cb716
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
library/common/src/main/java/com/google/android/exoplayer2/C.java
View File

@ -177,6 +177,7 @@ public final class C {
ENCODING_AAC_HE_V2, ENCODING_AAC_HE_V2,
ENCODING_AAC_XHE, ENCODING_AAC_XHE,
ENCODING_AAC_ELD, ENCODING_AAC_ELD,
ENCODING_AAC_ER_BSAC,
ENCODING_AC3, ENCODING_AC3,
ENCODING_E_AC3, ENCODING_E_AC3,
ENCODING_E_AC3_JOC, ENCODING_E_AC3_JOC,
@ -232,6 +233,8 @@ public final class C {
public static final int ENCODING_AAC_XHE = AudioFormat.ENCODING_AAC_XHE; public static final int ENCODING_AAC_XHE = AudioFormat.ENCODING_AAC_XHE;
/** @see AudioFormat#ENCODING_AAC_ELD */ /** @see AudioFormat#ENCODING_AAC_ELD */
public static final int ENCODING_AAC_ELD = AudioFormat.ENCODING_AAC_ELD; public static final int ENCODING_AAC_ELD = AudioFormat.ENCODING_AAC_ELD;
/** AAC Error Resilient Bit-Sliced Arithmetic Coding. */
public static final int ENCODING_AAC_ER_BSAC = 0x40000000;
/** @see AudioFormat#ENCODING_AC3 */ /** @see AudioFormat#ENCODING_AC3 */
public static final int ENCODING_AC3 = AudioFormat.ENCODING_AC3; public static final int ENCODING_AC3 = AudioFormat.ENCODING_AC3;
/** @see AudioFormat#ENCODING_E_AC3 */ /** @see AudioFormat#ENCODING_E_AC3 */

2
library/common/src/main/java/com/google/android/exoplayer2/audio/AacUtil.java
View File

@ -309,6 +309,8 @@ public final class AacUtil {
return C.ENCODING_AAC_XHE; return C.ENCODING_AAC_XHE;
case AUDIO_OBJECT_TYPE_AAC_ELD: case AUDIO_OBJECT_TYPE_AAC_ELD:
return C.ENCODING_AAC_ELD; return C.ENCODING_AAC_ELD;
case AUDIO_OBJECT_TYPE_AAC_ER_BSAC:
return C.ENCODING_AAC_ER_BSAC;
default: default:
return C.ENCODING_INVALID; return C.ENCODING_INVALID;
} }