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

Unified Diff: webkit/glue/webmediaplayer_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, 5 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
« no previous file with comments | « media/media.gyp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/glue/webmediaplayer_impl.cc
===================================================================
--- webkit/glue/webmediaplayer_impl.cc (revision 91577)
+++ webkit/glue/webmediaplayer_impl.cc (working copy)
@@ -20,7 +20,6 @@
#include "media/filters/ffmpeg_audio_decoder.h"
#include "media/filters/ffmpeg_demuxer_factory.h"
#include "media/filters/ffmpeg_video_decoder.h"
-#include "media/filters/rtc_video_decoder.h"
#include "media/filters/null_audio_renderer.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebRect.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebSize.h"
@@ -378,17 +377,6 @@
DCHECK(MessageLoop::current() == main_loop_);
DCHECK(proxy_);
- if (media::RTCVideoDecoder::IsUrlSupported(url.spec())) {
- // Remove the default decoder
- scoped_refptr<media::VideoDecoder> old_videodecoder;
- filter_collection_->SelectVideoDecoder(&old_videodecoder);
- media::RTCVideoDecoder* rtc_video_decoder =
- new media::RTCVideoDecoder(
- message_loop_factory_->GetMessageLoop("VideoDecoderThread"),
- url.spec());
- filter_collection_->AddVideoDecoder(rtc_video_decoder);
- }
-
if (chunk_demuxer_factory_.get() &&
chunk_demuxer_factory_->IsUrlSupported(url.spec())) {
media_data_sink_.reset(chunk_demuxer_factory_->CreateMediaDataSink());
« no previous file with comments | « media/media.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698