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

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

Issue 11859023: NOT FOR SUBMITTING: Enable FFmpeg and VDA on Android (just for developing) Base URL: https://chromium.googlesource.com/chromium/src.git@avda-review
Patch Set: Created 7 years, 11 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/browser/gpu/gpu_data_manager_impl.cc ('k') | media/filters/ffmpeg_demuxer.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) 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/bind.h" 10 #include "base/bind.h"
(...skipping 2604 matching lines...) Expand 10 before | Expand all | Expand 10 after
2615 // TODO(wjia): when all patches related to WebMediaPlayerMS have been 2615 // TODO(wjia): when all patches related to WebMediaPlayerMS have been
2616 // landed, remove the switch. Refer to crbug.com/142988. 2616 // landed, remove the switch. Refer to crbug.com/142988.
2617 if (!cmd_line->HasSwitch(switches::kDisableWebMediaPlayerMS) && 2617 if (!cmd_line->HasSwitch(switches::kDisableWebMediaPlayerMS) &&
2618 MediaStreamImpl::CheckMediaStream(url)) { 2618 MediaStreamImpl::CheckMediaStream(url)) {
2619 EnsureMediaStreamImpl(); 2619 EnsureMediaStreamImpl();
2620 return new webkit_media::WebMediaPlayerMS( 2620 return new webkit_media::WebMediaPlayerMS(
2621 frame, client, AsWeakPtr(), media_stream_impl_, new RenderMediaLog()); 2621 frame, client, AsWeakPtr(), media_stream_impl_, new RenderMediaLog());
2622 } 2622 }
2623 #endif 2623 #endif
2624 2624
2625 #if defined(OS_ANDROID) 2625 #if 0 //defined(OS_ANDROID) XXX turning WMPA off for VDA developing.
2626 WebGraphicsContext3D* resource_context = 2626 WebGraphicsContext3D* resource_context =
2627 GetWebView()->sharedGraphicsContext3D(); 2627 GetWebView()->sharedGraphicsContext3D();
2628 2628
2629 GpuChannelHost* gpu_channel_host = 2629 GpuChannelHost* gpu_channel_host =
2630 RenderThreadImpl::current()->EstablishGpuChannelSync( 2630 RenderThreadImpl::current()->EstablishGpuChannelSync(
2631 CAUSE_FOR_GPU_LAUNCH_VIDEODECODEACCELERATOR_INITIALIZE); 2631 CAUSE_FOR_GPU_LAUNCH_VIDEODECODEACCELERATOR_INITIALIZE);
2632 if (!gpu_channel_host) { 2632 if (!gpu_channel_host) {
2633 LOG(ERROR) << "Failed to establish GPU channel for media player"; 2633 LOG(ERROR) << "Failed to establish GPU channel for media player";
2634 return NULL; 2634 return NULL;
2635 } 2635 }
(...skipping 3947 matching lines...) Expand 10 before | Expand all | Expand 10 after
6583 } 6583 }
6584 #endif 6584 #endif
6585 6585
6586 void RenderViewImpl::OnReleaseDisambiguationPopupDIB( 6586 void RenderViewImpl::OnReleaseDisambiguationPopupDIB(
6587 TransportDIB::Handle dib_handle) { 6587 TransportDIB::Handle dib_handle) {
6588 TransportDIB* dib = TransportDIB::CreateWithHandle(dib_handle); 6588 TransportDIB* dib = TransportDIB::CreateWithHandle(dib_handle);
6589 RenderProcess::current()->ReleaseTransportDIB(dib); 6589 RenderProcess::current()->ReleaseTransportDIB(dib);
6590 } 6590 }
6591 6591
6592 } // namespace content 6592 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/gpu/gpu_data_manager_impl.cc ('k') | media/filters/ffmpeg_demuxer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698