Index: content/renderer/media/rtc_video_decoder.cc |
=================================================================== |
--- content/renderer/media/rtc_video_decoder.cc (revision 89290) |
+++ content/renderer/media/rtc_video_decoder.cc (working copy) |
@@ -2,12 +2,11 @@ |
// 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" |
@@ -15,10 +14,17 @@ |
#include "media/base/media_format.h" |
#include "media/base/video_frame.h" |
-namespace 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; |
-static const char kMediaScheme[] = "media"; |
- |
RTCVideoDecoder::RTCVideoDecoder(MessageLoop* message_loop, |
const std::string& url) |
: message_loop_(message_loop), |
@@ -54,7 +60,7 @@ |
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; |
@@ -113,7 +119,8 @@ |
// 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, |
@@ -268,10 +275,3 @@ |
return 0; |
} |
- |
-bool RTCVideoDecoder::IsUrlSupported(const std::string& url) { |
- GURL gurl(url); |
- return gurl.SchemeIs(kMediaScheme); |
-} |
- |
-} // namespace media |