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
e0a29c84
authored
Aug 12, 2014
by
Oliver Woodman
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
Don't release AudioTrack unless we have to.
parent
4a745b1c
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
2 deletions
library/src/main/java/com/google/android/exoplayer/MediaCodecAudioTrackRenderer.java
library/src/main/java/com/google/android/exoplayer/MediaCodecAudioTrackRenderer.java
View file @
e0a29c84
...
@@ -266,8 +266,6 @@ public class MediaCodecAudioTrackRenderer extends MediaCodecTrackRenderer {
...
@@ -266,8 +266,6 @@ public class MediaCodecAudioTrackRenderer extends MediaCodecTrackRenderer {
@Override
@Override
protected
void
onOutputFormatChanged
(
MediaFormat
format
)
{
protected
void
onOutputFormatChanged
(
MediaFormat
format
)
{
releaseAudioTrack
();
this
.
sampleRate
=
format
.
getInteger
(
MediaFormat
.
KEY_SAMPLE_RATE
);
int
channelCount
=
format
.
getInteger
(
MediaFormat
.
KEY_CHANNEL_COUNT
);
int
channelCount
=
format
.
getInteger
(
MediaFormat
.
KEY_CHANNEL_COUNT
);
int
channelConfig
;
int
channelConfig
;
switch
(
channelCount
)
{
switch
(
channelCount
)
{
...
@@ -283,6 +281,16 @@ public class MediaCodecAudioTrackRenderer extends MediaCodecTrackRenderer {
...
@@ -283,6 +281,16 @@ public class MediaCodecAudioTrackRenderer extends MediaCodecTrackRenderer {
default
:
default
:
throw
new
IllegalArgumentException
(
"Unsupported channel count: "
+
channelCount
);
throw
new
IllegalArgumentException
(
"Unsupported channel count: "
+
channelCount
);
}
}
int
sampleRate
=
format
.
getInteger
(
MediaFormat
.
KEY_SAMPLE_RATE
);
if
(
audioTrack
!=
null
&&
this
.
sampleRate
==
sampleRate
&&
this
.
channelConfig
==
channelConfig
)
{
// We already have an existing audio track with the correct sample rate and channel config.
return
;
}
releaseAudioTrack
();
this
.
sampleRate
=
sampleRate
;
this
.
channelConfig
=
channelConfig
;
this
.
channelConfig
=
channelConfig
;
this
.
minBufferSize
=
AudioTrack
.
getMinBufferSize
(
sampleRate
,
channelConfig
,
this
.
minBufferSize
=
AudioTrack
.
getMinBufferSize
(
sampleRate
,
channelConfig
,
AudioFormat
.
ENCODING_PCM_16BIT
);
AudioFormat
.
ENCODING_PCM_16BIT
);
...
...
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