content/common/gpu/media/v4l2_slice_video_decode_accelerator.cc - Issue 1485043002: Passed is_encrypted parameter to the VDA initialization.

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

Issue 1485043002: Passed is_encrypted parameter to the VDA initialization. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Deleted erroneously added files Created 5 years, 1 month 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/gpu_video_decode_accelerator.h ('K') | « content/common/gpu/media/v4l2_slice_video_decode_accelerator.h ('k') | content/common/gpu/media/v4l2_video_decode_accelerator.h » ('j') | media/filters/gpu_video_decoder.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index a682648b7a50d21764a831ce9f68667022ed4bc8..40e1f5b006f3d91f5dd80c5208602d9b75b1c588 100644

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

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

@@ -434,7 +434,7 @@ void V4L2SliceVideoDecodeAccelerator::NotifyError(Error error) {

}

bool V4L2SliceVideoDecodeAccelerator::Initialize(

Pawel Osciak 2015/12/01 07:16:07 Initialize() should fail for VDAs that don't suppo

Tima Vaisburd 2015/12/02 02:25:07 Done.

- media::VideoCodecProfile profile,

+ const media::VideoDecodeAccelerator::InitParams& params,

Pawel Osciak 2015/12/01 07:16:07 Just "const InitParam& params" should work as well

Tima Vaisburd 2015/12/02 02:25:07 Done.

VideoDecodeAccelerator::Client* client) {

DVLOGF(3) << "profile: " << profile;

Pawel Osciak 2015/12/01 07:16:07 s/profile/params.profile/

Tima Vaisburd 2015/12/02 02:25:06 Done.

DCHECK(child_task_runner_->BelongsToCurrentThread());

@@ -444,7 +444,7 @@ bool V4L2SliceVideoDecodeAccelerator::Initialize(

new base::WeakPtrFactory<VideoDecodeAccelerator::Client>(client));

client_ = client_ptr_factory_->GetWeakPtr();

- video_profile_ = profile;

+ video_profile_ = params.profile;

xhwang 2015/12/01 07:15:02 In all non-android concrete VDAs, DCHECK that |is_

Tima Vaisburd 2015/12/02 02:25:07 Returned |false| instead as recommended by Pawel O

if (video_profile_ >= media::H264PROFILE_MIN &&

video_profile_ <= media::H264PROFILE_MAX) {