Skip to content

media/hevc_d: Fix old-style bit_size handling support #7366

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jc-kynesim wants to merge 1 commit into
base: rpi-6.18.y
Choose a base branch
from
+15 −3
Open

media/hevc_d: Fix old-style bit_size handling support #7366

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 15 additions & 3 deletions drivers/media/platform/raspberrypi/hevc_dec/hevc_d_h265.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1578,6 +1578,8 @@ static int hevc_d_h265_setup(struct hevc_d_ctx *ctx, struct hevc_d_run *run)
bool slice_temporal_mvp;
unsigned int ctb_size_y;
bool sps_changed = false;
/* Old (downstream only) bit size meanings */
bool old_bits = false;

de = dec_env_new(ctx);
if (!de) {
Expand Down Expand Up @@ -1646,6 +1648,7 @@ static int hevc_d_h265_setup(struct hevc_d_ctx *ctx, struct hevc_d_run *run)
de->chroma_stride = de->luma_stride;
de->frame_chroma_addr = de->frame_luma_addr +
(ctx->dst_fmt.height * 128);
old_bits = true;
break;
}

Expand Down Expand Up @@ -1776,15 +1779,24 @@ static int hevc_d_h265_setup(struct hevc_d_ctx *ctx, struct hevc_d_run *run)
for (i = 0; i != run->h265.slice_ents; ++i) {
const struct v4l2_ctrl_hevc_slice_params *const sh = sh0 + i;
const bool last_slice = i + 1 == run->h265.slice_ents;
const u32 byte_size = DIV_ROUND_UP(sh->bit_size, 8);
unsigned int bit_size = old_bits ? sh->bit_size - 8 * sh->data_byte_offset :
sh->bit_size;
const u32 byte_size = DIV_ROUND_UP(bit_size, 8);
unsigned int j;

s->sh = sh;

if (old_bits && sh->bit_size <= 8 * sh->data_byte_offset) {
v4l2_warn(&dev->v4l2_dev,
"data_byte_offset %d * 8 >= bits %d\n",
sh->data_byte_offset, sh->bit_size);
goto fail;
}

if (sh->data_byte_offset + byte_size > run->src->planes[0].bytesused) {
v4l2_warn(&dev->v4l2_dev,
"data_byte_offset %d + bits %d (= %d bytes) > bytesused %d\n",
sh->data_byte_offset, sh->bit_size, byte_size,
sh->data_byte_offset, bit_size, byte_size,
run->src->planes[0].bytesused);
goto fail;
}
Expand All @@ -1794,7 +1806,7 @@ static int hevc_d_h265_setup(struct hevc_d_ctx *ctx, struct hevc_d_run *run)
* actual size of the buffer (which may well be what is used to set
* bit_size if the caller isn't being very pedantic).
*/
s->data_len = min(sh->bit_size / 8 + 1,
s->data_len = min(bit_size / 8 + 1,
run->src->planes[0].bytesused - sh->data_byte_offset);

s->slice_qp = 26 + s->pps.init_qp_minus26 + sh->slice_qp_delta;
Expand Down