aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeo Liu <[email protected]>2015-09-18 15:51:26 -0400
committerEmil Velikov <[email protected]>2015-09-30 21:55:33 +0100
commit0dae12ac6e188307747c9698299b0ce649f9f505 (patch)
tree4081889e3ec05a502eee15c91c53a9c5c6836952
parent41b44abdcbc5aa9a36afceee5f26fc7ea60ee497 (diff)
radeon/vce: fix vui time_scale zero error
if app pass 0 as frame_rate_num, it should not be encoded to the VUI. Signed-off-by: Leo Liu <[email protected]> Reviewed-by: Alex Deucher <[email protected]> Reviewed-by: Christian König <[email protected]> Cc: "10.6 11.0" <[email protected]> (cherry picked from commit 1e97b41893a4f53a71ee141a5e8a046fed7b49cd)
-rw-r--r--src/gallium/drivers/radeon/radeon_vce_40_2_2.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/gallium/drivers/radeon/radeon_vce_40_2_2.c b/src/gallium/drivers/radeon/radeon_vce_40_2_2.c
index 09029575547..ac8d6720e6a 100644
--- a/src/gallium/drivers/radeon/radeon_vce_40_2_2.c
+++ b/src/gallium/drivers/radeon/radeon_vce_40_2_2.c
@@ -251,6 +251,9 @@ static void vui(struct rvce_encoder *enc)
{
int i;
+ if (!enc->pic.rate_ctrl.frame_rate_num)
+ return;
+
RVCE_BEGIN(0x04000009); // vui
RVCE_CS(0x00000000); //aspectRatioInfoPresentFlag
RVCE_CS(0x00000000); //aspectRatioInfo.aspectRatioIdc