fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-22 13:30:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

radeonsi/vcn: support 12bit YUV420 AV1 decoding

Browse source 
Add 12bit AV1 decoding support for PIPE_VIDEO_PROFILE_AV1_PROFILE2.
This feature is tested on VCN5 and VCN4.

Signed-off-by: David (Ming Qiang) Wu <David.Wu3@amd.com>
Reviewed-by: David Rosca <david.rosca@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32383>
This commit is contained in:
David (Ming Qiang) Wu 2024-08-02 17:22:54 -04:00 • committed by Marge Bot
parent 389c77d127
commit e359b3c525
3 changed files with 29 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -35,6 +35,7 @@
#define NUM_AV1_REFS 8 #define NUM_AV1_REFS 8
#define NUM_AV1_REFS_PER_FRAME 7 #define NUM_AV1_REFS_PER_FRAME 7
static enum pipe_format get_buffer_format(struct radeon_decoder *dec);
static unsigned calc_dpb_size(struct radeon_decoder *dec); static unsigned calc_dpb_size(struct radeon_decoder *dec);
static unsigned calc_ctx_size_h264_perf(struct radeon_decoder *dec); static unsigned calc_ctx_size_h264_perf(struct radeon_decoder *dec);
static unsigned calc_ctx_size_h265_main(struct radeon_decoder *dec); static unsigned calc_ctx_size_h265_main(struct radeon_decoder *dec);
@ -999,7 +1000,9 @@ static rvcn_dec_message_av1_t get_av1_msg(struct radeon_decoder *dec,
} }
if (pic->picture_parameter.bit_depth_idx) { if (pic->picture_parameter.bit_depth_idx) {
if (target->buffer_format == PIPE_FORMAT_P010 || target->buffer_format == PIPE_FORMAT_P016) { if (target->buffer_format == PIPE_FORMAT_P010 ||
target->buffer_format == PIPE_FORMAT_P012 ||
target->buffer_format == PIPE_FORMAT_P016) {
result.p010_mode = 1; result.p010_mode = 1;
result.msb_mode = 1; result.msb_mode = 1;
} else { } else {
@ -1106,7 +1109,7 @@ static rvcn_dec_message_av1_t get_av1_msg(struct radeon_decoder *dec,
} }
if (dec->dpb_type == DPB_DYNAMIC_TIER_2) { if (dec->dpb_type == DPB_DYNAMIC_TIER_2) {
dec->ref_codec.bts = pic->picture_parameter.bit_depth_idx ? CODEC_10_BITS : CODEC_8_BITS; dec->ref_codec.bts = pic->picture_parameter.bit_depth_idx;
dec->ref_codec.index = result.curr_pic_idx; dec->ref_codec.index = result.curr_pic_idx;
dec->ref_codec.ref_size = 8; dec->ref_codec.ref_size = 8;
dec->ref_codec.num_refs = num_refs; dec->ref_codec.num_refs = num_refs;
@ -1371,7 +1374,7 @@ static unsigned rvcn_dec_dynamic_dpb_t2_message(struct radeon_decoder *dec, rvcn
width = align(decode->width_in_samples, dec->db_alignment); width = align(decode->width_in_samples, dec->db_alignment);
height = align(decode->height_in_samples, dec->db_alignment); height = align(decode->height_in_samples, dec->db_alignment);
size = align((width * height * 3) / 2, 256); size = align((width * height * 3) / 2, 256);
if (dec->ref_codec.bts == CODEC_10_BITS) if (dec->ref_codec.bts == CODEC_10_BITS || dec->ref_codec.bts == CODEC_12_BITS)
size = (((struct si_screen *)dec->screen)->info.vcn_ip_version == VCN_5_0_0) ? size * 2 : size * 3 / 2; size = (((struct si_screen *)dec->screen)->info.vcn_ip_version == VCN_5_0_0) ? size * 2 : size * 3 / 2;
list_for_each_entry_safe(struct rvcn_dec_dynamic_dpb_t2, d, &dec->dpb_ref_list, list) { list_for_each_entry_safe(struct rvcn_dec_dynamic_dpb_t2, d, &dec->dpb_ref_list, list) {
@ -1448,7 +1451,7 @@ static unsigned rvcn_dec_dynamic_dpb_t2_message(struct radeon_decoder *dec, rvcn
if (dec->dpb_use_surf) { if (dec->dpb_use_surf) {
struct pipe_video_buffer templat; struct pipe_video_buffer templat;
memset(&templat, 0, sizeof(templat)); memset(&templat, 0, sizeof(templat));
templat.buffer_format = (dec->ref_codec.bts != CODEC_10_BITS) ? PIPE_FORMAT_NV12 : PIPE_FORMAT_P010; templat.buffer_format = get_buffer_format(dec);
templat.width = width; templat.width = width;
templat.height = height; templat.height = height;
if (encrypted) if (encrypted)
@ -1529,7 +1532,7 @@ static unsigned rvcn_dec_dynamic_dpb_t2_message(struct radeon_decoder *dec, rvcn
dynamic_dpb_t2->dpbChromaAlignedSize = dynamic_dpb_t2->dpbChromaPitch * dynamic_dpb_t2->dpbChromaAlignedSize = dynamic_dpb_t2->dpbChromaPitch *
dynamic_dpb_t2->dpbChromaAlignedHeight * 2; dynamic_dpb_t2->dpbChromaAlignedHeight * 2;
if (dec->ref_codec.bts == CODEC_10_BITS) { if (dec->ref_codec.bts == CODEC_10_BITS || dec->ref_codec.bts == CODEC_12_BITS) {
if (((struct si_screen *)dec->screen)->info.vcn_ip_version == VCN_5_0_0) { if (((struct si_screen *)dec->screen)->info.vcn_ip_version == VCN_5_0_0) {
dynamic_dpb_t2->dpbLumaAlignedSize = dynamic_dpb_t2->dpbLumaAlignedSize * 2; dynamic_dpb_t2->dpbLumaAlignedSize = dynamic_dpb_t2->dpbLumaAlignedSize * 2;
dynamic_dpb_t2->dpbChromaAlignedSize = dynamic_dpb_t2->dpbChromaAlignedSize * 2; dynamic_dpb_t2->dpbChromaAlignedSize = dynamic_dpb_t2->dpbChromaAlignedSize * 2;
@ -3071,3 +3074,15 @@ err:
return NULL; return NULL;
} }
static enum pipe_format get_buffer_format(struct radeon_decoder *dec)
{
switch (dec->ref_codec.bts) {
case CODEC_10_BITS:
return PIPE_FORMAT_P010;
case CODEC_12_BITS:
return PIPE_FORMAT_P012;
default:
return PIPE_FORMAT_NV12;
}
}

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

@ -118,7 +118,8 @@ struct radeon_decoder {
struct { struct {
enum { enum {
CODEC_8_BITS = 0, CODEC_8_BITS = 0,
CODEC_10_BITS CODEC_10_BITS,
CODEC_12_BITS
} bts; } bts;
uint8_t index; uint8_t index;
unsigned ref_size; unsigned ref_size;

7
src/gallium/drivers/radeonsi/si_get.c
View file

@ -1103,6 +1103,13 @@ static bool si_vid_is_format_supported(struct pipe_screen *screen, enum pipe_for
return (format == PIPE_FORMAT_P010) || (format == PIPE_FORMAT_P016) || return (format == PIPE_FORMAT_P010) || (format == PIPE_FORMAT_P016) ||
(format == PIPE_FORMAT_NV12); (format == PIPE_FORMAT_NV12);
if (profile == PIPE_VIDEO_PROFILE_AV1_PROFILE2 && entrypoint == PIPE_VIDEO_ENTRYPOINT_BITSTREAM) {
if (sscreen->info.vcn_ip_version < VCN_5_0_0 && sscreen->info.vcn_ip_version != VCN_4_0_0)
return false;
return (format == PIPE_FORMAT_P010) || (format == PIPE_FORMAT_P016) ||
(format == PIPE_FORMAT_P012) || (format == PIPE_FORMAT_NV12);
}
/* JPEG supports YUV400 and YUV444 */ /* JPEG supports YUV400 and YUV444 */
if (profile == PIPE_VIDEO_PROFILE_JPEG_BASELINE) { if (profile == PIPE_VIDEO_PROFILE_JPEG_BASELINE) {
switch (format) { switch (format) {