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
c1258e7e
authored
Feb 29, 2020
by
bachinger
Committed by
Oliver Woodman
Mar 10, 2020
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
add getter/setter of skipSilenceEnable to AudioComponent
PiperOrigin-RevId: 298070828
parent
67b29bbe
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
60 additions
and
7 deletions
library/core/src/main/java/com/google/android/exoplayer2/Player.java
library/core/src/main/java/com/google/android/exoplayer2/Renderer.java
library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java
library/core/src/main/java/com/google/android/exoplayer2/audio/MediaCodecAudioRenderer.java
library/core/src/main/java/com/google/android/exoplayer2/audio/SimpleDecoderAudioRenderer.java
library/core/src/main/java/com/google/android/exoplayer2/Player.java
View file @
c1258e7e
...
...
@@ -141,6 +141,16 @@ public interface Player {
/** Returns the audio volume, with 0 being silence and 1 being unity gain. */
float
getVolume
();
/**
* Sets whether skipping silences in the audio stream is enabled.
*
* @param skipSilenceEnabled Whether skipping silences in the audio stream is enabled.
*/
void
setSkipSilenceEnabled
(
boolean
skipSilenceEnabled
);
/** Returns whether skipping silences in the audio stream is enabled. */
boolean
getSkipSilenceEnabled
();
}
/** The video component of a {@link Player}. */
...
...
library/core/src/main/java/com/google/android/exoplayer2/Renderer.java
View file @
c1258e7e
...
...
@@ -126,6 +126,12 @@ public interface Renderer extends PlayerMessage.Target {
@SuppressWarnings
(
"deprecation"
)
int
MSG_SET_VIDEO_DECODER_OUTPUT_BUFFER_RENDERER
=
C
.
MSG_SET_VIDEO_DECODER_OUTPUT_BUFFER_RENDERER
;
/**
* The type of a message that can be passed to an audio renderer via {@link
* ExoPlayer#createMessage(Target)}. The message payload should be a {@link Boolean} instance
* telling whether to enable or disable skipping silences in the audio stream.
*/
int
MSG_SET_SKIP_SILENCE_ENABLED
=
101
;
/**
* Applications or extensions may define custom {@code MSG_*} constants that can be passed to
* renderers. These custom constants must be greater than or equal to this value.
*/
...
...
library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java
View file @
c1258e7e
...
...
@@ -715,6 +715,30 @@ public class SimpleExoPlayer extends BasePlayer
return
audioVolume
;
}
@Override
public
boolean
getSkipSilenceEnabled
()
{
return
skipSilenceEnabled
;
}
@Override
public
void
setSkipSilenceEnabled
(
boolean
skipSilenceEnabled
)
{
verifyApplicationThread
();
if
(
this
.
skipSilenceEnabled
==
skipSilenceEnabled
)
{
return
;
}
this
.
skipSilenceEnabled
=
skipSilenceEnabled
;
for
(
Renderer
renderer
:
renderers
)
{
if
(
renderer
.
getTrackType
()
==
C
.
TRACK_TYPE_AUDIO
)
{
player
.
createMessage
(
renderer
)
.
setType
(
Renderer
.
MSG_SET_SKIP_SILENCE_ENABLED
)
.
setPayload
(
skipSilenceEnabled
)
.
send
();
}
}
notifySkipSilenceEnabledChanged
();
}
/**
* Sets the stream type for audio playback, used by the underlying audio track.
*
...
...
@@ -1355,7 +1379,14 @@ public class SimpleExoPlayer extends BasePlayer
@Override
public
void
setPlaybackParameters
(
@Nullable
PlaybackParameters
playbackParameters
)
{
verifyApplicationThread
();
setSkipSilenceEnabled
(
playbackParameters
!=
null
&&
playbackParameters
.
skipSilence
);
boolean
newSkipSilenceEnabled
=
playbackParameters
!=
null
?
playbackParameters
.
skipSilence
:
PlaybackParameters
.
DEFAULT
.
skipSilence
;
if
(
skipSilenceEnabled
!=
newSkipSilenceEnabled
)
{
skipSilenceEnabled
=
newSkipSilenceEnabled
;
notifySkipSilenceEnabledChanged
();
}
player
.
setPlaybackParameters
(
playbackParameters
);
}
...
...
@@ -1708,11 +1739,7 @@ public class SimpleExoPlayer extends BasePlayer
}
@SuppressWarnings
(
"SuspiciousMethodCalls"
)
private
void
setSkipSilenceEnabled
(
boolean
skipSilenceEnabled
)
{
if
(
this
.
skipSilenceEnabled
==
skipSilenceEnabled
)
{
return
;
}
this
.
skipSilenceEnabled
=
skipSilenceEnabled
;
private
void
notifySkipSilenceEnabledChanged
()
{
for
(
AudioListener
listener
:
audioListeners
)
{
// Prevent duplicate notification if a listener is both a AudioRendererEventListener and
// a AudioListener, as they have the same method signature.
...
...
@@ -1882,7 +1909,11 @@ public class SimpleExoPlayer extends BasePlayer
@Override
public
void
onSkipSilenceEnabledChanged
(
boolean
skipSilenceEnabled
)
{
setSkipSilenceEnabled
(
skipSilenceEnabled
);
if
(
SimpleExoPlayer
.
this
.
skipSilenceEnabled
==
skipSilenceEnabled
)
{
return
;
}
SimpleExoPlayer
.
this
.
skipSilenceEnabled
=
skipSilenceEnabled
;
notifySkipSilenceEnabledChanged
();
}
// TextOutput implementation
...
...
library/core/src/main/java/com/google/android/exoplayer2/audio/MediaCodecAudioRenderer.java
View file @
c1258e7e
...
...
@@ -670,6 +670,9 @@ public class MediaCodecAudioRenderer extends MediaCodecRenderer implements Media
AuxEffectInfo
auxEffectInfo
=
(
AuxEffectInfo
)
message
;
audioSink
.
setAuxEffectInfo
(
auxEffectInfo
);
break
;
case
MSG_SET_SKIP_SILENCE_ENABLED:
audioSink
.
setSkipSilenceEnabled
((
Boolean
)
message
);
break
;
default
:
super
.
handleMessage
(
messageType
,
message
);
break
;
...
...
library/core/src/main/java/com/google/android/exoplayer2/audio/SimpleDecoderAudioRenderer.java
View file @
c1258e7e
...
...
@@ -560,6 +560,9 @@ public abstract class SimpleDecoderAudioRenderer extends BaseRenderer implements
AuxEffectInfo
auxEffectInfo
=
(
AuxEffectInfo
)
message
;
audioSink
.
setAuxEffectInfo
(
auxEffectInfo
);
break
;
case
MSG_SET_SKIP_SILENCE_ENABLED:
audioSink
.
setSkipSilenceEnabled
((
Boolean
)
message
);
break
;
default
:
super
.
handleMessage
(
messageType
,
message
);
break
;
...
...
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