feat: show video track selectors on PlayerControlView #972
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
fix: code comment typos on PlayerControlView.java
microkatz
force-pushed
the
feat/showVideoTrackSelectors_playerControlView
branch
from
1208a34 to
6d010f8
Compare
|
I'm going to send this for internal review now. You may see some more commits being added as I make changes in response to review feedback. Please refrain from pushing any more substantive changes as it will complicate the internal review - thanks! |
xeinebiu
commented
Jan 26, 2024
libraries/ui/src/main/java/androidx/media3/ui/PlayerControlView.java
Outdated
Show resolved
Hide resolved
…lView # Conflicts: # .github/ISSUE_TEMPLATE/bug.yml # RELEASENOTES.md # constants.gradle # libraries/common/src/main/java/androidx/media3/common/ColorInfo.java # libraries/common/src/main/java/androidx/media3/common/MediaLibraryInfo.java # libraries/common/src/main/java/androidx/media3/common/Player.java # libraries/common/src/test/java/androidx/media3/common/FormatTest.java # libraries/common/src/test/java/androidx/media3/common/PositionInfoTest.java # libraries/datasource/src/androidTest/java/androidx/media3/datasource/RawResourceDataSourceContractTest.java # libraries/decoder_ffmpeg/src/main/java/androidx/media3/decoder/ffmpeg/ExperimentalFfmpegVideoRenderer.java # libraries/decoder_ffmpeg/src/main/java/androidx/media3/decoder/ffmpeg/FfmpegLibrary.java # libraries/decoder_ffmpeg/src/test/java/androidx/media3/decoder/ffmpeg/DefaultRenderersFactoryTest.java # libraries/decoder_midi/src/main/java/androidx/media3/decoder/midi/MidiExtractor.java # libraries/effect/src/main/java/androidx/media3/effect/DefaultVideoFrameProcessor.java # libraries/exoplayer/proguard-rules.txt # libraries/exoplayer/src/main/java/androidx/media3/exoplayer/DefaultRenderersFactory.java # libraries/exoplayer/src/main/java/androidx/media3/exoplayer/ExoPlayerImpl.java # libraries/exoplayer/src/main/java/androidx/media3/exoplayer/audio/AudioSink.java # libraries/exoplayer/src/main/java/androidx/media3/exoplayer/audio/DefaultAudioSink.java # libraries/exoplayer/src/main/java/androidx/media3/exoplayer/mediacodec/MediaCodecRenderer.java # libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/chunk/BundledChunkExtractor.java # libraries/exoplayer/src/main/java/androidx/media3/exoplayer/text/SubtitleDecoderFactory.java # libraries/exoplayer/src/main/java/androidx/media3/exoplayer/video/CompositingVideoSinkProvider.java # libraries/exoplayer/src/main/java/androidx/media3/exoplayer/video/MediaCodecVideoRenderer.java # libraries/exoplayer/src/main/java/androidx/media3/exoplayer/video/VideoSink.java # libraries/exoplayer/src/test/java/androidx/media3/exoplayer/video/CompositingVideoSinkProviderTest.java # libraries/exoplayer_dash/src/main/java/androidx/media3/exoplayer/dash/DashMediaPeriod.java # libraries/exoplayer_dash/src/main/java/androidx/media3/exoplayer/dash/DashMediaSource.java # libraries/exoplayer_dash/src/test/java/androidx/media3/exoplayer/dash/e2etest/DashPlaybackTest.java # libraries/extractor/src/main/java/androidx/media3/extractor/mp4/AtomParsers.java # libraries/lint.xml # libraries/session/src/main/java/androidx/media3/session/ConnectionState.java # libraries/session/src/main/java/androidx/media3/session/MediaNotificationManager.java # libraries/session/src/main/java/androidx/media3/session/MediaSessionImpl.java # libraries/session/src/main/java/androidx/media3/session/MediaSessionLegacyStub.java # libraries/session/src/main/java/androidx/media3/session/MediaSessionStub.java # libraries/session/src/main/java/androidx/media3/session/PlayerInfo.java # libraries/session/src/test/java/androidx/media3/session/PlayerInfoTest.java # libraries/session/src/test/java/androidx/media3/session/SessionPositionInfoTest.java # libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-jfif-segment-shortened.jpg.0.dump # libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-jfif-segment-shortened.jpg.1.dump # libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-jfif-segment-shortened.jpg.2.dump # libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-jfif-segment-shortened.jpg.3.dump # libraries/test_data/src/test/assets/extractordumps/midi/seek_test_with_non_note_events.mid.dump # libraries/test_data/src/test/assets/muxerdumps/sample_no_bframes.mp4.dump # libraries/test_data/src/test/assets/playbackdumps/ogg/bear.opus.oggOpusWithSeek.dump # libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4/with_capture_fps.dump # libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4/with_creation_time.dump # libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4/with_custom_metadata.dump # libraries/test_data/src/test/assets/transformerdumps/mp4/sample.mp4/with_location_metadata.dump # libraries/test_session_current/src/androidTest/java/androidx/media3/session/MediaSessionCallbackWithMediaControllerCompatTest.java # libraries/test_session_current/src/androidTest/java/androidx/media3/session/MediaSessionKeyEventTest.java # libraries/test_session_current/src/androidTest/java/androidx/media3/session/MediaSessionTest.java # libraries/test_session_current/src/androidTest/java/androidx/media3/session/MediaSessionWithMediaControllerCompatTest.java # libraries/test_session_current/src/androidTest/java/androidx/media3/session/MediaUtilsTest.java # libraries/transformer/src/main/java/androidx/media3/transformer/VideoSampleExporter.java
…yerControlView' into feat/showVideoTrackSelectors_playerControlView # Conflicts: # .github/ISSUE_TEMPLATE/bug.yml # RELEASENOTES.md # constants.gradle # libraries/common/src/main/java/androidx/media3/common/MediaLibraryInfo.java # libraries/effect/src/main/java/androidx/media3/effect/DefaultVideoFrameProcessor.java # libraries/exoplayer/src/main/java/androidx/media3/exoplayer/audio/DefaultAudioSink.java # libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/chunk/BundledChunkExtractor.java # libraries/exoplayer/src/main/java/androidx/media3/exoplayer/video/CompositingVideoSinkProvider.java # libraries/exoplayer/src/main/java/androidx/media3/exoplayer/video/MediaCodecVideoRenderer.java # libraries/exoplayer/src/test/java/androidx/media3/exoplayer/video/CompositingVideoSinkProviderTest.java # libraries/exoplayer_dash/src/main/java/androidx/media3/exoplayer/dash/DashMediaPeriod.java # libraries/exoplayer_dash/src/main/java/androidx/media3/exoplayer/dash/DashMediaSource.java # libraries/exoplayer_dash/src/test/java/androidx/media3/exoplayer/dash/e2etest/DashPlaybackTest.java # libraries/session/src/main/java/androidx/media3/session/MediaSessionStub.java # libraries/ui/src/main/java/androidx/media3/ui/PlayerControlView.java
…lView # Conflicts: # RELEASENOTES.md # constants.gradle # libraries/common/src/main/java/androidx/media3/common/ColorInfo.java # libraries/common/src/main/java/androidx/media3/common/MediaLibraryInfo.java # libraries/common/src/main/java/androidx/media3/common/Player.java # libraries/common/src/test/java/androidx/media3/common/FormatTest.java # libraries/common/src/test/java/androidx/media3/common/PositionInfoTest.java # libraries/datasource/src/androidTest/java/androidx/media3/datasource/RawResourceDataSourceContractTest.java # libraries/decoder_ffmpeg/src/main/java/androidx/media3/decoder/ffmpeg/ExperimentalFfmpegVideoRenderer.java # libraries/decoder_ffmpeg/src/main/java/androidx/media3/decoder/ffmpeg/FfmpegLibrary.java # libraries/decoder_ffmpeg/src/test/java/androidx/media3/decoder/ffmpeg/DefaultRenderersFactoryTest.java # libraries/decoder_midi/src/main/java/androidx/media3/decoder/midi/MidiExtractor.java # libraries/exoplayer/proguard-rules.txt # libraries/exoplayer/src/main/java/androidx/media3/exoplayer/DefaultRenderersFactory.java # libraries/exoplayer/src/main/java/androidx/media3/exoplayer/ExoPlayerImpl.java # libraries/exoplayer/src/main/java/androidx/media3/exoplayer/audio/AudioSink.java # libraries/exoplayer/src/main/java/androidx/media3/exoplayer/audio/DefaultAudioSink.java # libraries/exoplayer/src/main/java/androidx/media3/exoplayer/mediacodec/MediaCodecRenderer.java # libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/chunk/BundledChunkExtractor.java # libraries/exoplayer/src/main/java/androidx/media3/exoplayer/text/TextRenderer.java # libraries/exoplayer/src/main/java/androidx/media3/exoplayer/video/CompositingVideoSinkProvider.java # libraries/exoplayer/src/main/java/androidx/media3/exoplayer/video/MediaCodecVideoRenderer.java # libraries/exoplayer/src/main/java/androidx/media3/exoplayer/video/VideoSink.java # libraries/exoplayer/src/test/java/androidx/media3/exoplayer/video/CompositingVideoSinkProviderTest.java # libraries/exoplayer_dash/src/main/java/androidx/media3/exoplayer/dash/DashMediaPeriod.java # libraries/extractor/src/main/java/androidx/media3/extractor/mp4/BoxParser.java # libraries/lint.xml # libraries/session/src/main/java/androidx/media3/session/ConnectionState.java # libraries/session/src/main/java/androidx/media3/session/MediaNotificationManager.java # libraries/session/src/main/java/androidx/media3/session/MediaSessionImpl.java # libraries/session/src/main/java/androidx/media3/session/MediaSessionLegacyStub.java # libraries/session/src/main/java/androidx/media3/session/PlayerInfo.java # libraries/session/src/test/java/androidx/media3/session/PlayerInfoTest.java # libraries/session/src/test/java/androidx/media3/session/SessionPositionInfoTest.java # libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-jfif-segment-shortened.jpg.0.dump # libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-jfif-segment-shortened.jpg.1.dump # libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-jfif-segment-shortened.jpg.2.dump # libraries/test_data/src/test/assets/extractordumps/jpeg/pixel-motion-photo-jfif-segment-shortened.jpg.3.dump # libraries/test_data/src/test/assets/extractordumps/midi/seek_test_with_non_note_events.mid.dump # libraries/test_data/src/test/assets/extractordumps/mp4/sample_empty_track.mp4.0.dump # libraries/test_data/src/test/assets/extractordumps/mp4/sample_empty_track.mp4.reading_within_gop_sample_dependencies.0.dump # libraries/test_data/src/test/assets/extractordumps/mp4/sample_empty_track.mp4.reading_within_gop_sample_dependencies.unknown_length.dump # libraries/test_data/src/test/assets/extractordumps/mp4/sample_empty_track.mp4.unknown_length.dump # libraries/test_data/src/test/assets/muxerdumps/sample_no_bframes.mp4.dump # libraries/test_data/src/test/assets/playbackdumps/ogg/bear.opus.oggOpusWithSeek.dump # libraries/test_session_current/src/androidTest/java/androidx/media3/session/MediaSessionCallbackWithMediaControllerCompatTest.java # libraries/test_session_current/src/androidTest/java/androidx/media3/session/MediaSessionKeyEventTest.java # libraries/test_session_current/src/androidTest/java/androidx/media3/session/MediaSessionTest.java # libraries/test_session_current/src/androidTest/java/androidx/media3/session/MediaSessionWithMediaControllerCompatTest.java # libraries/test_session_current/src/androidTest/java/androidx/media3/session/MediaUtilsTest.java # libraries/transformer/src/main/java/androidx/media3/transformer/VideoSampleExporter.java
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR adds functionality on PlayerControlView to display an extra setting on SettingsPopup (Window) where user is able to select another VideoTrackSelection similar to AudioTrackSelection.