Move rtc_video_decoder* from media/filter/ to content/renderer/media/.

media/base/pipeline_impl.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
 // TODO(scherkus): clean up PipelineImpl... too many crazy function names,
 // potential deadlocks, etc...
 
 #include "media/base/pipeline_impl.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/stl_util-inl.h"
 #include "base/synchronization/condition_variable.h"
-#include "media/filters/rtc_video_decoder.h"
 #include "media/base/clock.h"
 #include "media/base/filter_collection.h"
 #include "media/base/media_format.h"
 
 namespace media {
 
 PipelineStatusNotification::PipelineStatusNotification()
     : cv_(&lock_), status_(PIPELINE_OK), notified_(false) {
   callback_.reset(NewCallback(this, &PipelineStatusNotification::Notify));
 }
@@ skipping 55 matching lines @@
   DCHECK(!IsRunning())
       << "Init() should be called before the pipeline has started";
   ended_callback_.reset(ended_callback);
   error_callback_.reset(error_callback);
   network_callback_.reset(network_callback);
 }
 
 // Creates the PipelineInternal and calls it's start method.
 bool PipelineImpl::Start(FilterCollection* collection,
                          const std::string& url,
-                         PipelineStatusCallback* start_callback) {
+                         PipelineStatusCallback* start_callback,
+                         bool raw_video) {
   base::AutoLock auto_lock(lock_);
   scoped_ptr<PipelineStatusCallback> callback(start_callback);
   scoped_ptr<FilterCollection> filter_collection(collection);
 
   if (running_) {
     VLOG(1) << "Media pipeline is already running";
     return false;
   }
 
   if (collection->IsEmpty()) {
     return false;
   }
 
   // Kick off initialization!
   running_ = true;
   message_loop_->PostTask(
       FROM_HERE,
       NewRunnableMethod(this,
                         &PipelineImpl::StartTask,
                         filter_collection.release(),
                         url,
-                        callback.release()));
+                        callback.release(),
+                        raw_video));
   return true;
 }
 
 void PipelineImpl::Stop(PipelineStatusCallback* stop_callback) {
   base::AutoLock auto_lock(lock_);
   scoped_ptr<PipelineStatusCallback> callback(stop_callback);
   if (!running_) {
     VLOG(1) << "Media pipeline has already stopped";
     return;
   }
@@ skipping 472 matching lines @@
 void PipelineImpl::OnUpdateStatistics(const PipelineStatistics& stats) {
   base::AutoLock auto_lock(lock_);
   statistics_.audio_bytes_decoded += stats.audio_bytes_decoded;
   statistics_.video_bytes_decoded += stats.video_bytes_decoded;
   statistics_.video_frames_decoded += stats.video_frames_decoded;
   statistics_.video_frames_dropped += stats.video_frames_dropped;
 }
 
 void PipelineImpl::StartTask(FilterCollection* filter_collection,
                              const std::string& url,
-                             PipelineStatusCallback* start_callback) {
+                             PipelineStatusCallback* start_callback,
+                             bool raw_video) {
   DCHECK_EQ(MessageLoop::current(), message_loop_);
   DCHECK_EQ(kCreated, state_);
   filter_collection_.reset(filter_collection);
   url_ = url;
   seek_callback_.reset(start_callback);
 
   // Kick off initialization.
   pipeline_init_state_.reset(new PipelineInitState());
   pipeline_init_state_->composite_ = new CompositeFilter(message_loop_);
   pipeline_init_state_->composite_->set_host(this);
 
-  if (RTCVideoDecoder::IsUrlSupported(url)) {
+  if (raw_video) {

[scherkus (not reviewing), 2011/06/17 00:31:46]

this raw_video thing is kind of hacky....

can we perhaps inspect the scheme of the URL?

[acolwell GONE FROM CHROMIUM, 2011/06/24 17:11:27]

I agree. I think we could put a kRawVideoScheme string constant in pipeline.h
and use that to control this behavior. Then the code outside media/ can use it
to construct URLs to send to the pipeline.

[Ronghua, 2011/06/24 21:08:51]

Done.

[Ronghua, 2011/06/24 21:08:51]

Done.

     set_state(kInitVideoDecoder);
     InitializeVideoDecoder(NULL);
   } else {
     set_state(kInitDemuxer);
     InitializeDemuxer();
   }
 }
 
 // Main initialization method called on the pipeline thread.  This code attempts
 // to use the specified filter factory to build a pipeline.
@@ skipping 669 matching lines @@
     case kStopping:
     case kStopped:
       NOTREACHED() << "Unexpected state for teardown: " << state_;
       break;
     // default: intentionally left out to force new states to cause compiler
     // errors.
   };
 }
 
 }  // namespace media