summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorBoyuan Zhang <[email protected]>2018-04-25 11:49:52 -0400
committerJuan A. Suarez Romero <[email protected]>2018-05-02 12:15:05 +0200
commit5d3caa1ca449082bebaf1ce919917ff19d0482e0 (patch)
tree1f648a9936f5e74c1c6fd3cb91aa0cfd6b329a9f /src
parent8f97e56947211d78f19b2aea10dbdef5b6bd66f4 (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]> (cherry picked from commit deba56accf4e1f8fc025f34f6cbc069285f76838)
Diffstat (limited to 'src')
-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 f83e9e5fc47..4bc922d19ef 100644
--- a/src/gallium/drivers/radeon/radeon_vcn_dec.c
+++ b/src/gallium/drivers/radeon/radeon_vcn_dec.c
@@ -554,15 +554,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;