content/common/gpu/media/gpu_video_decode_accelerator.cc - Issue 852103002: Revert of Add accelerated video decoder interface, VP8 and H.264 implementations and hook up to V4L2SVDA

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 852103002: Revert of Add accelerated video decoder interface, VP8 and H.264 implementations and hook up to V4L2SVDA (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « content/common/gpu/media/generic_v4l2_video_device.h ('k') | content/common/gpu/media/gpu_video_encode_accelerator.cc » ('j') | no next file with comments »
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 89e74b1ce852200c8b799f18aaa9c5b1fe011ef1..2fc071cb0927d2fecf69a1da1f087ce9ca58ce76 100644

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

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

@@ -9,7 +9,6 @@

#include "base/bind.h"

#include "base/command_line.h"

#include "base/logging.h"

-#include "base/memory/ref_counted.h"

#include "base/message_loop/message_loop_proxy.h"

#include "base/stl_util.h"

@@ -301,14 +300,14 @@

scoped_ptr<media::VideoDecodeAccelerator> decoder;

#if defined(OS_CHROMEOS) && (defined(ARCH_CPU_ARMEL) || \

(defined(USE_OZONE) && defined(USE_V4L2_CODEC)))

- scoped_refptr<V4L2Device> device = V4L2Device::Create(V4L2Device::kDecoder);

+ scoped_ptr<V4L2Device> device = V4L2Device::Create(V4L2Device::kDecoder);

if (device.get()) {

decoder.reset(new V4L2VideoDecodeAccelerator(

gfx::GLSurfaceEGL::GetHardwareDisplay(),

stub_->decoder()->GetGLContext()->GetHandle(),

weak_factory_for_io_.GetWeakPtr(),

make_context_current_,

- device,

+ device.Pass(),

io_message_loop_));

}

#endif

« no previous file with comments | « content/common/gpu/media/generic_v4l2_video_device.h ('k') | content/common/gpu/media/gpu_video_encode_accelerator.cc » ('j') | no next file with comments »