Commit 65e79b3a authored by Alexandre Courbot's avatar Alexandre Courbot Committed by Commit Bot

media/gpu/v4l2: stop using VP9 pointer unions

These unions members are not part of upstream and will be removed from
our headers shortly, so use the void pointer member instead.

BUG=b:161415741
TEST=Chromium builds for arm-generic.

Change-Id: I4ac869d2cfc52d4c051e1a28e4eca2f83ec24264
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2423652
Auto-Submit: Alexandre Courbot <acourbot@chromium.org>
Commit-Queue: Fritz Koenig <frkoenig@chromium.org>
Reviewed-by: default avatarFritz Koenig <frkoenig@chromium.org>
Cr-Commit-Position: refs/heads/master@{#809830}
parent f9c5dbeb
......@@ -265,7 +265,7 @@ bool V4L2VP9Accelerator::SubmitDecode(scoped_refptr<VP9Picture> pic,
memset(&ctrl, 0, sizeof(ctrl));
ctrl.id = V4L2_CID_MPEG_VIDEO_VP9_FRAME_HDR;
ctrl.size = sizeof(v4l2_frame_hdr);
ctrl.p_vp9_frame_hdr = &v4l2_frame_hdr;
ctrl.ptr = &v4l2_frame_hdr;
ctrls.push_back(ctrl);
struct v4l2_ctrl_vp9_decode_param v4l2_decode_param;
......@@ -318,7 +318,7 @@ bool V4L2VP9Accelerator::SubmitDecode(scoped_refptr<VP9Picture> pic,
memset(&ctrl, 0, sizeof(ctrl));
ctrl.id = V4L2_CID_MPEG_VIDEO_VP9_DECODE_PARAM;
ctrl.size = sizeof(v4l2_decode_param);
ctrl.p_vp9_decode_param = &v4l2_decode_param;
ctrl.ptr = &v4l2_decode_param;
ctrls.push_back(ctrl);
// Defined outside of the if() clause below as it must remain valid until
......@@ -336,7 +336,7 @@ bool V4L2VP9Accelerator::SubmitDecode(scoped_refptr<VP9Picture> pic,
memset(&ctrl, 0, sizeof(ctrl));
ctrl.id = V4L2_CID_MPEG_VIDEO_VP9_ENTROPY;
ctrl.size = sizeof(v4l2_entropy);
ctrl.p_vp9_entropy = &v4l2_entropy;
ctrl.ptr = &v4l2_entropy;
ctrls.push_back(ctrl);
}
......@@ -382,7 +382,7 @@ bool V4L2VP9Accelerator::GetFrameContext(scoped_refptr<VP9Picture> pic,
memset(&ctrl, 0, sizeof(ctrl));
ctrl.id = V4L2_CID_MPEG_VIDEO_VP9_ENTROPY;
ctrl.size = sizeof(v4l2_entropy);
ctrl.p_vp9_entropy = &v4l2_entropy;
ctrl.ptr = &v4l2_entropy;
scoped_refptr<V4L2DecodeSurface> dec_surface =
VP9PictureToV4L2DecodeSurface(pic.get());
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment