content/common/gpu/media/vaapi_video_decode_accelerator.cc - Issue 1846253003: Revert of Refactor content/common/gpu into gpu/ipc/service

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/vaapi_video_decode_accelerator.cc

Issue 1846253003: Revert of Refactor content/common/gpu into gpu/ipc/service (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

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

Download patch

« no previous file with comments | « content/common/gpu/media/vaapi_jpeg_decode_accelerator.cc ('k') | content/common/gpu/pass_through_image_transport_surface.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 407a20e9948ca63f858726e7f4b89f3d3e87af12..bda467b555e6a73db7415f8bdadd4d0a20135a7a 100644

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

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

@@ -14,12 +14,12 @@

#include "base/strings/string_util.h"

#include "base/synchronization/waitable_event.h"

#include "base/trace_event/trace_event.h"

+#include "content/common/gpu/gpu_channel.h"

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

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

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

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

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

-#include "gpu/ipc/service/gpu_channel.h"

#include "media/base/bind_to_current_loop.h"

#include "media/video/picture.h"

#include "third_party/libva/va/va_dec_vp8.h"