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

content/renderer/media/rtc_video_decoder.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.
 
-#include "media/filters/rtc_video_decoder.h"
+#include "content/renderer/media/rtc_video_decoder.h"
 
 #include <deque>
 
 #include "base/task.h"
-#include "googleurl/src/gurl.h"
 #include "media/base/callback.h"
 #include "media/base/filter_host.h"
 #include "media/base/filters.h"
 #include "media/base/limits.h"
 #include "media/base/media_format.h"
 #include "media/base/video_frame.h"
 
-namespace media {
-
-static const char kMediaScheme[] = "media";
+using media::DemuxerStream;
+using media::FilterCallback;
+using media::FilterStatusCB;
+using media::kNoTimestamp;
+using media::Limits;
+using media::MediaFormat;
+using media::PIPELINE_OK;
+using media::StatisticsCallback;
+using media::VideoDecoder;
+using media::VideoFrame;
 
 RTCVideoDecoder::RTCVideoDecoder(MessageLoop* message_loop,
                                  const std::string& url)
     : message_loop_(message_loop),
       width_(176),
       height_(144),
       url_(url),
       state_(kUnInitialized) {
 }
 
@@ skipping 16 matching lines @@
   DCHECK_EQ(MessageLoop::current(), message_loop_);
 
   lock_.Acquire();
   frame_queue_available_.clear();
   lock_.Release();
   media_format_.SetAsInteger(MediaFormat::kWidth, width_);
   media_format_.SetAsInteger(MediaFormat::kHeight, height_);
   media_format_.SetAsInteger(MediaFormat::kSurfaceType,
                              static_cast<int>(VideoFrame::YV12));
   media_format_.SetAsInteger(MediaFormat::kSurfaceFormat,
-                             static_cast<int>(VideoFrame::TYPE_SYSTEM_MEMORY));
+      static_cast<int>(VideoFrame::TYPE_SYSTEM_MEMORY));

[scherkus (not reviewing), 2011/06/29 00:39:28]

why was this changed?

[Ronghua, 2011/06/29 20:36:39]

Done.

 
   state_ = kNormal;
 
   filter_callback->Run();
   delete filter_callback;
 
   // TODO(acolwell): Implement stats.
   delete stat_callback;
 }
 
@@ skipping 38 matching lines @@
 
   DCHECK_EQ(MessageLoop::current(), message_loop_);
 
   state_ = kStopped;
 
   VideoDecoder::Stop(callback);
 
   // TODO(ronghuawu): Stop rtc
 }
 
-void RTCVideoDecoder::Seek(base::TimeDelta time, const FilterStatusCB& cb) {
+void RTCVideoDecoder::Seek(base::TimeDelta time,
+    const FilterStatusCB& cb) {

[scherkus (not reviewing), 2011/06/29 00:39:28]

why was this dropped to next line?

[Ronghua, 2011/06/29 20:36:39]

Done.

   if (MessageLoop::current() != message_loop_) {
      message_loop_->PostTask(FROM_HERE,
                              NewRunnableMethod(this, &RTCVideoDecoder::Seek,
                                                time, cb));
      return;
   }
 
   DCHECK_EQ(MessageLoop::current(), message_loop_);
 
   state_ = kSeeking;
@@ skipping 134 matching lines @@
         FROM_HERE,
         NewRunnableMethod(this,
                           &RTCVideoDecoder::VideoFrameReady,
                           video_frame));
   } else {
     VideoFrameReady(video_frame);
   }
 
   return 0;
 }
-
-bool RTCVideoDecoder::IsUrlSupported(const std::string& url) {
-  GURL gurl(url);
-  return gurl.SchemeIs(kMediaScheme);
-}
-
-}  // namespace media