lkml.org 
[lkml]   [2019]   [Sep]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 06/12] media: hantro: Set H264 FIELDPIC_FLAG_E flag correctly
    Date
    The FIELDPIC_FLAG_E bit should be set when field_pic_flag exists in stream,
    it is currently set based on field_pic_flag of current frame.
    The PIC_FIELDMODE_E bit is correctly set based on the field_pic_flag.

    Fix this by setting the FIELDPIC_FLAG_E bit when frame_mbs_only is not set.

    Fixes: dea0a82f3d22 ("media: hantro: Add support for H264 decoding on G1")
    Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
    ---
    drivers/staging/media/hantro/hantro_g1_h264_dec.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/staging/media/hantro/hantro_g1_h264_dec.c b/drivers/staging/media/hantro/hantro_g1_h264_dec.c
    index 159bd67e0a36..16f21d258f6a 100644
    --- a/drivers/staging/media/hantro/hantro_g1_h264_dec.c
    +++ b/drivers/staging/media/hantro/hantro_g1_h264_dec.c
    @@ -64,7 +64,7 @@ static void set_params(struct hantro_ctx *ctx)
    /* always use the matrix sent from userspace */
    reg |= G1_REG_DEC_CTRL2_TYPE1_QUANT_E;

    - if (slices[0].flags & V4L2_H264_SLICE_FLAG_FIELD_PIC)
    + if (!(sps->flags & V4L2_H264_SPS_FLAG_FRAME_MBS_ONLY))
    reg |= G1_REG_DEC_CTRL2_FIELDPIC_FLAG_E;
    vdpu_write_relaxed(vpu, reg, G1_REG_DEC_CTRL2);

    --
    2.17.1
    \
     
     \ /
      Last update: 2019-09-01 14:46    [W:4.067 / U:0.172 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site