fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-09 04:38:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

radeonsi/vcn: support variable number of bs_bufs

Browse source 
add support to use variable number of bitstream buffers for decode

v2: remove the always true if condition (CI report)

Signed-off-by: Sathishkumar S <sathishkumar.sundararaju@amd.com>
Reviewed-by: Leo Liu <leo.liu@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24240>
This commit is contained in:
Sathishkumar S 2023-07-20 10:21:07 +05:30 • committed by Marge Bot
parent 53d35c641d
commit 47a9d01641
2 changed files with 26 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/gallium/drivers/radeonsi/radeon_vcn_dec.c
View file

@ -2529,7 +2529,7 @@ static void send_msg_buf(struct radeon_decoder *dec)
static void next_buffer(struct radeon_decoder *dec)
{
++dec->cur_buffer;
dec->cur_buffer %= NUM_BUFFERS;
dec->cur_buffer %= dec->num_dec_bufs;
}
static unsigned calc_ctx_size_h264_perf(struct radeon_decoder *dec)
@ -2751,10 +2751,15 @@ static void radeon_dec_destroy(struct pipe_video_codec *decoder)
}
}
for (i = 0; i < NUM_BUFFERS; ++i) {
si_vid_destroy_buffer(&dec->msg_fb_it_probs_buffers[i]);
si_vid_destroy_buffer(&dec->bs_buffers[i]);
if (dec->msg_fb_it_probs_buffers && dec->bs_buffers) {
for (i = 0; i < dec->num_dec_bufs; ++i) {
si_vid_destroy_buffer(&dec->msg_fb_it_probs_buffers[i]);
si_vid_destroy_buffer(&dec->bs_buffers[i]);
}
FREE(dec->msg_fb_it_probs_buffers);
FREE(dec->bs_buffers);
}
dec->num_dec_bufs = 0;
if (dec->dpb_type != DPB_DYNAMIC_TIER_2) {
si_vid_destroy_buffer(&dec->dpb);
@ -3110,8 +3115,14 @@ struct pipe_video_codec *radeon_create_decoder(struct pipe_context *context,
dec->h264_valid_poc_num[i] = (unsigned) -1;
}
dec->num_dec_bufs = NUM_BUFFERS;
bs_buf_size = align(width * height / 32, 128);
for (i = 0; i < NUM_BUFFERS; ++i) {
dec->msg_fb_it_probs_buffers = (struct rvid_buffer *) CALLOC(dec->num_dec_bufs, sizeof(struct rvid_buffer));
dec->bs_buffers = (struct rvid_buffer *) CALLOC(dec->num_dec_bufs, sizeof(struct rvid_buffer));
if(!dec->msg_fb_it_probs_buffers || !dec->bs_buffers)
goto error;
for (i = 0; i < dec->num_dec_bufs; ++i) {
unsigned msg_fb_it_probs_size = FB_BUFFER_OFFSET + FB_BUFFER_SIZE;
if (have_it(dec))
msg_fb_it_probs_size += IT_SCALING_TABLE_SIZE;
@ -3308,9 +3319,13 @@ error:
}
}
for (i = 0; i < NUM_BUFFERS; ++i) {
si_vid_destroy_buffer(&dec->msg_fb_it_probs_buffers[i]);
si_vid_destroy_buffer(&dec->bs_buffers[i]);
if (dec->msg_fb_it_probs_buffers && dec->bs_buffers) {
for (i = 0; i < dec->num_dec_bufs; ++i) {
si_vid_destroy_buffer(&dec->msg_fb_it_probs_buffers[i]);
si_vid_destroy_buffer(&dec->bs_buffers[i]);
}
FREE(dec->msg_fb_it_probs_buffers);
FREE(dec->bs_buffers);
}
if (dec->dpb_type != DPB_DYNAMIC_TIER_2)

5
src/gallium/drivers/radeonsi/radeon_vcn_dec.h
View file

@ -83,8 +83,9 @@ struct radeon_decoder {
bool vcn_dec_sw_ring;
struct rvcn_sq_var sq;
struct rvid_buffer msg_fb_it_probs_buffers[NUM_BUFFERS];
struct rvid_buffer bs_buffers[NUM_BUFFERS];
struct rvid_buffer *msg_fb_it_probs_buffers;
unsigned num_dec_bufs;
struct rvid_buffer *bs_buffers;
struct rvid_buffer dpb;
struct rvid_buffer ctx;
struct rvid_buffer sessionctx;