lkml.org 
[lkml]   [2018]   [Jun]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5/9] media: cedrus: Remove MPEG1 support
    Date
    The MPEG1 codec is obsolete, and that code hasn't been tested either. Since
    it stands in the way of further refactoring, remove it entirely.

    Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
    ---
    drivers/media/platform/sunxi/cedrus/sunxi_cedrus_dec.c | 4 +---
    drivers/media/platform/sunxi/cedrus/sunxi_cedrus_mpeg2.c | 8 ++------
    drivers/media/platform/sunxi/cedrus/sunxi_cedrus_mpeg2.h | 2 +-
    3 files changed, 4 insertions(+), 10 deletions(-)

    diff --git a/drivers/media/platform/sunxi/cedrus/sunxi_cedrus_dec.c b/drivers/media/platform/sunxi/cedrus/sunxi_cedrus_dec.c
    index c19acf9626c4..f274408ab5a7 100644
    --- a/drivers/media/platform/sunxi/cedrus/sunxi_cedrus_dec.c
    +++ b/drivers/media/platform/sunxi/cedrus/sunxi_cedrus_dec.c
    @@ -80,7 +80,6 @@ void sunxi_cedrus_device_run(void *priv)
    struct sunxi_cedrus_run run = { 0 };
    struct media_request *src_req, *dst_req;
    unsigned long flags;
    - bool mpeg1 = false;

    run.src = v4l2_m2m_next_src_buf(ctx->fh.m2m_ctx);
    if (!run.src) {
    @@ -123,7 +122,6 @@ void sunxi_cedrus_device_run(void *priv)
    run.mpeg2.hdr = get_ctrl_ptr(ctx, SUNXI_CEDRUS_CTRL_DEC_MPEG2_FRAME_HDR);
    sunxi_cedrus_mpeg2_setup(ctx, &run);

    - mpeg1 = run.mpeg2.hdr->type == MPEG1;
    break;

    default:
    @@ -146,7 +144,7 @@ void sunxi_cedrus_device_run(void *priv)

    if (!ctx->job_abort) {
    if (ctx->vpu_src_fmt->fourcc == V4L2_PIX_FMT_MPEG2_FRAME)
    - sunxi_cedrus_mpeg2_trigger(ctx, mpeg1);
    + sunxi_cedrus_mpeg2_trigger(ctx);
    } else {
    v4l2_m2m_buf_done(run.src, VB2_BUF_STATE_ERROR);
    v4l2_m2m_buf_done(run.dst, VB2_BUF_STATE_ERROR);
    diff --git a/drivers/media/platform/sunxi/cedrus/sunxi_cedrus_mpeg2.c b/drivers/media/platform/sunxi/cedrus/sunxi_cedrus_mpeg2.c
    index 85e6fc2fbdb2..d1d7a3cfce0d 100644
    --- a/drivers/media/platform/sunxi/cedrus/sunxi_cedrus_mpeg2.c
    +++ b/drivers/media/platform/sunxi/cedrus/sunxi_cedrus_mpeg2.c
    @@ -148,13 +148,9 @@ void sunxi_cedrus_mpeg2_setup(struct sunxi_cedrus_ctx *ctx,
    sunxi_cedrus_write(dev, src_buf_addr + VBV_SIZE - 1, VE_MPEG_VLD_END);
    }

    -void sunxi_cedrus_mpeg2_trigger(struct sunxi_cedrus_ctx *ctx, bool mpeg1)
    +void sunxi_cedrus_mpeg2_trigger(struct sunxi_cedrus_ctx *ctx)
    {
    struct sunxi_cedrus_dev *dev = ctx->dev;

    - /* Trigger MPEG engine. */
    - if (mpeg1)
    - sunxi_cedrus_write(dev, VE_TRIG_MPEG1, VE_MPEG_TRIGGER);
    - else
    - sunxi_cedrus_write(dev, VE_TRIG_MPEG2, VE_MPEG_TRIGGER);
    + sunxi_cedrus_write(dev, VE_TRIG_MPEG2, VE_MPEG_TRIGGER);
    }
    diff --git a/drivers/media/platform/sunxi/cedrus/sunxi_cedrus_mpeg2.h b/drivers/media/platform/sunxi/cedrus/sunxi_cedrus_mpeg2.h
    index b572001d47f2..4c380becfa1a 100644
    --- a/drivers/media/platform/sunxi/cedrus/sunxi_cedrus_mpeg2.h
    +++ b/drivers/media/platform/sunxi/cedrus/sunxi_cedrus_mpeg2.h
    @@ -28,6 +28,6 @@ struct sunxi_cedrus_run;

    void sunxi_cedrus_mpeg2_setup(struct sunxi_cedrus_ctx *ctx,
    struct sunxi_cedrus_run *run);
    -void sunxi_cedrus_mpeg2_trigger(struct sunxi_cedrus_ctx *ctx, bool mpeg1);
    +void sunxi_cedrus_mpeg2_trigger(struct sunxi_cedrus_ctx *ctx);

    #endif
    --
    2.17.0
    \
     
     \ /
      Last update: 2018-06-13 16:10    [W:4.739 / U:0.040 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site