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 #2672: [media] Reset audio decoder via AudioDecoder::Reset() #2685

Merged
merged 1 commit into from
Apr 3, 2024

Conversation

cobalt-github-releaser-bot
Copy link
Collaborator

Refer to the original PR: #2672

  1. When AdaptiveAudioDecoder() resets |audio_decoder_|, use audio_decoder_->Reset() to reset |audio_decoder_|.
  2. The PR ([media] Reset audio decoder via AudioDecoder::Reset() #2501) does not clean up |resampler_| and |channel_mixer_|, which causes some tests failed on ps5. This PR cleans up |resampler_| and |channel_mixer_| in AdaptiveAudioDecoder::Reset() to fix the SbPlayerGetAudioConfigurationTest.MultipleSeeks test failures.

b/327229953

@cobalt-github-releaser-bot
Copy link
Collaborator Author

Important

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

@borongc borongc marked this pull request as ready for review March 30, 2024 20:10
borongc added a commit that referenced this pull request Mar 30, 2024
…eset() (#2685)

Refer to the original PR: #2672

1. When AdaptiveAudioDecoder() resets |audio_decoder_|, use audio_decoder_->Reset() to reset |audio_decoder_|.
2. The PR (#2501) does not clean up |resampler_| and |channel_mixer_|, which causes some tests failed on ps5. This PR cleans up |resampler_| and |channel_mixer_| in AdaptiveAudioDecoder::Reset() to fix the SbPlayerGetAudioConfigurationTest.MultipleSeeks test failures.

b/327229953
…eset() (#2685)

Refer to the original PR: #2672

1. When AdaptiveAudioDecoder() resets |audio_decoder_|, use audio_decoder_->Reset() to reset |audio_decoder_|.
2. The PR (#2501) does not clean up |resampler_| and |channel_mixer_|, which causes some tests failed on ps5. This PR cleans up |resampler_| and |channel_mixer_| in AdaptiveAudioDecoder::Reset() to fix the SbPlayerGetAudioConfigurationTest.MultipleSeeks test failures.

b/327229953
@borongc borongc force-pushed the cherry-pick-24.lts.1+-2672 branch from 7246bcb to a471ea5 Compare April 2, 2024 22:22
@borongc borongc merged commit 9a45c37 into 24.lts.1+ Apr 3, 2024
365 checks passed
@borongc borongc deleted the cherry-pick-24.lts.1+-2672 branch April 3, 2024 16:45
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.

2 participants