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

Side by Side 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 unified diff | Download patch | Annotate | Revision Log
« media/media.gyp ('K') | « media/media.gyp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "webkit/glue/webmediaplayer_impl.h" 5 #include "webkit/glue/webmediaplayer_impl.h"
6 6
7 #include <limits> 7 #include <limits>
8 #include <string> 8 #include <string>
9 9
10 #include "base/callback.h" 10 #include "base/callback.h"
11 #include "base/command_line.h" 11 #include "base/command_line.h"
12 #include "media/base/composite_data_source_factory.h" 12 #include "media/base/composite_data_source_factory.h"
13 #include "media/base/filter_collection.h" 13 #include "media/base/filter_collection.h"
14 #include "media/base/limits.h" 14 #include "media/base/limits.h"
15 #include "media/base/media_format.h" 15 #include "media/base/media_format.h"
16 #include "media/base/media_switches.h" 16 #include "media/base/media_switches.h"
17 #include "media/base/pipeline_impl.h" 17 #include "media/base/pipeline_impl.h"
18 #include "media/base/video_frame.h" 18 #include "media/base/video_frame.h"
19 #include "media/filters/adaptive_demuxer.h" 19 #include "media/filters/adaptive_demuxer.h"
20 #include "media/filters/ffmpeg_audio_decoder.h" 20 #include "media/filters/ffmpeg_audio_decoder.h"
21 #include "media/filters/ffmpeg_demuxer_factory.h" 21 #include "media/filters/ffmpeg_demuxer_factory.h"
22 #include "media/filters/ffmpeg_video_decoder.h" 22 #include "media/filters/ffmpeg_video_decoder.h"
23 #include "media/filters/rtc_video_decoder.h"
24 #include "media/filters/null_audio_renderer.h" 23 #include "media/filters/null_audio_renderer.h"
25 #include "third_party/WebKit/Source/WebKit/chromium/public/WebRect.h" 24 #include "third_party/WebKit/Source/WebKit/chromium/public/WebRect.h"
26 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSize.h" 25 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSize.h"
27 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURL.h" 26 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURL.h"
28 #include "third_party/WebKit/Source/WebKit/chromium/public/WebVideoFrame.h" 27 #include "third_party/WebKit/Source/WebKit/chromium/public/WebVideoFrame.h"
29 #include "webkit/glue/media/buffered_data_source.h" 28 #include "webkit/glue/media/buffered_data_source.h"
30 #include "webkit/glue/media/simple_data_source.h" 29 #include "webkit/glue/media/simple_data_source.h"
31 #include "webkit/glue/media/video_renderer_impl.h" 30 #include "webkit/glue/media/video_renderer_impl.h"
32 #include "webkit/glue/media/web_video_renderer.h" 31 #include "webkit/glue/media/web_video_renderer.h"
33 #include "webkit/glue/webvideoframe_impl.h" 32 #include "webkit/glue/webvideoframe_impl.h"
(...skipping 332 matching lines...) Expand 10 before | Expand all | Expand 10 after
366 // event. 365 // event.
367 if (main_loop_) { 366 if (main_loop_) {
368 main_loop_->RemoveDestructionObserver(this); 367 main_loop_->RemoveDestructionObserver(this);
369 } 368 }
370 } 369 }
371 370
372 void WebMediaPlayerImpl::load(const WebKit::WebURL& url) { 371 void WebMediaPlayerImpl::load(const WebKit::WebURL& url) {
373 DCHECK(MessageLoop::current() == main_loop_); 372 DCHECK(MessageLoop::current() == main_loop_);
374 DCHECK(proxy_); 373 DCHECK(proxy_);
375 374
376 if (media::RTCVideoDecoder::IsUrlSupported(url.spec())) {
377 // Remove the default decoder
378 scoped_refptr<media::VideoDecoder> old_videodecoder;
379 filter_collection_->SelectVideoDecoder(&old_videodecoder);
380 media::RTCVideoDecoder* rtc_video_decoder =
381 new media::RTCVideoDecoder(
382 message_loop_factory_->GetMessageLoop("VideoDecoderThread"),
383 url.spec());
384 filter_collection_->AddVideoDecoder(rtc_video_decoder);
385 }
386
387 // Handle any volume changes that occured before load(). 375 // Handle any volume changes that occured before load().
388 setVolume(GetClient()->volume()); 376 setVolume(GetClient()->volume());
389 // Get the preload value. 377 // Get the preload value.
390 setPreload(GetClient()->preload()); 378 setPreload(GetClient()->preload());
391 379
392 // Initialize the pipeline. 380 // Initialize the pipeline.
393 SetNetworkState(WebKit::WebMediaPlayer::Loading); 381 SetNetworkState(WebKit::WebMediaPlayer::Loading);
394 SetReadyState(WebKit::WebMediaPlayer::HaveNothing); 382 SetReadyState(WebKit::WebMediaPlayer::HaveNothing);
395 pipeline_->Start( 383 pipeline_->Start(
396 filter_collection_.release(), 384 filter_collection_.release(),
(...skipping 529 matching lines...) Expand 10 before | Expand all | Expand 10 after
926 } 914 }
927 } 915 }
928 916
929 WebKit::WebMediaPlayerClient* WebMediaPlayerImpl::GetClient() { 917 WebKit::WebMediaPlayerClient* WebMediaPlayerImpl::GetClient() {
930 DCHECK(MessageLoop::current() == main_loop_); 918 DCHECK(MessageLoop::current() == main_loop_);
931 DCHECK(client_); 919 DCHECK(client_);
932 return client_; 920 return client_;
933 } 921 }
934 922
935 } // namespace webkit_glue 923 } // namespace webkit_glue
OLDNEW
« media/media.gyp ('K') | « media/media.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698