lkml.org 
[lkml]   [2019]   [Aug]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v5 11/11] media: hantro: Enable H264 decoding on rk3288
    Date
    From: Hertz Wong <hertz.wong@rock-chips.com>

    Now that the generic bits have been added, we can activate H264 decoding
    on rk3288.

    Signed-off-by: Hertz Wong <hertz.wong@rock-chips.com>
    Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
    ---
    Changes in v5:
    * None.
    Changes in v4:
    * None.
    ---
    drivers/staging/media/hantro/rk3288_vpu_hw.c | 21 +++++++++++++++++++-
    1 file changed, 20 insertions(+), 1 deletion(-)

    diff --git a/drivers/staging/media/hantro/rk3288_vpu_hw.c b/drivers/staging/media/hantro/rk3288_vpu_hw.c
    index f1b573a006ae..6bfcc47d1e58 100644
    --- a/drivers/staging/media/hantro/rk3288_vpu_hw.c
    +++ b/drivers/staging/media/hantro/rk3288_vpu_hw.c
    @@ -61,6 +61,19 @@ static const struct hantro_fmt rk3288_vpu_dec_fmts[] = {
    .fourcc = V4L2_PIX_FMT_NV12,
    .codec_mode = HANTRO_MODE_NONE,
    },
    + {
    + .fourcc = V4L2_PIX_FMT_H264_SLICE,
    + .codec_mode = HANTRO_MODE_H264_DEC,
    + .max_depth = 2,
    + .frmsize = {
    + .min_width = 48,
    + .max_width = 3840,
    + .step_width = H264_MB_DIM,
    + .min_height = 48,
    + .max_height = 2160,
    + .step_height = H264_MB_DIM,
    + },
    + },
    {
    .fourcc = V4L2_PIX_FMT_MPEG2_SLICE,
    .codec_mode = HANTRO_MODE_MPEG2_DEC,
    @@ -162,6 +175,12 @@ static const struct hantro_codec_ops rk3288_vpu_codec_ops[] = {
    .init = hantro_jpeg_enc_init,
    .exit = hantro_jpeg_enc_exit,
    },
    + [HANTRO_MODE_H264_DEC] = {
    + .run = hantro_g1_h264_dec_run,
    + .reset = rk3288_vpu_dec_reset,
    + .init = hantro_h264_dec_init,
    + .exit = hantro_h264_dec_exit,
    + },
    [HANTRO_MODE_MPEG2_DEC] = {
    .run = hantro_g1_mpeg2_dec_run,
    .reset = rk3288_vpu_dec_reset,
    @@ -197,7 +216,7 @@ const struct hantro_variant rk3288_vpu_variant = {
    .dec_fmts = rk3288_vpu_dec_fmts,
    .num_dec_fmts = ARRAY_SIZE(rk3288_vpu_dec_fmts),
    .codec = HANTRO_JPEG_ENCODER | HANTRO_MPEG2_DECODER |
    - HANTRO_VP8_DECODER,
    + HANTRO_VP8_DECODER | HANTRO_H264_DECODER,
    .codec_ops = rk3288_vpu_codec_ops,
    .irqs = rk3288_irqs,
    .num_irqs = ARRAY_SIZE(rk3288_irqs),
    --
    2.22.0
    \
     
     \ /
      Last update: 2019-08-12 21:36    [W:4.027 / U:0.024 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site