Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(863)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: media/base/pipeline_impl.cc

Issue 7193001: Move rtc_video_decoder* from media/filter/ to content/renderer/media/. (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: '' Created 9 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« media/base/pipeline.h ('K') | « media/base/pipeline.h ('k') | media/base/pipeline_impl_unittest.cc » ('j') | media/base/pipeline_impl_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/pipeline_impl.cc
===================================================================
--- media/base/pipeline_impl.cc (revision 90373)
+++ media/base/pipeline_impl.cc (working copy)
@@ -14,7 +14,7 @@
#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 "googleurl/src/gurl.h"
scherkus (not reviewing) 2011/06/24 21:33:39 media shouldn't depend on googleurl
Ronghua 2011/06/27 22:34:51 Done.
#include "media/base/clock.h"
#include "media/base/filter_collection.h"
#include "media/base/media_format.h"
@@ -617,7 +617,8 @@
pipeline_init_state_->composite_ = new CompositeFilter(message_loop_);
pipeline_init_state_->composite_->set_host(this);
- if (RTCVideoDecoder::IsUrlSupported(url)) {
+ GURL gurl(url);
+ if (gurl.SchemeIs(kRawVideoScheme)) {
scherkus (not reviewing) 2011/06/24 21:33:39 hmm... perhaps we can just do a check using std::s
Ronghua 2011/06/27 22:34:51 Done.
set_state(kInitVideoDecoder);
InitializeVideoDecoder(NULL);
} else {
« media/base/pipeline.h ('K') | « media/base/pipeline.h ('k') | media/base/pipeline_impl_unittest.cc » ('j') | media/base/pipeline_impl_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698