Mesa (master): radeon/vce: fix vui time_scale zero error

Leo Liu leoliu at kemper.freedesktop.org
Fri Sep 25 22:47:55 UTC 2015


Module: Mesa
Branch: master
Commit: 1e97b41893a4f53a71ee141a5e8a046fed7b49cd
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=1e97b41893a4f53a71ee141a5e8a046fed7b49cd

Author: Leo Liu <leo.liu at amd.com>
Date:   Fri Sep 18 15:51:26 2015 -0400

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 <leo.liu at amd.com>
Reviewed-by: Alex Deucher <alexander.deucher at amd.com>
Reviewed-by: Christian König <christian.koenig at amd.com>
Cc: "10.6 11.0" <mesa-stable at lists.freedesktop.org>

---

 src/gallium/drivers/radeon/radeon_vce_40_2_2.c |    3 +++
 1 file changed, 3 insertions(+)

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 e64fbc7..c005659 100644
--- a/src/gallium/drivers/radeon/radeon_vce_40_2_2.c
+++ b/src/gallium/drivers/radeon/radeon_vce_40_2_2.c
@@ -233,6 +233,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




More information about the mesa-commit mailing list