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
e66d0c90
authored
Mar 03, 2022
by
andrewlewis
Committed by
Ian Baker
Mar 07, 2022
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
Fix E-AC3 output capability check without sample rate
#minor-release PiperOrigin-RevId: 432189509
parent
540f2061
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
1 deletions
RELEASENOTES.md
library/core/src/main/java/com/google/android/exoplayer2/audio/DefaultAudioSink.java
RELEASENOTES.md
View file @
e66d0c90
...
...
@@ -15,6 +15,9 @@
*
Track selection:
*
Flatten
`TrackSelectionOverrides`
class into
`TrackSelectionParameters`
,
and promote
`TrackSelectionOverride`
to a top level class.
*
Audio:
*
Fix error checking audio capabilities for Dolby Atmos (E-AC3-JOC) in
HLS.
*
Extractors:
*
Matroska: Parse
`DiscardPadding`
for Opus tracks.
*
FMP4: Fix issue where emsg sample metadata could be output in the wrong
...
...
library/core/src/main/java/com/google/android/exoplayer2/audio/DefaultAudioSink.java
View file @
e66d0c90
...
...
@@ -1736,8 +1736,11 @@ public final class DefaultAudioSink implements AudioSink {
// the channel count for this encoding, but before then there is no way to query it so we
// assume 6 channel audio is supported.
if
(
Util
.
SDK_INT
>=
29
)
{
// Default to 48 kHz if the format doesn't have a sample rate (for example, for chunkless
// HLS preparation). See [Internal: b/222127949].
int
sampleRate
=
format
.
sampleRate
!=
Format
.
NO_VALUE
?
format
.
sampleRate
:
48000
;
channelCount
=
getMaxSupportedChannelCountForPassthroughV29
(
C
.
ENCODING_E_AC3_JOC
,
format
.
sampleRate
);
getMaxSupportedChannelCountForPassthroughV29
(
C
.
ENCODING_E_AC3_JOC
,
sampleRate
);
if
(
channelCount
==
0
)
{
Log
.
w
(
TAG
,
"E-AC3 JOC encoding supported but no channel count supported"
);
return
null
;
...
...
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