Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cherry pick PR #3988: [android] Move files in dev/cobalt/media to .../coat #4003

Merged
merged 2 commits into from
Aug 17, 2024

Conversation

cobalt-github-releaser-bot
Copy link
Collaborator

Refer to the original PR: #3988

Move platform related source code (e.g. CaptionSettings.java, CobaltMediaSession.java) from dev/cobalt/media to dev/cobalt/coat. There are no functional changes otherwise.

Some features are mostly used during video playback, like the MediaSession where the playback control and status is displayed during playback, are really platform features.

Their implementations were placed in the media/ folder due to legacy reasons. This PR move them back to the coat folder, where other platform implementations stay.

b/345542000

Move platform related source code (e.g. CaptionSettings.java,
CobaltMediaSession.java) from dev/cobalt/media to dev/cobalt/coat. There
are no functional changes otherwise.

Some features are mostly used during video playback, like the
MediaSession where the playback control and status is displayed during
playback, are really platform features.

Their implementations were placed in the media/ folder due to legacy
reasons. This PR move them back to the coat folder, where other platform
implementations stay.

b/345542000

(cherry picked from commit 2a9a01c)
@cobalt-github-releaser-bot
Copy link
Collaborator Author

Important

There were merge conflicts while cherry picking! Check out cherry-pick-24.lts.1+-3988 and fix the conflicts before proceeding. Check the log at https://github.com/youtube/cobalt/actions/runs/10410367506 for details.

@xiaomings xiaomings marked this pull request as ready for review August 15, 2024 22:18
@kaidokert kaidokert merged commit 784189c into 24.lts.1+ Aug 17, 2024
433 checks passed
@kaidokert kaidokert deleted the cherry-pick-24.lts.1+-3988 branch August 17, 2024 02:50
Copy link
Member

@kaidokert kaidokert left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@xiaomings
Copy link
Contributor

Thank you Kaido!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants