content/common/gpu/media/gpu_video_decode_accelerator.cc - Issue 312803002: Android media: VideoFrame should not store so many sync points.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/common/gpu/media/gpu_video_decode_accelerator.cc

Issue 312803002: Android media: VideoFrame should not store so many sync points. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Address danakj@'s concern Created 6 years, 6 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 side-by-side diff with in-line comments

Download patch

« content/browser/renderer_host/media/video_capture_controller.cc ('K') | « content/browser/renderer_host/media/video_capture_host_unittest.cc ('k') | content/common/gpu/media/video_decode_accelerator_unittest.cc » ('j') | content/common/gpu/media/video_decode_accelerator_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/common/gpu/media/gpu_video_decode_accelerator.cc

diff --git a/content/common/gpu/media/gpu_video_decode_accelerator.cc b/content/common/gpu/media/gpu_video_decode_accelerator.cc

index 0d315dae4e88cd427753086637e79888ba9f4c8f..d32628d52cd4ca133b2ad0fd3612f5b10b64ff75 100644

--- a/content/common/gpu/media/gpu_video_decode_accelerator.cc

+++ b/content/common/gpu/media/gpu_video_decode_accelerator.cc

@@ -31,7 +31,7 @@

#elif defined(OS_CHROMEOS) && defined(ARCH_CPU_ARMEL) && defined(USE_X11)

#include "content/common/gpu/media/v4l2_video_decode_accelerator.h"

#include "content/common/gpu/media/v4l2_video_device.h"

-#elif defined(OS_CHROMEOS) && defined(ARCH_CPU_X86_FAMILY) && defined(USE_X11)

+#elif defined(OS_LINUX) && defined(ARCH_CPU_X86_FAMILY) && defined(USE_X11)

danakj 2014/06/19 15:56:26 unrelated change?

dshwang 2014/06/23 18:33:20 Sorry for bothering you due to unrelated change. I

#include "content/common/gpu/media/vaapi_video_decode_accelerator.h"

#include "ui/gl/gl_context_glx.h"

#include "ui/gl/gl_implementation.h"

@@ -272,7 +272,7 @@ void GpuVideoDecodeAccelerator::Initialize(

make_context_current_,

device.Pass(),

io_message_loop_));

-#elif defined(OS_CHROMEOS) && defined(ARCH_CPU_X86_FAMILY) && defined(USE_X11)

+#elif defined(OS_LINUX) && defined(ARCH_CPU_X86_FAMILY) && defined(USE_X11)

if (gfx::GetGLImplementation() != gfx::kGLImplementationDesktopGL) {

VLOG(1) << "HW video decode acceleration not available without "

"DesktopGL (GLX).";