On Sat, 18 Nov 2017 12:11:52 +0100
Timo Rothenpieler <t...@rothenpieler.org> wrote:
> Am 16.11.2017 um 17:36 schrieb Philip Langdale:
> > This is mostly straight-forward. The weird part is that it should
> > just work for mpeg1, but I see corruption in my test cases, so I'm
> > going to try and fix that separately.
> >
> > Signed-off-by: Philip Langdale <phil...@overt.org>
> > ---
> > Changelog | 2 +-
> > configure | 2 +
> > libavcodec/Makefile | 1 +
> > libavcodec/allcodecs.c | 1 +
> > libavcodec/mpeg12dec.c | 3 +
> > libavcodec/nvdec.c | 11 ++--
> > libavcodec/nvdec_mpeg12.c | 153
> > ++++++++++++++++++++++++++++++++++++++++++++++
> > libavcodec/version.h | 2 +- 8 files changed, 168
> > insertions(+), 7 deletions(-) create mode 100644
> > libavcodec/nvdec_mpeg12.c
> >
> > diff --git a/Changelog b/Changelog
> > index d2b5530ad7..385fe4037c 100644
> > --- a/Changelog
> > +++ b/Changelog
> > @@ -13,7 +13,7 @@ version <next>:
> > - PCE support for extended channel layouts in the AAC encoder
> > - native aptX encoder and decoder
> > - Raw aptX muxer and demuxer
> > -- NVIDIA NVDEC-accelerated H.264, HEVC, VC1 and VP9 hwaccel
> > decoding +- NVIDIA NVDEC-accelerated H.264, HEVC, MPEG-2, VC1 and
> > VP9 hwaccel decoding
> > - Intel QSV-accelerated overlay filter
> >
> >
> > diff --git a/configure b/configure
> > index 84f0a04925..1eedad208b 100755
> > --- a/configure
> > +++ b/configure
> > @@ -2713,6 +2713,8 @@ mpeg2_dxva2_hwaccel_deps="dxva2"
> > mpeg2_dxva2_hwaccel_select="mpeg2video_decoder"
> > mpeg2_mediacodec_hwaccel_deps="mediacodec"
> > mpeg2_mmal_hwaccel_deps="mmal"
> > +mpeg2_nvdec_hwaccel_deps="nvdec"
> > +mpeg2_nvdec_hwaccel_select="mpeg2video_decoder"
> > mpeg2_qsv_hwaccel_deps="libmfx"
> > mpeg2_vaapi_hwaccel_deps="vaapi"
> > mpeg2_vaapi_hwaccel_select="mpeg2video_decoder"
> > diff --git a/libavcodec/Makefile b/libavcodec/Makefile
> > index 6315672573..494c76da76 100644
> > --- a/libavcodec/Makefile
> > +++ b/libavcodec/Makefile
> > @@ -854,6 +854,7 @@ OBJS-$(CONFIG_MPEG1_VIDEOTOOLBOX_HWACCEL) +=
> > videotoolbox.o OBJS-$(CONFIG_MPEG1_XVMC_HWACCEL) +=
> > mpegvideo_xvmc.o OBJS-$(CONFIG_MPEG2_D3D11VA_HWACCEL) +=
> > dxva2_mpeg2.o OBJS-$(CONFIG_MPEG2_DXVA2_HWACCEL) +=
> > dxva2_mpeg2.o +OBJS-$(CONFIG_MPEG2_NVDEC_HWACCEL) +=
> > nvdec_mpeg12.o OBJS-$(CONFIG_MPEG2_QSV_HWACCEL) +=
> > qsvdec_other.o OBJS-$(CONFIG_MPEG2_VAAPI_HWACCEL) +=
> > vaapi_mpeg2.o OBJS-$(CONFIG_MPEG2_VDPAU_HWACCEL) +=
> > vdpau_mpeg12.o diff --git a/libavcodec/allcodecs.c
> > b/libavcodec/allcodecs.c index e213f3757c..e0adb71951 100644
> > --- a/libavcodec/allcodecs.c
> > +++ b/libavcodec/allcodecs.c
> > @@ -96,6 +96,7 @@ static void register_all(void)
> > REGISTER_HWACCEL(MPEG2_D3D11VA2, mpeg2_d3d11va2);
> > REGISTER_HWACCEL(MPEG2_DXVA2, mpeg2_dxva2);
> > REGISTER_HWACCEL(MPEG2_MMAL, mpeg2_mmal);
> > + REGISTER_HWACCEL(MPEG2_NVDEC, mpeg2_nvdec);
> > REGISTER_HWACCEL(MPEG2_QSV, mpeg2_qsv);
> > REGISTER_HWACCEL(MPEG2_VAAPI, mpeg2_vaapi);
> > REGISTER_HWACCEL(MPEG2_VDPAU, mpeg2_vdpau);
> > diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c
> > index d5bc5f21b2..2b213eebcd 100644
> > --- a/libavcodec/mpeg12dec.c
> > +++ b/libavcodec/mpeg12dec.c
> > @@ -1141,6 +1141,9 @@ static const enum AVPixelFormat
> > mpeg1_hwaccel_pixfmt_list_420[] = { };
> >
> > static const enum AVPixelFormat mpeg2_hwaccel_pixfmt_list_420[] =
> > { +#if CONFIG_MPEG2_NVDEC_HWACCEL
> > + AV_PIX_FMT_CUDA,
> > +#endif
> > #if CONFIG_MPEG2_XVMC_HWACCEL
> > AV_PIX_FMT_XVMC,
> > #endif
> > diff --git a/libavcodec/nvdec.c b/libavcodec/nvdec.c
> > index 20d7c3db27..3d62840e9f 100644
> > --- a/libavcodec/nvdec.c
> > +++ b/libavcodec/nvdec.c
> > @@ -52,11 +52,12 @@ typedef struct NVDECFramePool {
> > static int map_avcodec_id(enum AVCodecID id)
> > {
> > switch (id) {
> > - case AV_CODEC_ID_H264: return cudaVideoCodec_H264;
> > - case AV_CODEC_ID_HEVC: return cudaVideoCodec_HEVC;
> > - case AV_CODEC_ID_VC1: return cudaVideoCodec_VC1;
> > - case AV_CODEC_ID_VP9: return cudaVideoCodec_VP9;
> > - case AV_CODEC_ID_WMV3: return cudaVideoCodec_VC1;
> > + case AV_CODEC_ID_H264: return cudaVideoCodec_H264;
> > + case AV_CODEC_ID_HEVC: return cudaVideoCodec_HEVC;
> > + case AV_CODEC_ID_MPEG2VIDEO: return cudaVideoCodec_MPEG2;
> > + case AV_CODEC_ID_VC1: return cudaVideoCodec_VC1;
> > + case AV_CODEC_ID_VP9: return cudaVideoCodec_VP9;
> > + case AV_CODEC_ID_WMV3: return cudaVideoCodec_VC1;
> > }
> > return -1;
> > }
> > diff --git a/libavcodec/nvdec_mpeg12.c b/libavcodec/nvdec_mpeg12.c
> > new file mode 100644
> > index 0000000000..a03b51dd17
> > --- /dev/null
> > +++ b/libavcodec/nvdec_mpeg12.c
> > @@ -0,0 +1,153 @@
> > +/*
> > + * MPEG-2 HW decode acceleration through NVDEC
> > + *
> > + * Copyright (c) 2017 Philip Langdale
> > + *
> > + * This file is part of FFmpeg.
> > + *
> > + * FFmpeg is free software; you can redistribute it and/or
> > + * modify it under the terms of the GNU Lesser General Public
> > + * License as published by the Free Software Foundation; either
> > + * version 2.1 of the License, or (at your option) any later
> > version.
> > + *
> > + * FFmpeg is distributed in the hope that it will be useful,
> > + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> > GNU
> > + * Lesser General Public License for more details.
> > + *
> > + * You should have received a copy of the GNU Lesser General Public
> > + * License along with FFmpeg; if not, write to the Free Software
> > + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
> > 02110-1301 USA
> > + */
> > +
> > +#include "avcodec.h"
> > +#include "mpegvideo.h"
> > +#include "nvdec.h"
> > +#include "decode.h"
> > +
> > +static int get_ref_idx(AVFrame *frame)
> > +{
> > + FrameDecodeData *fdd;
> > + NVDECFrame *cf;
> > +
> > + if (!frame || !frame->private_ref)
> > + return -1;
> > +
> > + fdd = (FrameDecodeData*)frame->private_ref->data;
> > + cf = (NVDECFrame*)fdd->hwaccel_priv;
> > + if (!cf)
> > + return -1;
> > +
> > + return cf->idx;
> > +}
> > +
> > +static int nvdec_mpeg12_start_frame(AVCodecContext *avctx, const
> > uint8_t *buffer, uint32_t size) +{
> > + MpegEncContext *s = avctx->priv_data;
> > +
> > + NVDECContext *ctx = avctx->internal->hwaccel_priv_data;
> > + CUVIDPICPARAMS *pp = &ctx->pic_params;
> > + CUVIDMPEG2PICPARAMS *ppc = &pp->CodecSpecific.mpeg2;
> > + FrameDecodeData *fdd;
> > + NVDECFrame *cf;
> > + AVFrame *cur_frame = s->current_picture.f;
> > +
> > + int ret, i;
> > +
> > + ret = ff_nvdec_start_frame(avctx, cur_frame);
> > + if (ret < 0)
> > + return ret;
> > +
> > + fdd = (FrameDecodeData*)cur_frame->private_ref->data;
> > + cf = (NVDECFrame*)fdd->hwaccel_priv;
> > +
> > + *pp = (CUVIDPICPARAMS) {
> > + .PicWidthInMbs = (cur_frame->width + 15) / 16,
> > + .FrameHeightInMbs = (cur_frame->height + 15) / 16,
> > + .CurrPicIdx = cf->idx,
> > +
> > + .intra_pic_flag = s->pict_type == AV_PICTURE_TYPE_I,
> > + .ref_pic_flag = s->pict_type == AV_PICTURE_TYPE_I ||
> > + s->pict_type == AV_PICTURE_TYPE_P,
>
> mpeg2 supports interlaced stuff, does it?
> There are more flags here for it that might need setting, you can
> look at the h264/hevc encoders for them.
Turns out that if you set them, it fails. :-)
I also verified that the cuvid parser doesn't set the field either.
> > + .CodecSpecific.mpeg2 = {
> > + .ForwardRefIdx = get_ref_idx(s->last_picture.f),
> > + .BackwardRefIdx = get_ref_idx(s->next_picture.f),
> > +
> > + .picture_coding_type = s->pict_type,
> > + .full_pel_forward_vector = s->full_pel[0],
> > + .full_pel_backward_vector = s->full_pel[1],
> > + .intra_dc_precision = s->intra_dc_precision,
> > + .frame_pred_frame_dct = s->frame_pred_frame_dct,
> > + .concealment_motion_vectors =
> > s->concealment_motion_vectors,
> > + .q_scale_type = s->q_scale_type,
> > + .intra_vlc_format = s->intra_vlc_format,
> > + .alternate_scan = s->alternate_scan,
> > + .top_field_first = s->top_field_first,
> > + }
> > + };
> > +
> > + ppc->f_code[0][0] = s->mpeg_f_code[0][0];
> > + ppc->f_code[0][1] = s->mpeg_f_code[0][1];
> > + ppc->f_code[1][0] = s->mpeg_f_code[1][0];
> > + ppc->f_code[1][1] = s->mpeg_f_code[1][1];
>
> more a nit, but these can be set in the struct initialization above
True enough. Done.
>
> > + for (i = 0; i < 64; ++i) {
> > + ppc->QuantMatrixIntra[i] = s->intra_matrix[i];
> > + ppc->QuantMatrixInter[i] = s->inter_matrix[i];
> > + }
> > +
> > + return 0;
> > +}
> > +
> > +static int nvdec_mpeg12_end_frame(AVCodecContext *avctx)
> > +{
> > + NVDECContext *ctx = avctx->internal->hwaccel_priv_data;
> > + int ret = ff_nvdec_end_frame(avctx);
> > + ctx->bitstream = NULL;
> > + return ret;
> > +}
> > +
> > +static int nvdec_mpeg12_decode_slice(AVCodecContext *avctx, const
> > uint8_t *buffer, uint32_t size) +{
> > + NVDECContext *ctx = avctx->internal->hwaccel_priv_data;
> > + void *tmp;
> > +
> > + tmp = av_fast_realloc(ctx->slice_offsets,
> > &ctx->slice_offsets_allocated,
> > + (ctx->nb_slices + 1) *
> > sizeof(*ctx->slice_offsets));
> > + if (!tmp)
> > + return AVERROR(ENOMEM);
> > + ctx->slice_offsets = tmp;
> > +
> > + if (!ctx->bitstream)
> > + ctx->bitstream = (uint8_t*)buffer;
> > +
> > + ctx->slice_offsets[ctx->nb_slices] = buffer - ctx->bitstream;
> > + ctx->bitstream_len += size;
> > + ctx->nb_slices++;
> > +
> > + return 0;
> > +}
> > +
> > +static int nvdec_mpeg12_frame_params(AVCodecContext *avctx,
> > + AVBufferRef *hw_frames_ctx)
> > +{
> > + // Each frame can at most have one P and one B reference
> > + return ff_nvdec_frame_params(avctx, hw_frames_ctx, 2);
> > +}
> > +
> > +#if CONFIG_MPEG2_NVDEC_HWACCEL
> > +AVHWAccel ff_mpeg2_nvdec_hwaccel = {
> > + .name = "mpeg2_nvdec",
> > + .type = AVMEDIA_TYPE_VIDEO,
> > + .id = AV_CODEC_ID_MPEG2VIDEO,
> > + .pix_fmt = AV_PIX_FMT_CUDA,
> > + .start_frame = nvdec_mpeg12_start_frame,
> > + .end_frame = nvdec_mpeg12_end_frame,
> > + .decode_slice = nvdec_mpeg12_decode_slice,
> > + .frame_params = nvdec_mpeg12_frame_params,
> > + .init = ff_nvdec_decode_init,
> > + .uninit = ff_nvdec_decode_uninit,
> > + .priv_data_size = sizeof(NVDECContext),
> > +};
> > +#endif
> > diff --git a/libavcodec/version.h b/libavcodec/version.h
> > index a75c885768..5b25a9a8ac 100644
> > --- a/libavcodec/version.h
> > +++ b/libavcodec/version.h
> > @@ -29,7 +29,7 @@
> >
> > #define LIBAVCODEC_VERSION_MAJOR 58
> > #define LIBAVCODEC_VERSION_MINOR 3
> > -#define LIBAVCODEC_VERSION_MICRO 102
> > +#define LIBAVCODEC_VERSION_MICRO 103
> >
> > #define LIBAVCODEC_VERSION_INT
> > AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
> > LIBAVCODEC_VERSION_MINOR, \
> >
>
> Looks fine otherwise
>
Thanks. Will push with the f_code change.
--phil
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
