lkml.org 
[lkml]   [2022]   [Oct]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 6.0 492/862] media: amphion: dont change the colorspace reported by decoder.
    Date
    From: Ming Qian <ming.qian@nxp.com>

    [ Upstream commit 61c2698ee60630c6a7d2e99850fa81ff6450270a ]

    decoder will report the colorspace information
    which is parsed from the sequence header,
    if they are unspecified, just let application to determine it,
    don't change it in driver.

    Fixes: 6de8d628df6ef ("media: amphion: add v4l2 m2m vpu decoder stateful driver")
    Signed-off-by: Ming Qian <ming.qian@nxp.com>
    Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/media/platform/amphion/vdec.c | 16 ++++++++--------
    1 file changed, 8 insertions(+), 8 deletions(-)

    diff --git a/drivers/media/platform/amphion/vdec.c b/drivers/media/platform/amphion/vdec.c
    index 9e64041cc1c1..feb75dc204de 100644
    --- a/drivers/media/platform/amphion/vdec.c
    +++ b/drivers/media/platform/amphion/vdec.c
    @@ -808,14 +808,6 @@ static void vdec_init_fmt(struct vpu_inst *inst)
    inst->cap_format.field = V4L2_FIELD_NONE;
    else
    inst->cap_format.field = V4L2_FIELD_SEQ_TB;
    - if (vdec->codec_info.color_primaries == V4L2_COLORSPACE_DEFAULT)
    - vdec->codec_info.color_primaries = V4L2_COLORSPACE_REC709;
    - if (vdec->codec_info.transfer_chars == V4L2_XFER_FUNC_DEFAULT)
    - vdec->codec_info.transfer_chars = V4L2_XFER_FUNC_709;
    - if (vdec->codec_info.matrix_coeffs == V4L2_YCBCR_ENC_DEFAULT)
    - vdec->codec_info.matrix_coeffs = V4L2_YCBCR_ENC_709;
    - if (vdec->codec_info.full_range == V4L2_QUANTIZATION_DEFAULT)
    - vdec->codec_info.full_range = V4L2_QUANTIZATION_LIM_RANGE;
    }

    static void vdec_init_crop(struct vpu_inst *inst)
    @@ -1555,6 +1547,14 @@ static int vdec_get_debug_info(struct vpu_inst *inst, char *str, u32 size, u32 i
    vdec->codec_info.frame_rate.numerator,
    vdec->codec_info.frame_rate.denominator);
    break;
    + case 9:
    + num = scnprintf(str, size, "colorspace: %d, %d, %d, %d (%d)\n",
    + vdec->codec_info.color_primaries,
    + vdec->codec_info.transfer_chars,
    + vdec->codec_info.matrix_coeffs,
    + vdec->codec_info.full_range,
    + vdec->codec_info.vui_present);
    + break;
    default:
    break;
    }
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-10-19 13:14    [W:3.727 / U:0.468 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site