Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
SDK
/
exoplayer
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
a0703cb7
authored
Jul 10, 2020
by
olly
Committed by
kim-vde
Jul 13, 2020
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
Add encoding constant for AAC ER BSAC
PiperOrigin-RevId: 320601157
parent
33cf96cf
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
0 deletions
library/common/src/main/java/com/google/android/exoplayer2/C.java
library/common/src/main/java/com/google/android/exoplayer2/audio/AacUtil.java
library/common/src/main/java/com/google/android/exoplayer2/C.java
View file @
a0703cb7
...
@@ -177,6 +177,7 @@ public final class C {
...
@@ -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 {
...
@@ -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 */
...
...
library/common/src/main/java/com/google/android/exoplayer2/audio/AacUtil.java
View file @
a0703cb7
...
@@ -309,6 +309,8 @@ public final class AacUtil {
...
@@ -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
;
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment