lkml.org 
[lkml]   [2023]   [Nov]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v4 07/11] media: rkvdec: Move rkvdec_reset_decoded_fmt helper
    Date
    Move rkvdec_reset_decoded_fmt() and the called rkvdec_reset_fmt() helper
    functions in preparation for adding a new caller in an upcoming patch.

    Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
    ---
    v4:
    - No change

    v3:
    - New patch

    drivers/staging/media/rkvdec/rkvdec.c | 46 +++++++++++++--------------
    1 file changed, 23 insertions(+), 23 deletions(-)

    diff --git a/drivers/staging/media/rkvdec/rkvdec.c b/drivers/staging/media/rkvdec/rkvdec.c
    index 0570c790ad08..7a79840470e1 100644
    --- a/drivers/staging/media/rkvdec/rkvdec.c
    +++ b/drivers/staging/media/rkvdec/rkvdec.c
    @@ -37,6 +37,29 @@ static void rkvdec_fill_decoded_pixfmt(struct rkvdec_ctx *ctx,
    DIV_ROUND_UP(pix_mp->height, 16);
    }

    +static void rkvdec_reset_fmt(struct rkvdec_ctx *ctx, struct v4l2_format *f,
    + u32 fourcc)
    +{
    + memset(f, 0, sizeof(*f));
    + f->fmt.pix_mp.pixelformat = fourcc;
    + f->fmt.pix_mp.field = V4L2_FIELD_NONE;
    + f->fmt.pix_mp.colorspace = V4L2_COLORSPACE_REC709;
    + f->fmt.pix_mp.ycbcr_enc = V4L2_YCBCR_ENC_DEFAULT;
    + f->fmt.pix_mp.quantization = V4L2_QUANTIZATION_DEFAULT;
    + f->fmt.pix_mp.xfer_func = V4L2_XFER_FUNC_DEFAULT;
    +}
    +
    +static void rkvdec_reset_decoded_fmt(struct rkvdec_ctx *ctx)
    +{
    + struct v4l2_format *f = &ctx->decoded_fmt;
    +
    + rkvdec_reset_fmt(ctx, f, ctx->coded_fmt_desc->decoded_fmts[0]);
    + f->type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE;
    + f->fmt.pix_mp.width = ctx->coded_fmt.fmt.pix_mp.width;
    + f->fmt.pix_mp.height = ctx->coded_fmt.fmt.pix_mp.height;
    + rkvdec_fill_decoded_pixfmt(ctx, &f->fmt.pix_mp);
    +}
    +
    static int rkvdec_try_ctrl(struct v4l2_ctrl *ctrl)
    {
    struct rkvdec_ctx *ctx = container_of(ctrl->handler, struct rkvdec_ctx, ctrl_hdl);
    @@ -169,18 +192,6 @@ rkvdec_find_coded_fmt_desc(u32 fourcc)
    return NULL;
    }

    -static void rkvdec_reset_fmt(struct rkvdec_ctx *ctx, struct v4l2_format *f,
    - u32 fourcc)
    -{
    - memset(f, 0, sizeof(*f));
    - f->fmt.pix_mp.pixelformat = fourcc;
    - f->fmt.pix_mp.field = V4L2_FIELD_NONE;
    - f->fmt.pix_mp.colorspace = V4L2_COLORSPACE_REC709;
    - f->fmt.pix_mp.ycbcr_enc = V4L2_YCBCR_ENC_DEFAULT;
    - f->fmt.pix_mp.quantization = V4L2_QUANTIZATION_DEFAULT;
    - f->fmt.pix_mp.xfer_func = V4L2_XFER_FUNC_DEFAULT;
    -}
    -
    static void rkvdec_reset_coded_fmt(struct rkvdec_ctx *ctx)
    {
    struct v4l2_format *f = &ctx->coded_fmt;
    @@ -196,17 +207,6 @@ static void rkvdec_reset_coded_fmt(struct rkvdec_ctx *ctx)
    ctx->coded_fmt_desc->ops->adjust_fmt(ctx, f);
    }

    -static void rkvdec_reset_decoded_fmt(struct rkvdec_ctx *ctx)
    -{
    - struct v4l2_format *f = &ctx->decoded_fmt;
    -
    - rkvdec_reset_fmt(ctx, f, ctx->coded_fmt_desc->decoded_fmts[0]);
    - f->type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE;
    - f->fmt.pix_mp.width = ctx->coded_fmt.fmt.pix_mp.width;
    - f->fmt.pix_mp.height = ctx->coded_fmt.fmt.pix_mp.height;
    - rkvdec_fill_decoded_pixfmt(ctx, &f->fmt.pix_mp);
    -}
    -
    static int rkvdec_enum_framesizes(struct file *file, void *priv,
    struct v4l2_frmsizeenum *fsize)
    {
    --
    2.42.0
    \
     
     \ /
      Last update: 2023-11-20 13:48    [W:4.854 / U:0.024 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site