diff options
| author | Thong Thai <thong.thai@amd.com> | 2020-07-21 17:04:47 -0400 |
|---|---|---|
| committer | Marge Bot <eric+marge@anholt.net> | 2020-07-22 17:17:50 +0000 |
| commit | 46646123ab046bac6a83f9c8137da3bddecbfff8 (patch) | |
| tree | 3d2a34c7763962490a7f032a8bc4b63bd665c104 | |
| parent | 89d2dac55486464832552dfc3349054c29a82922 (diff) | |
radeon/vcn: increase render_pic_list size
Increase the maximum number of possible decoder reference picture
frames from 16 to 32.
Signed-off-by: Thong Thai <thong.thai@amd.com>
Reviewed-by: Leo Liu <leo.liu@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6016>
| -rw-r--r-- | src/gallium/drivers/radeon/radeon_vcn_dec.c | 16 | ||||
| -rw-r--r-- | src/gallium/drivers/radeon/radeon_vcn_dec.h | 2 |
2 files changed, 10 insertions, 8 deletions
diff --git a/src/gallium/drivers/radeon/radeon_vcn_dec.c b/src/gallium/drivers/radeon/radeon_vcn_dec.c index 6bc60061aab..3854fad8b4d 100644 --- a/src/gallium/drivers/radeon/radeon_vcn_dec.c +++ b/src/gallium/drivers/radeon/radeon_vcn_dec.c @@ -256,17 +256,19 @@ static rvcn_dec_message_hevc_t get_h265_msg(struct radeon_decoder *dec, result.num_delta_pocs_ref_rps_idx = pic->NumDeltaPocsOfRefRpsIdx; result.curr_poc = pic->CurrPicOrderCntVal; - for (i = 0; i < 16; i++) { - for (j = 0; (pic->ref[j] != NULL) && (j < 16); j++) { + for (i = 0; i < ARRAY_SIZE(dec->render_pic_list); i++) { + for (j = 0; + (pic->ref[j] != NULL) && (j < ARRAY_SIZE(dec->render_pic_list)); + j++) { if (dec->render_pic_list[i] == pic->ref[j]) break; - if (j == 15) + if (j == ARRAY_SIZE(dec->render_pic_list) - 1) dec->render_pic_list[i] = NULL; else if (pic->ref[j + 1] == NULL) dec->render_pic_list[i] = NULL; } } - for (i = 0; i < 16; i++) { + for (i = 0; i < ARRAY_SIZE(dec->render_pic_list); i++) { if (dec->render_pic_list[i] == NULL) { dec->render_pic_list[i] = target; result.curr_idx = i; @@ -482,9 +484,9 @@ static rvcn_dec_message_vp9_t get_vp9_msg(struct radeon_decoder *dec, result.uncompressed_header_size = pic->picture_parameter.frame_header_length_in_bytes; result.compressed_header_size = pic->picture_parameter.first_partition_size; - assert(dec->base.max_references + 1 <= 16); + assert(dec->base.max_references + 1 <= ARRAY_SIZE(dec->render_pic_list)); - for (i = 0; i < 16; ++i) { + for (i = 0; i < ARRAY_SIZE(dec->render_pic_list); ++i) { if (dec->render_pic_list[i] && dec->render_pic_list[i] == target) { result.curr_pic_idx = (uintptr_t)vl_video_buffer_get_associated_data(target, &dec->base); break; @@ -1504,7 +1506,7 @@ struct pipe_video_codec *radeon_create_decoder(struct pipe_context *context, goto error; } - for (i = 0; i < 16; i++) + for (i = 0; i < ARRAY_SIZE(dec->render_pic_list); i++) dec->render_pic_list[i] = NULL; bs_buf_size = width * height * (512 / (16 * 16)); for (i = 0; i < NUM_BUFFERS; ++i) { diff --git a/src/gallium/drivers/radeon/radeon_vcn_dec.h b/src/gallium/drivers/radeon/radeon_vcn_dec.h index 00c373a6ee3..839dc25fb15 100644 --- a/src/gallium/drivers/radeon/radeon_vcn_dec.h +++ b/src/gallium/drivers/radeon/radeon_vcn_dec.h @@ -781,7 +781,7 @@ struct radeon_decoder { unsigned bs_size; unsigned cur_buffer; - void *render_pic_list[16]; + void *render_pic_list[32]; bool show_frame; unsigned ref_idx; struct { |