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

Unified Diff: media/filters/ffmpeg_audio_decoder.cc

Issue 1143223007: media: Reland "Simplify {Audio|Video}Decoder initialization callback." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 6 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
« no previous file with comments | « media/filters/ffmpeg_audio_decoder.h ('k') | media/filters/ffmpeg_video_decoder.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/ffmpeg_audio_decoder.cc
diff --git a/media/filters/ffmpeg_audio_decoder.cc b/media/filters/ffmpeg_audio_decoder.cc
index 2f8bf1b87f796396c44aa820d3f9b8f337b8cb26..22a907b621beeb0862f49572001d6cad3da13d74 100644
--- a/media/filters/ffmpeg_audio_decoder.cc
+++ b/media/filters/ffmpeg_audio_decoder.cc
@@ -147,7 +147,7 @@ std::string FFmpegAudioDecoder::GetDisplayName() const {
}
void FFmpegAudioDecoder::Initialize(const AudioDecoderConfig& config,
- const PipelineStatusCB& status_cb,
+ const InitCB& init_cb,
const OutputCB& output_cb) {
DCHECK(task_runner_->BelongsToCurrentThread());
DCHECK(!config.is_encrypted());
@@ -155,17 +155,17 @@ void FFmpegAudioDecoder::Initialize(const AudioDecoderConfig& config,
FFmpegGlue::InitializeFFmpeg();
config_ = config;
- PipelineStatusCB initialize_cb = BindToCurrentLoop(status_cb);
+ InitCB bound_init_cb = BindToCurrentLoop(init_cb);
if (!config.IsValidConfig() || !ConfigureDecoder()) {
- initialize_cb.Run(DECODER_ERROR_NOT_SUPPORTED);
+ bound_init_cb.Run(false);
return;
}
// Success!
output_cb_ = BindToCurrentLoop(output_cb);
state_ = kNormal;
- initialize_cb.Run(PIPELINE_OK);
+ bound_init_cb.Run(true);
}
void FFmpegAudioDecoder::Decode(const scoped_refptr<DecoderBuffer>& buffer,
« no previous file with comments | « media/filters/ffmpeg_audio_decoder.h ('k') | media/filters/ffmpeg_video_decoder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698