radeon/vcn: fix mpeg4 msg buffer settings
authorBoyuan Zhang <boyuan.zhang@amd.com>
Wed, 25 Apr 2018 15:49:52 +0000 (11:49 -0400)
committerLeo Liu <leo.liu@amd.com>
Thu, 26 Apr 2018 15:16:05 +0000 (11:16 -0400)
Previous bit-fields assignments are incorrect and will result certain mpeg4
decode failed due to wrong flag values. This patch fixes these assignments.

Signed-off-by: Boyuan Zhang <boyuan.zhang@amd.com>
Reviewed-by: Leo Liu <leo.liu@amd.com>
src/gallium/drivers/radeon/radeon_vcn_dec.c

index 046b371384a829d64bbf311c49793e62d4d419c8..8af58a75307a5c03daed139164586b6a7cc805e2 100644 (file)
@@ -759,15 +759,15 @@ static rvcn_dec_message_mpeg4_asp_vld_t get_mpeg4_msg(struct radeon_decoder *dec
 
        result.vop_time_increment_resolution = pic->vop_time_increment_resolution;
 
-       result.short_video_header |= pic->short_video_header << 0;
-       result.interlaced |= pic->interlaced << 2;
-        result.load_intra_quant_mat |= 1 << 3;
-       result.load_nonintra_quant_mat |= 1 << 4;
-       result.quarter_sample |= pic->quarter_sample << 5;
-       result.complexity_estimation_disable |= 1 << 6;
-       result.resync_marker_disable |= pic->resync_marker_disable << 7;
-       result.newpred_enable |= 0 << 10; //
-       result.reduced_resolution_vop_enable |= 0 << 11;
+       result.short_video_header = pic->short_video_header;
+       result.interlaced = pic->interlaced;
+       result.load_intra_quant_mat = 1;
+       result.load_nonintra_quant_mat = 1;
+       result.quarter_sample = pic->quarter_sample;
+       result.complexity_estimation_disable = 1;
+       result.resync_marker_disable = pic->resync_marker_disable;
+       result.newpred_enable = 0;
+       result.reduced_resolution_vop_enable = 0;
 
        result.quant_type = pic->quant_type;