diff options
| author | ajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-01 23:25:36 +0000 |
|---|---|---|
| committer | ajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-01 23:25:36 +0000 |
| commit | 3579c4dbb74148d4d3f0bb594a099c97811b029e (patch) | |
| tree | 5fa9f0c6a7f30f8cc6053e66995c7b96bf035648 /chrome/renderer | |
| parent | c238b694ea2c28b28c30f983e38ccf846a637234 (diff) | |
| download | chromium_src-3579c4dbb74148d4d3f0bb594a099c97811b029e.zip chromium_src-3579c4dbb74148d4d3f0bb594a099c97811b029e.tar.gz chromium_src-3579c4dbb74148d4d3f0bb594a099c97811b029e.tar.bz2 | |
Revert "Enable video in posix builds and remove unneeded ifdefs to guard windows."
This reverts commit 9c23aa9006918e7091742e1826181db081a16a65.
TBR=evan
Review URL: http://codereview.chromium.org/101020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15121 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer')
| -rw-r--r-- | chrome/renderer/render_view.cc | 6 | ||||
| -rw-r--r-- | chrome/renderer/webmediaplayer_delegate_impl.cc | 6 |
2 files changed, 12 insertions, 0 deletions
diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc index 804aff3..1236886 100644 --- a/chrome/renderer/render_view.cc +++ b/chrome/renderer/render_view.cc @@ -1877,7 +1877,13 @@ WebPluginDelegate* RenderView::CreatePluginDelegate( } webkit_glue::WebMediaPlayerDelegate* RenderView::CreateMediaPlayerDelegate() { +#if defined(OS_WIN) return new WebMediaPlayerDelegateImpl(this); +#else + // TODO(port) + NOTIMPLEMENTED(); + return NULL; +#endif } void RenderView::OnMissingPluginStatus(WebPluginDelegate* delegate, diff --git a/chrome/renderer/webmediaplayer_delegate_impl.cc b/chrome/renderer/webmediaplayer_delegate_impl.cc index 1c90a61..bfece7c 100644 --- a/chrome/renderer/webmediaplayer_delegate_impl.cc +++ b/chrome/renderer/webmediaplayer_delegate_impl.cc @@ -12,9 +12,12 @@ #include "chrome/renderer/media/video_renderer_impl.h" #include "chrome/renderer/render_view.h" #include "googleurl/src/gurl.h" +#if defined(OS_WIN) +// FFmpeg is not ready for Linux and Mac yet. #include "media/filters/ffmpeg_audio_decoder.h" #include "media/filters/ffmpeg_demuxer.h" #include "media/filters/ffmpeg_video_decoder.h" +#endif #include "media/filters/null_audio_renderer.h" #include "third_party/WebKit/WebKit/chromium/public/WebRect.h" #include "third_party/WebKit/WebKit/chromium/public/WebSize.h" @@ -63,9 +66,12 @@ WebMediaPlayerDelegateImpl::WebMediaPlayerDelegateImpl(RenderView* view) view_(view), tasks_(kLastTaskIndex) { // TODO(hclam): Add filter factory for demuxer and decoders. +#if defined(OS_WIN) + // FFmpeg is not ready for Linux and Mac yet. filter_factory_->AddFactory(media::FFmpegDemuxer::CreateFilterFactory()); filter_factory_->AddFactory(media::FFmpegAudioDecoder::CreateFactory()); filter_factory_->AddFactory(media::FFmpegVideoDecoder::CreateFactory()); +#endif if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableAudio)) { filter_factory_->AddFactory( media::NullAudioRenderer::CreateFilterFactory()); |