Index: media/filters/decoder_selector.cc |
diff --git a/media/filters/decoder_selector.cc b/media/filters/decoder_selector.cc |
index 44630010669a608f05243e1f1ca3a984ac7fb98b..555a411bd760f97253bbe7a64e92637aea4a06d3 100644 |
--- a/media/filters/decoder_selector.cc |
+++ b/media/filters/decoder_selector.cc |
@@ -119,11 +119,12 @@ |
} |
template <DemuxerStream::Type StreamType> |
-void DecoderSelector<StreamType>::DecryptingDecoderInitDone(bool success) { |
- DVLOG(2) << __FUNCTION__; |
- DCHECK(task_runner_->BelongsToCurrentThread()); |
- |
- if (success) { |
+void DecoderSelector<StreamType>::DecryptingDecoderInitDone( |
+ PipelineStatus status) { |
+ DVLOG(2) << __FUNCTION__; |
+ DCHECK(task_runner_->BelongsToCurrentThread()); |
+ |
+ if (status == PIPELINE_OK) { |
base::ResetAndReturn(&select_decoder_cb_) |
.Run(decoder_.Pass(), scoped_ptr<DecryptingDemuxerStream>()); |
return; |
@@ -178,11 +179,11 @@ |
} |
template <DemuxerStream::Type StreamType> |
-void DecoderSelector<StreamType>::DecoderInitDone(bool success) { |
- DVLOG(2) << __FUNCTION__; |
- DCHECK(task_runner_->BelongsToCurrentThread()); |
- |
- if (!success) { |
+void DecoderSelector<StreamType>::DecoderInitDone(PipelineStatus status) { |
+ DVLOG(2) << __FUNCTION__; |
+ DCHECK(task_runner_->BelongsToCurrentThread()); |
+ |
+ if (status != PIPELINE_OK) { |
decoder_.reset(); |
InitializeDecoder(); |
return; |