Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(471)

Unified Diff: media/base/android/media_decoder_job.cc

Issue 805273007: Android: Propagate sample rate change to audio decoder job (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Moved UpdateOutput() back to original location Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: media/base/android/media_decoder_job.cc
diff --git a/media/base/android/media_decoder_job.cc b/media/base/android/media_decoder_job.cc
index d96785e2121de96e6162c280da8ee3f6ef6dbdbf..d97835dc034ca837f6a435cec324d003c8d1d1e9 100644
--- a/media/base/android/media_decoder_job.cc
+++ b/media/base/android/media_decoder_job.cc
@@ -543,9 +543,10 @@ void MediaDecoderJob::OnDecodeCompleted(
}
if (status == MEDIA_CODEC_OUTPUT_FORMAT_CHANGED) {
- if (UpdateOutputFormat())
- config_changed_cb_.Run();
- status = MEDIA_CODEC_OK;
+ if (!UpdateOutputFormat(config_changed_cb_))
+ status = MEDIA_CODEC_ERROR;
+ else
+ status = MEDIA_CODEC_OK;
}
if (release_resources_pending_) {
@@ -649,10 +650,6 @@ bool MediaDecoderJob::IsCodecReconfigureNeeded(
return true;
}
-bool MediaDecoderJob::UpdateOutputFormat() {
- return false;
-}
-
void MediaDecoderJob::ReleaseMediaCodecBridge() {
if (!media_codec_bridge_)
return;

Powered by Google App Engine
This is Rietveld 408576698