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

Side by Side Diff: content/renderer/render_view_impl.cc

Issue 12320078: Delete old RTCVideoDecoder code path. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: make the line no longer than 80 chars Created 7 years, 9 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 | « content/renderer/media/rtc_video_renderer.h ('k') | media/filters/dummy_demuxer.h » ('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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "content/renderer/render_view_impl.h" 5 #include "content/renderer/render_view_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <cmath> 8 #include <cmath>
9 9
10 #include "base/auto_reset.h" 10 #include "base/auto_reset.h"
(...skipping 2681 matching lines...) Expand 10 before | Expand all | Expand 10 after
2692 } 2692 }
2693 } 2693 }
2694 2694
2695 WebMediaPlayer* RenderViewImpl::createMediaPlayer( 2695 WebMediaPlayer* RenderViewImpl::createMediaPlayer(
2696 WebFrame* frame, const WebKit::WebURL& url, WebMediaPlayerClient* client) { 2696 WebFrame* frame, const WebKit::WebURL& url, WebMediaPlayerClient* client) {
2697 FOR_EACH_OBSERVER( 2697 FOR_EACH_OBSERVER(
2698 RenderViewObserver, observers_, WillCreateMediaPlayer(frame, client)); 2698 RenderViewObserver, observers_, WillCreateMediaPlayer(frame, client));
2699 2699
2700 const CommandLine* cmd_line = CommandLine::ForCurrentProcess(); 2700 const CommandLine* cmd_line = CommandLine::ForCurrentProcess();
2701 #if defined(ENABLE_WEBRTC) 2701 #if defined(ENABLE_WEBRTC)
2702 // TODO(wjia): when all patches related to WebMediaPlayerMS have been 2702 if (MediaStreamImpl::CheckMediaStream(url)) {
2703 // landed, remove the switch. Refer to crbug.com/142988.
2704 if (!cmd_line->HasSwitch(switches::kDisableWebMediaPlayerMS) &&
2705 MediaStreamImpl::CheckMediaStream(url)) {
2706 EnsureMediaStreamImpl(); 2703 EnsureMediaStreamImpl();
2707 return new webkit_media::WebMediaPlayerMS( 2704 return new webkit_media::WebMediaPlayerMS(
2708 frame, client, AsWeakPtr(), media_stream_impl_, new RenderMediaLog()); 2705 frame, client, AsWeakPtr(), media_stream_impl_, new RenderMediaLog());
2709 } 2706 }
2710 #endif 2707 #endif
2711 2708
2712 #if defined(OS_ANDROID) 2709 #if defined(OS_ANDROID)
2713 WebGraphicsContext3D* resource_context = 2710 WebGraphicsContext3D* resource_context =
2714 GetWebView()->sharedGraphicsContext3D(); 2711 GetWebView()->sharedGraphicsContext3D();
2715 2712
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
2778 ->message_loop()->message_loop_proxy() : 2775 ->message_loop()->message_loop_proxy() :
2779 base::MessageLoopProxy::current(); 2776 base::MessageLoopProxy::current();
2780 GpuChannelHost* gpu_channel_host = 2777 GpuChannelHost* gpu_channel_host =
2781 RenderThreadImpl::current()->EstablishGpuChannelSync( 2778 RenderThreadImpl::current()->EstablishGpuChannelSync(
2782 CAUSE_FOR_GPU_LAUNCH_VIDEODECODEACCELERATOR_INITIALIZE); 2779 CAUSE_FOR_GPU_LAUNCH_VIDEODECODEACCELERATOR_INITIALIZE);
2783 gpu_factories = new RendererGpuVideoDecoderFactories( 2780 gpu_factories = new RendererGpuVideoDecoderFactories(
2784 gpu_channel_host, factories_loop, context3d); 2781 gpu_channel_host, factories_loop, context3d);
2785 } 2782 }
2786 2783
2787 webkit_media::WebMediaPlayerParams params( 2784 webkit_media::WebMediaPlayerParams params(
2788 sink, gpu_factories, media_stream_impl_, new RenderMediaLog()); 2785 sink, gpu_factories, new RenderMediaLog());
2789 WebMediaPlayer* media_player = 2786 WebMediaPlayer* media_player =
2790 GetContentClient()->renderer()->OverrideCreateWebMediaPlayer( 2787 GetContentClient()->renderer()->OverrideCreateWebMediaPlayer(
2791 this, frame, client, AsWeakPtr(), params); 2788 this, frame, client, AsWeakPtr(), params);
2792 if (!media_player) { 2789 if (!media_player) {
2793 media_player = new webkit_media::WebMediaPlayerImpl( 2790 media_player = new webkit_media::WebMediaPlayerImpl(
2794 frame, client, AsWeakPtr(), params); 2791 frame, client, AsWeakPtr(), params);
2795 } 2792 }
2796 return media_player; 2793 return media_player;
2797 } 2794 }
2798 2795
(...skipping 3929 matching lines...) Expand 10 before | Expand all | Expand 10 after
6728 TransportDIB* dib = TransportDIB::CreateWithHandle(dib_handle); 6725 TransportDIB* dib = TransportDIB::CreateWithHandle(dib_handle);
6729 RenderProcess::current()->ReleaseTransportDIB(dib); 6726 RenderProcess::current()->ReleaseTransportDIB(dib);
6730 } 6727 }
6731 6728
6732 void RenderViewImpl::DidCommitCompositorFrame() { 6729 void RenderViewImpl::DidCommitCompositorFrame() {
6733 RenderWidget::DidCommitCompositorFrame(); 6730 RenderWidget::DidCommitCompositorFrame();
6734 FOR_EACH_OBSERVER(RenderViewObserver, observers_, DidCommitCompositorFrame()); 6731 FOR_EACH_OBSERVER(RenderViewObserver, observers_, DidCommitCompositorFrame());
6735 } 6732 }
6736 6733
6737 } // namespace content 6734 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/media/rtc_video_renderer.h ('k') | media/filters/dummy_demuxer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698