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
93c9e93a
authored
Jul 14, 2020
by
ibaker
Committed by
Oliver Woodman
Jul 24, 2020
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
Migrate usages of renderer constants in C.java to the Renderer ones
PiperOrigin-RevId: 321157794
parent
49db15ef
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
39 additions
and
33 deletions
extensions/av1/README.md
extensions/vp9/README.md
extensions/vp9/src/androidTest/java/com/google/android/exoplayer2/ext/vp9/VpxPlaybackTest.java
library/common/src/main/java/com/google/android/exoplayer2/audio/AudioAttributes.java
library/core/src/main/java/com/google/android/exoplayer2/Player.java
library/core/src/test/java/com/google/android/exoplayer2/ExoPlayerTest.java
extensions/av1/README.md
View file @
93c9e93a
...
...
@@ -109,19 +109,22 @@ To try out playback using the extension in the [demo application][], see
There are two possibilities for rendering the output
`Libgav1VideoRenderer`
gets from the libgav1 decoder:
*
GL rendering using GL shader for color space conversion
*
If you are using
`SimpleExoPlayer`
with
`PlayerView`
, enable this option by
setting
`surface_type`
of
`PlayerView`
to be
`video_decoder_gl_surface_view`
.
*
Otherwise, enable this option by sending
`Libgav1VideoRenderer`
a message
of type
`C.MSG_SET_VIDEO_DECODER_OUTPUT_BUFFER_RENDERER`
with an instance of
`VideoDecoderOutputBufferRenderer`
as its object.
*
Native rendering using
`ANativeWindow`
*
If you are using
`SimpleExoPlayer`
with
`PlayerView`
, this option is enabled
by default.
*
Otherwise, enable this option by sending
`Libgav1VideoRenderer`
a message of
type
`C.MSG_SET_SURFACE`
with an instance of
`SurfaceView`
as its object.
*
GL rendering using GL shader for color space conversion
* If you are using `SimpleExoPlayer` with `PlayerView`, enable this option
by setting `surface_type` of `PlayerView` to be
`video_decoder_gl_surface_view`.
* Otherwise, enable this option by sending `Libgav1VideoRenderer` a
message of type `Renderer.MSG_SET_VIDEO_DECODER_OUTPUT_BUFFER_RENDERER`
with an instance of `VideoDecoderOutputBufferRenderer` as its object.
*
Native rendering using
`ANativeWindow`
* If you are using `SimpleExoPlayer` with `PlayerView`, this option is
enabled by default.
* Otherwise, enable this option by sending `Libgav1VideoRenderer` a
message of type `Renderer.MSG_SET_SURFACE` with an instance of
`SurfaceView` as its object.
Note: Although the default option uses
`ANativeWindow`
, based on our testing the
GL rendering mode has better performance, so should be preferred
...
...
extensions/vp9/README.md
View file @
93c9e93a
...
...
@@ -126,19 +126,22 @@ To try out playback using the extension in the [demo application][], see
There are two possibilities for rendering the output
`LibvpxVideoRenderer`
gets from the libvpx decoder:
*
GL rendering using GL shader for color space conversion
*
If you are using
`SimpleExoPlayer`
with
`PlayerView`
, enable this option by
setting
`surface_type`
of
`PlayerView`
to be
`video_decoder_gl_surface_view`
.
*
Otherwise, enable this option by sending
`LibvpxVideoRenderer`
a message of
type
`C.MSG_SET_VIDEO_DECODER_OUTPUT_BUFFER_RENDERER`
with an instance of
`VideoDecoderOutputBufferRenderer`
as its object.
*
Native rendering using
`ANativeWindow`
*
If you are using
`SimpleExoPlayer`
with
`PlayerView`
, this option is enabled
by default.
*
Otherwise, enable this option by sending
`LibvpxVideoRenderer`
a message of
type
`C.MSG_SET_SURFACE`
with an instance of
`SurfaceView`
as its object.
*
GL rendering using GL shader for color space conversion
* If you are using `SimpleExoPlayer` with `PlayerView`, enable this option
by setting `surface_type` of `PlayerView` to be
`video_decoder_gl_surface_view`.
* Otherwise, enable this option by sending `LibvpxVideoRenderer` a message
of type `Renderer.MSG_SET_VIDEO_DECODER_OUTPUT_BUFFER_RENDERER` with an
instance of `VideoDecoderOutputBufferRenderer` as its object.
*
Native rendering using
`ANativeWindow`
* If you are using `SimpleExoPlayer` with `PlayerView`, this option is
enabled by default.
* Otherwise, enable this option by sending `LibvpxVideoRenderer` a message
of type `Renderer.MSG_SET_SURFACE` with an instance of `SurfaceView` as
its object.
Note: Although the default option uses
`ANativeWindow`
, based on our testing the
GL rendering mode has better performance, so should be preferred.
...
...
extensions/vp9/src/androidTest/java/com/google/android/exoplayer2/ext/vp9/VpxPlaybackTest.java
View file @
93c9e93a
...
...
@@ -24,11 +24,11 @@ import android.os.Looper;
import
androidx.annotation.Nullable
;
import
androidx.test.core.app.ApplicationProvider
;
import
androidx.test.ext.junit.runners.AndroidJUnit4
;
import
com.google.android.exoplayer2.C
;
import
com.google.android.exoplayer2.ExoPlaybackException
;
import
com.google.android.exoplayer2.ExoPlayer
;
import
com.google.android.exoplayer2.MediaItem
;
import
com.google.android.exoplayer2.Player
;
import
com.google.android.exoplayer2.Renderer
;
import
com.google.android.exoplayer2.extractor.mkv.MatroskaExtractor
;
import
com.google.android.exoplayer2.source.MediaSource
;
import
com.google.android.exoplayer2.source.ProgressiveMediaSource
;
...
...
@@ -125,7 +125,7 @@ public class VpxPlaybackTest {
.
createMediaSource
(
MediaItem
.
fromUri
(
uri
));
player
.
createMessage
(
videoRenderer
)
.
setType
(
C
.
MSG_SET_VIDEO_DECODER_OUTPUT_BUFFER_RENDERER
)
.
setType
(
Renderer
.
MSG_SET_VIDEO_DECODER_OUTPUT_BUFFER_RENDERER
)
.
setPayload
(
new
VideoDecoderGLSurfaceView
(
context
).
getVideoDecoderOutputBufferRenderer
())
.
send
();
player
.
setMediaSource
(
mediaSource
);
...
...
library/common/src/main/java/com/google/android/exoplayer2/audio/AudioAttributes.java
View file @
93c9e93a
...
...
@@ -25,7 +25,7 @@ import com.google.android.exoplayer2.util.Util;
* android.media.AudioTrack}.
*
* <p>To set the audio attributes, create an instance using the {@link Builder} and either pass it
* to the player or send a message of type {@
link C
#MSG_SET_AUDIO_ATTRIBUTES} to the audio
* to the player or send a message of type {@
code Renderer
#MSG_SET_AUDIO_ATTRIBUTES} to the audio
* renderers.
*
* <p>This class is based on {@link android.media.AudioAttributes}, but can be used on all supported
...
...
library/core/src/main/java/com/google/android/exoplayer2/Player.java
View file @
93c9e93a
...
...
@@ -311,9 +311,9 @@ public interface Player {
/**
* Sets the video decoder output buffer renderer. This is intended for use only with extension
* renderers that accept {@link
C#MSG_SET_VIDEO_DECODER_OUTPUT_BUFFER_RENDERER}. For most use
*
cases, an output surface or view should be passed via {@link #setVideoSurface(Surface)} or
* {@link #setVideoSurfaceView(SurfaceView)} instead.
* renderers that accept {@link
Renderer#MSG_SET_VIDEO_DECODER_OUTPUT_BUFFER_RENDERER}. For most
*
use cases, an output surface or view should be passed via {@link #setVideoSurface(Surface)}
*
or
{@link #setVideoSurfaceView(SurfaceView)} instead.
*
* @param videoDecoderOutputBufferRenderer The video decoder output buffer renderer, or {@code
* null} to clear the output buffer renderer.
...
...
library/core/src/test/java/com/google/android/exoplayer2/ExoPlayerTest.java
View file @
93c9e93a
...
...
@@ -2443,7 +2443,7 @@ public final class ExoPlayerTest {
.
start
()
.
blockUntilActionScheduleFinished
(
TIMEOUT_MS
)
.
blockUntilEnded
(
TIMEOUT_MS
);
assertThat
(
Collections
.
frequency
(
rendererMessages
,
C
.
MSG_SET_SURFACE
)).
isEqualTo
(
2
);
assertThat
(
Collections
.
frequency
(
rendererMessages
,
Renderer
.
MSG_SET_SURFACE
)).
isEqualTo
(
2
);
}
@Test
...
...
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