Reference index count in VE_H264_PPS should come from PPS control.
However, this is not really important, because reference index count is
in our case always overridden by that from slice header.

Signed-off-by: Jernej Skrabec <jernej.skra...@siol.net>
---
 drivers/staging/media/sunxi/cedrus/cedrus_h264.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/drivers/staging/media/sunxi/cedrus/cedrus_h264.c 
b/drivers/staging/media/sunxi/cedrus/cedrus_h264.c
index bd848146eada..4a0e69855c7f 100644
--- a/drivers/staging/media/sunxi/cedrus/cedrus_h264.c
+++ b/drivers/staging/media/sunxi/cedrus/cedrus_h264.c
@@ -364,12 +364,8 @@ static void cedrus_set_params(struct cedrus_ctx *ctx,
 
        // picture parameters
        reg = 0;
-       /*
-        * FIXME: the kernel headers are allowing the default value to
-        * be passed, but the libva doesn't give us that.
-        */
-       reg |= (slice->num_ref_idx_l0_active_minus1 & 0x1f) << 10;
-       reg |= (slice->num_ref_idx_l1_active_minus1 & 0x1f) << 5;
+       reg |= (pps->num_ref_idx_l0_default_active_minus1 & 0x1f) << 10;
+       reg |= (pps->num_ref_idx_l1_default_active_minus1 & 0x1f) << 5;
        reg |= (pps->weighted_bipred_idc & 0x3) << 2;
        if (pps->flags & V4L2_H264_PPS_FLAG_ENTROPY_CODING_MODE)
                reg |= VE_H264_PPS_ENTROPY_CODING_MODE;
-- 
2.23.0

_______________________________________________
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

Reply via email to