summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBoyuan Zhang <[email protected]>2018-04-25 11:49:52 -0400
committerLeo Liu <[email protected]>2018-04-26 11:16:05 -0400
commitdeba56accf4e1f8fc025f34f6cbc069285f76838 (patch)
tree8791ba29b8232cddd60fe4e4025ff1a69f40c77b
parentbf5e0276b6527fbcf51fd2af1769c83c25ec16e5 (diff)
radeon/vcn: fix mpeg4 msg buffer settings
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 <[email protected]> Reviewed-by: Leo Liu <[email protected]>
-rw-r--r--src/gallium/drivers/radeon/radeon_vcn_dec.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/gallium/drivers/radeon/radeon_vcn_dec.c b/src/gallium/drivers/radeon/radeon_vcn_dec.c
index 046b371384a..8af58a75307 100644
--- a/src/gallium/drivers/radeon/radeon_vcn_dec.c
+++ b/src/gallium/drivers/radeon/radeon_vcn_dec.c
@@ -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;