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

Side by Side Diff: chrome/renderer/webmediaplayer_delegate_impl.cc

Issue 100195: Enable video in linux build and remove unneeded ifdefs to guard windows. (Closed)
Patch Set: Fix inifite loop. Created 11 years, 7 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
« no previous file with comments | « chrome/renderer/render_view.cc ('k') | media/base/media_posix.cc » ('j') | 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) 2008-2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2008-2009 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 "chrome/renderer/webmediaplayer_delegate_impl.h" 5 #include "chrome/renderer/webmediaplayer_delegate_impl.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "chrome/common/chrome_switches.h" 8 #include "chrome/common/chrome_switches.h"
9 #include "chrome/renderer/media/audio_renderer_impl.h" 9 #include "chrome/renderer/media/audio_renderer_impl.h"
10 #include "chrome/renderer/media/data_source_impl.h" 10 #include "chrome/renderer/media/data_source_impl.h"
11 #include "chrome/renderer/media/buffered_data_source.h" 11 #include "chrome/renderer/media/buffered_data_source.h"
12 #include "chrome/renderer/media/video_renderer_impl.h" 12 #include "chrome/renderer/media/video_renderer_impl.h"
13 #include "chrome/renderer/render_view.h" 13 #include "chrome/renderer/render_view.h"
14 #include "googleurl/src/gurl.h" 14 #include "googleurl/src/gurl.h"
15 #if defined(OS_WIN)
16 // FFmpeg is not ready for Linux and Mac yet.
17 #include "media/filters/ffmpeg_audio_decoder.h" 15 #include "media/filters/ffmpeg_audio_decoder.h"
18 #include "media/filters/ffmpeg_demuxer.h" 16 #include "media/filters/ffmpeg_demuxer.h"
19 #include "media/filters/ffmpeg_video_decoder.h" 17 #include "media/filters/ffmpeg_video_decoder.h"
20 #endif
21 #include "media/filters/null_audio_renderer.h" 18 #include "media/filters/null_audio_renderer.h"
22 #include "third_party/WebKit/WebKit/chromium/public/WebRect.h" 19 #include "third_party/WebKit/WebKit/chromium/public/WebRect.h"
23 #include "third_party/WebKit/WebKit/chromium/public/WebSize.h" 20 #include "third_party/WebKit/WebKit/chromium/public/WebSize.h"
24 21
25 using WebKit::WebRect; 22 using WebKit::WebRect;
26 using WebKit::WebSize; 23 using WebKit::WebSize;
27 24
28 ///////////////////////////////////////////////////////////////////////////// 25 /////////////////////////////////////////////////////////////////////////////
29 // Task to be posted on main thread that fire WebMediaPlayer methods. 26 // Task to be posted on main thread that fire WebMediaPlayer methods.
30 27
(...skipping 28 matching lines...) Expand all
59 WebMediaPlayerDelegateImpl::WebMediaPlayerDelegateImpl(RenderView* view) 56 WebMediaPlayerDelegateImpl::WebMediaPlayerDelegateImpl(RenderView* view)
60 : network_state_(webkit_glue::WebMediaPlayer::EMPTY), 57 : network_state_(webkit_glue::WebMediaPlayer::EMPTY),
61 ready_state_(webkit_glue::WebMediaPlayer::HAVE_NOTHING), 58 ready_state_(webkit_glue::WebMediaPlayer::HAVE_NOTHING),
62 main_loop_(NULL), 59 main_loop_(NULL),
63 filter_factory_(new media::FilterFactoryCollection()), 60 filter_factory_(new media::FilterFactoryCollection()),
64 video_renderer_(NULL), 61 video_renderer_(NULL),
65 web_media_player_(NULL), 62 web_media_player_(NULL),
66 view_(view), 63 view_(view),
67 tasks_(kLastTaskIndex) { 64 tasks_(kLastTaskIndex) {
68 // TODO(hclam): Add filter factory for demuxer and decoders. 65 // TODO(hclam): Add filter factory for demuxer and decoders.
69 #if defined(OS_WIN)
70 // FFmpeg is not ready for Linux and Mac yet.
71 filter_factory_->AddFactory(media::FFmpegDemuxer::CreateFilterFactory()); 66 filter_factory_->AddFactory(media::FFmpegDemuxer::CreateFilterFactory());
72 filter_factory_->AddFactory(media::FFmpegAudioDecoder::CreateFactory()); 67 filter_factory_->AddFactory(media::FFmpegAudioDecoder::CreateFactory());
73 filter_factory_->AddFactory(media::FFmpegVideoDecoder::CreateFactory()); 68 filter_factory_->AddFactory(media::FFmpegVideoDecoder::CreateFactory());
74 #endif
75 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableAudio)) { 69 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableAudio)) {
76 filter_factory_->AddFactory( 70 filter_factory_->AddFactory(
77 media::NullAudioRenderer::CreateFilterFactory()); 71 media::NullAudioRenderer::CreateFilterFactory());
78 } else { 72 } else {
79 filter_factory_->AddFactory( 73 filter_factory_->AddFactory(
80 AudioRendererImpl::CreateFactory(view_->audio_message_filter())); 74 AudioRendererImpl::CreateFactory(view_->audio_message_filter()));
81 } 75 }
82 filter_factory_->AddFactory(VideoRendererImpl::CreateFactory(this)); 76 filter_factory_->AddFactory(VideoRendererImpl::CreateFactory(this));
83 filter_factory_->AddFactory(BufferedDataSource::CreateFactory(this)); 77 filter_factory_->AddFactory(BufferedDataSource::CreateFactory(this));
84 } 78 }
(...skipping 282 matching lines...) Expand 10 before | Expand all | Expand 10 after
367 if(!tasks_[index]) { 361 if(!tasks_[index]) {
368 CancelableTask* task = new NotifyWebMediaPlayerTask(this, method); 362 CancelableTask* task = new NotifyWebMediaPlayerTask(this, method);
369 tasks_[index] = task; 363 tasks_[index] = task;
370 main_loop_->PostTask(FROM_HERE, task); 364 main_loop_->PostTask(FROM_HERE, task);
371 } 365 }
372 } 366 }
373 367
374 void WebMediaPlayerDelegateImpl::PostRepaintTask() { 368 void WebMediaPlayerDelegateImpl::PostRepaintTask() {
375 PostTask(kRepaintTaskIndex, &webkit_glue::WebMediaPlayer::Repaint); 369 PostTask(kRepaintTaskIndex, &webkit_glue::WebMediaPlayer::Repaint);
376 } 370 }
OLDNEW
« no previous file with comments | « chrome/renderer/render_view.cc ('k') | media/base/media_posix.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698