content/common/gpu/media/vaapi_video_encode_accelerator.h - Issue 1040513003: VAVDA: Use the new, generic video decoder and accelerator infrastructure.

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_encode_accelerator.h

Issue 1040513003: VAVDA: Use the new, generic video decoder and accelerator infrastructure. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix whitespace Created 5 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

« content/common/gpu/media/vaapi_video_decode_accelerator.cc ('K') | « content/common/gpu/media/vaapi_video_decode_accelerator.cc ('k') | content/common/gpu/media/vaapi_video_encode_accelerator.cc » ('j') | content/common/gpu/media/vaapi_video_encode_accelerator.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/common/gpu/media/vaapi_video_encode_accelerator.h

diff --git a/content/common/gpu/media/vaapi_video_encode_accelerator.h b/content/common/gpu/media/vaapi_video_encode_accelerator.h

index 51e1801d13caf265e91ccb76130bc19fc83372c9..925eeee8d2909defbe2868565bdfb3dfcb9b9ac0 100644

--- a/content/common/gpu/media/vaapi_video_encode_accelerator.h

+++ b/content/common/gpu/media/vaapi_video_encode_accelerator.h

@@ -11,8 +11,8 @@

#include "base/memory/linked_ptr.h"

#include "base/threading/thread.h"

#include "content/common/content_export.h"

+#include "content/common/gpu/media/h264_dpb.h"

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

-#include "content/common/gpu/media/vaapi_h264_dpb.h"

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

#include "media/filters/h264_bitstream_buffer.h"

#include "media/video/video_encode_accelerator.h"

@@ -210,7 +210,7 @@ class CONTENT_EXPORT VaapiVideoEncodeAccelerator

media::H264BitstreamBuffer packed_pps_;

// Picture currently being prepared for encode.

- VaapiH264Picture current_pic_;

+ scoped_refptr<H264Picture> current_pic_;

wuchengli 2015/03/30 11:02:55 why not scoped_ptr? There is only one reference to

kcwu 2015/03/31 15:20:09 Because H264Picture is ref-counted.

wuchengli 2015/04/01 05:17:38 Acknowledged.

// VA surfaces available for reuse.

std::vector<VASurfaceID> available_va_surface_ids_;