Revert 113895 - <video> decode in hardware!

media/base/pipeline_impl.cc

Index: media/base/pipeline_impl.cc
===================================================================
--- media/base/pipeline_impl.cc	(revision 113907)
+++ media/base/pipeline_impl.cc	(working copy)
@@ -586,10 +586,10 @@
 }
 
 // Called from any thread.
-void PipelineImpl::OnFilterInitialize(PipelineStatus status) {
+void PipelineImpl::OnFilterInitialize() {
   // Continue the initialize task by proceeding to the next stage.
-  message_loop_->PostTask(
-      FROM_HERE, base::Bind(&PipelineImpl::InitializeTask, this, status));
+  message_loop_->PostTask(FROM_HERE,
+      base::Bind(&PipelineImpl::InitializeTask, this));
 }
 
 // Called from any thread.
@@ -661,21 +661,9 @@
 // TODO(hclam): InitializeTask() is now starting the pipeline asynchronously. It
 // works like a big state change table. If we no longer need to start filters
 // in order, we need to get rid of all the state change.
-void PipelineImpl::InitializeTask(PipelineStatus last_stage_status) {
+void PipelineImpl::InitializeTask() {
   DCHECK_EQ(MessageLoop::current(), message_loop_);
 
-  if (last_stage_status != PIPELINE_OK) {
-    // Currently only VideoDecoders have a recoverable error code.
-    if (state_ == kInitVideoDecoder &&
-        last_stage_status == DECODER_ERROR_NOT_SUPPORTED) {
-      pipeline_init_state_->composite_->RemoveFilter(
-          pipeline_init_state_->video_decoder_.get());
-      state_ = kInitAudioRenderer;
-    } else {
-      SetError(last_stage_status);
-    }
-  }
-
   // If we have received the stop or error signal, return immediately.
   if (IsPipelineStopPending() || IsPipelineStopped() || !IsPipelineOk())
     return;
@@ -1123,8 +1111,10 @@
 
 bool PipelineImpl::PrepareFilter(scoped_refptr<Filter> filter) {
   bool ret = pipeline_init_state_->composite_->AddFilter(filter.get());
-  if (!ret)
+
+  if (!ret) {
     SetError(PIPELINE_ERROR_INITIALIZATION_FAILED);
+  }
   return ret;
 }
 
@@ -1165,7 +1155,7 @@
     clock_->SetTime(demuxer_->GetStartTime());
   }
 
-  OnFilterInitialize(PIPELINE_OK);
+  OnFilterInitialize();
 }
 
 bool PipelineImpl::InitializeAudioDecoder(
@@ -1193,7 +1183,7 @@
   pipeline_init_state_->audio_decoder_ = audio_decoder;
   audio_decoder->Initialize(
       stream,
-      base::Bind(&PipelineImpl::OnFilterInitialize, this, PIPELINE_OK),
+      base::Bind(&PipelineImpl::OnFilterInitialize, this),
       base::Bind(&PipelineImpl::OnUpdateStatistics, this));
   return true;
 }
@@ -1250,7 +1240,7 @@
 
   audio_renderer_->Initialize(
       decoder,
-      base::Bind(&PipelineImpl::OnFilterInitialize, this, PIPELINE_OK),
+      base::Bind(&PipelineImpl::OnFilterInitialize, this),
       base::Bind(&PipelineImpl::OnAudioUnderflow, this));
   return true;
 }
@@ -1274,7 +1264,7 @@
 
   video_renderer_->Initialize(
       decoder,
-      base::Bind(&PipelineImpl::OnFilterInitialize, this, PIPELINE_OK),
+      base::Bind(&PipelineImpl::OnFilterInitialize, this),
       base::Bind(&PipelineImpl::OnUpdateStatistics, this));
   return true;
 }
Property changes on: media/base/pipeline_impl.cc
___________________________________________________________________
Added: svn:mergeinfo