Cherry pick PR #9691: android: Prevent use of media_codec_bridge_ in callbacks#10031
Merged
jasonzhangxx merged 2 commits intomainfrom Apr 14, 2026
Merged
Cherry pick PR #9691: android: Prevent use of media_codec_bridge_ in callbacks#10031jasonzhangxx merged 2 commits intomainfrom
jasonzhangxx merged 2 commits intomainfrom
Conversation
Avoid a potential race condition during MediaDecoder destruction. Remove the usage of `media_codec_bridge_` in `OnMediaCodecOutputFormatChanged`, which was only used for logging purposes. This prevents a crash if the callback is invoked after the bridge has been destroyed. Bug: 495444400 (cherry picked from commit e771967)
Collaborator
Author
|
Caution There were merge conflicts while cherry picking! Check out cherry-pick-main-9691 and fix the conflicts before proceeding. Check the log at https://github.com/youtube/cobalt/actions/runs/24421637693 for details. |
Contributor
🤖 Gemini Suggested Commit Message💡 Pro Tips for a Better Commit Message:
|
![gemini-code-assist[bot]](https://avatars.githubusercontent.com/in/956858?s=60&v=4){kind=small}
kjyoun
approved these changes
Apr 14, 2026
cobalt-github-releaser-bot
added a commit
that referenced
this pull request
Apr 15, 2026
…media_codec_bridge_ in callbacks Refer to original PR: #10031 Refer to the original PR: #9691 Avoid a potential race condition during MediaDecoder destruction. Remove the usage of `media_codec_bridge_` in `OnMediaCodecOutputFormatChanged`, which was only used for logging purposes. This prevents a crash if the callback is invoked after the bridge has been destroyed. Bug: 495444400 --------- Co-authored-by: Jason <jasonzh@google.com> (cherry picked from commit cd91608)
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Refer to the original PR: #9691
Avoid a potential race condition during MediaDecoder destruction. Remove the
usage of
media_codec_bridge_inOnMediaCodecOutputFormatChanged,which was only used for logging purposes. This prevents a crash if the callback
is invoked after the bridge has been destroyed.
Bug: 495444400