diff options
| author | ajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-01 23:16:19 +0000 |
|---|---|---|
| committer | ajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-01 23:16:19 +0000 |
| commit | c06c86a302db8c82698b8a3cc0f92ff5b22a412b (patch) | |
| tree | 0fff52f3eac0ed3d76026ba58b41bc287e0afbb3 /chrome/renderer | |
| parent | 5a947d5adcf66fef98c357f2b63eccd84762b83b (diff) | |
| download | chromium_src-c06c86a302db8c82698b8a3cc0f92ff5b22a412b.zip chromium_src-c06c86a302db8c82698b8a3cc0f92ff5b22a412b.tar.gz chromium_src-c06c86a302db8c82698b8a3cc0f92ff5b22a412b.tar.bz2 | |
Enable video in posix builds and remove unneeded ifdefs to guard windows.
The code still crashes when trying to play a video, but this will allow debugging.
Review URL: http://codereview.chromium.org/100195
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15117 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, 0 insertions, 12 deletions
diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc index 1236886..804aff3 100644 --- a/chrome/renderer/render_view.cc +++ b/chrome/renderer/render_view.cc @@ -1877,13 +1877,7 @@ 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 bfece7c..1c90a61 100644 --- a/chrome/renderer/webmediaplayer_delegate_impl.cc +++ b/chrome/renderer/webmediaplayer_delegate_impl.cc @@ -12,12 +12,9 @@ #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" @@ -66,12 +63,9 @@ 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()); |