Chromium Code Reviews| Index: content/renderer/render_view_impl.cc |
| diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc |
| index 0ded39e09108c2adcd61ffa5b44a2752b64447dc..e505274d0a8ad2f3cf96ba78cc28ccd3b3f99af6 100644 |
| --- a/content/renderer/render_view_impl.cc |
| +++ b/content/renderer/render_view_impl.cc |
| @@ -226,6 +226,11 @@ |
| #include "ui/gfx/rect_f.h" |
| #include "webkit/media/android/webmediaplayer_android.h" |
| #include "webkit/media/android/webmediaplayer_manager_android.h" |
| + |
| +#if defined(GOOGLE_TV) |
| +#include "content/renderer/media/rtc_video_decoder_bridge_tv.h" |
| +#endif |
| + |
| #elif defined(OS_WIN) |
| // TODO(port): these files are currently Windows only because they concern: |
| // * theming |
| @@ -2688,7 +2693,7 @@ WebMediaPlayer* RenderViewImpl::createMediaPlayer( |
| RenderViewObserver, observers_, WillCreateMediaPlayer(frame, client)); |
| const CommandLine* cmd_line = CommandLine::ForCurrentProcess(); |
| -#if defined(ENABLE_WEBRTC) |
| +#if defined(ENABLE_WEBRTC) && !defined(GOOGLE_TV) |
| if (MediaStreamImpl::CheckMediaStream(url)) { |
| #if defined(OS_ANDROID) && defined(ARCH_CPU_ARMEL) |
| bool found_neon = |
| @@ -2721,15 +2726,39 @@ WebMediaPlayer* RenderViewImpl::createMediaPlayer( |
| media_player_proxy_ = new WebMediaPlayerProxyImplAndroid( |
| this, media_player_manager_.get()); |
| } |
| - return new webkit_media::WebMediaPlayerAndroid( |
| - frame, |
| - client, |
| - media_player_manager_.get(), |
| - media_player_proxy_, |
| - new StreamTextureFactoryImpl( |
| - context_provider->Context3d(), gpu_channel_host, routing_id_), |
| - new RenderMediaLog()); |
| -#endif |
| + MediaStreamImpl* media_stream_impl = NULL; |
| + media::Demuxer* demuxer = NULL; |
| +#if defined(ENABLE_WEBRTC) |
| + if (MediaStreamImpl::CheckMediaStream(url)) { |
| + EnsureMediaStreamImpl(); |
| + demuxer = RTCVideoDecoderBridgeTv::Get()->CreateDemuxer( |
| + RenderThreadImpl::current()->GetMediaStreamDependencyFactory(), |
| + base::MessageLoopProxy::current()); |
| + if (demuxer) { |
| + media_stream_impl = media_stream_impl_; |
| + } else { |
| + LOG(ERROR) << "Multiple MediaStream not supported yet."; |
| + return NULL; |
| + } |
| + } |
| +#endif // defined(ENABLE_WEBRTC) |
| + webkit_media::WebMediaPlayerAndroid* web_media_player_android = |
| + new webkit_media::WebMediaPlayerAndroid( |
| + frame, |
| + client, |
| + media_player_manager_.get(), |
| + media_player_proxy_, |
| + new StreamTextureFactoryImpl( |
| + context_provider->Context3d(), gpu_channel_host, routing_id_), |
| + new RenderMediaLog(), |
| + media_stream_impl, |
| + demuxer); |
| +#if defined(GOOGLE_TV) |
| + web_media_player_android->SetDestroyDemuxerCB( |
|
ycheo (away)
2013/05/06 05:45:34
Should we run this code only if it is the media st
wonsik
2013/05/06 12:28:43
Done.
|
| + base::Bind(&RTCVideoDecoderBridgeTv::RunDestroyDemuxer)); |
| +#endif // defined(GOOGLE_TV) |
| + return web_media_player_android; |
| +#endif // defined(OS_ANDROID) |
| scoped_refptr<media::AudioRendererSink> sink; |
| if (!cmd_line->HasSwitch(switches::kDisableAudio)) { |