On Sun, Jun 5, 2016 at 8:58 PM, Timo Rothenpieler <t...@rothenpieler.org> wrote:
> ---
> Changelog | 2 +
> MAINTAINERS | 1 +
> configure | 20 ++
> libavcodec/Makefile | 2 +
> libavcodec/allcodecs.c | 4 +
> libavcodec/cuvid.c | 550
> +++++++++++++++++++++++++++++++++++++++++++++++++
> libavcodec/version.h | 4 +-
> 7 files changed, 581 insertions(+), 2 deletions(-)
> create mode 100644 libavcodec/cuvid.c
>
> diff --git a/Changelog b/Changelog
> index d5228b2..35e17e5 100644
> --- a/Changelog
> +++ b/Changelog
> @@ -38,6 +38,8 @@ version <next>:
> - loudnorm filter
> - MTAF demuxer and decoder
> - MagicYUV decoder
> +- CUDA CUVID H264/HEVC decoder
> +
>
> version 3.0:
> - Common Encryption (CENC) MP4 encoding and decoding support
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 9ce2524..bf99d0c 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -163,6 +163,7 @@ Codecs:
> cpia.c Stephan Hilb
> crystalhd.c Philip Langdale
> cscd.c Reimar Doeffinger
> + cuvid.c Timo Rothenpieler
> dca.c Kostya Shishkov, Benjamin Larsson
> dirac* Rostislav Pehlivanov
> dnxhd* Baptiste Coudurier
> diff --git a/configure b/configure
> index 7c463a5..2b2d5f8 100755
> --- a/configure
> +++ b/configure
> @@ -158,6 +158,7 @@ Hardware accelerators:
>
> Hardware-accelerated decoding/encoding:
> --enable-cuda enable dynamically linked CUDA [no]
> + --enable-cuvid enable CUVID support [autodetect]
> --enable-libmfx enable HW acceleration through libmfx
> --enable-mmal enable decoding via MMAL [no]
> --enable-nvenc enable NVIDIA NVENC support [no]
> @@ -1567,6 +1568,7 @@ FEATURE_LIST="
>
> HW_CODECS_LIST="
> cuda
> + cuvid
> libmfx
> mmal
> nvenc
> @@ -2328,6 +2330,7 @@ comfortnoise_encoder_select="lpc"
> cook_decoder_select="audiodsp mdct sinewin"
> cscd_decoder_select="lzo"
> cscd_decoder_suggest="zlib"
> +cuvid_decoder_deps="cuda cuvid"
> dca_decoder_select="mdct"
> dds_decoder_select="texturedsp"
> dirac_decoder_select="dirac_parse dwt golomb videodsp mpegvideoenc"
> @@ -2522,6 +2525,7 @@ audiotoolbox_extralibs="-framework CoreFoundation
> -framework AudioToolbox -frame
>
> # hardware accelerators
> crystalhd_deps="libcrystalhd_libcrystalhd_if_h"
> +cuvid_deps="cuda"
> d3d11va_deps="d3d11_h dxva_h ID3D11VideoDecoder ID3D11VideoContext"
> dxva2_deps="dxva2api_h DXVA2_ConfigPictureDecode"
> vaapi_deps="va_va_h"
> @@ -2539,6 +2543,7 @@ h263_vaapi_hwaccel_select="h263_decoder"
> h263_videotoolbox_hwaccel_deps="videotoolbox"
> h263_videotoolbox_hwaccel_select="h263_decoder"
> h264_crystalhd_decoder_select="crystalhd h264_mp4toannexb_bsf h264_parser"
> +h264_cuvid_hwaccel_deps="cuda cuvid"
> h264_d3d11va_hwaccel_deps="d3d11va"
> h264_d3d11va_hwaccel_select="h264_decoder"
> h264_dxva2_hwaccel_deps="dxva2"
> @@ -2564,6 +2569,7 @@ h264_vdpau_hwaccel_deps="vdpau"
> h264_vdpau_hwaccel_select="h264_decoder"
> h264_videotoolbox_hwaccel_deps="videotoolbox"
> h264_videotoolbox_hwaccel_select="h264_decoder"
> +hevc_cuvid_hwaccel_deps="cuda cuvid"
> hevc_d3d11va_hwaccel_deps="d3d11va DXVA_PicParams_HEVC"
> hevc_d3d11va_hwaccel_select="hevc_decoder"
> hevc_dxva2_hwaccel_deps="dxva2 DXVA_PicParams_HEVC"
> @@ -2657,6 +2663,8 @@ hwupload_cuda_filter_deps="cuda"
> scale_npp_filter_deps="cuda libnpp"
>
> nvenc_encoder_deps="nvenc"
> +h264_cuvid_decoder_deps="cuda cuvid"
> +h264_cuvid_decoder_select="h264_mp4toannexb_bsf h264_cuvid_hwaccel"
> h264_qsv_decoder_deps="libmfx"
> h264_qsv_decoder_select="h264_mp4toannexb_bsf h264_parser qsvdec
> h264_qsv_hwaccel"
> h264_qsv_encoder_deps="libmfx"
> @@ -2664,6 +2672,8 @@ h264_qsv_encoder_select="qsvenc"
> h264_vaapi_encoder_deps="VAEncPictureParameterBufferH264"
> h264_vaapi_encoder_select="vaapi_encode golomb"
>
> +hevc_cuvid_decoder_deps="cuda cuvid"
> +hevc_cuvid_decoder_select="hevc_mp4toannexb_bsf hevc_cuvid_hwaccel"
> hevc_qsv_decoder_deps="libmfx"
> hevc_qsv_decoder_select="hevc_mp4toannexb_bsf hevc_parser qsvdec
> hevc_qsv_hwaccel"
> hevc_qsv_encoder_deps="libmfx"
> @@ -5002,6 +5012,7 @@ die_license_disabled gpl libxvid
> die_license_disabled gpl x11grab
>
> die_license_disabled nonfree cuda
> +die_license_disabled nonfree cuvid
> die_license_disabled nonfree libfaac
> die_license_disabled nonfree libnpp
> enabled gpl && die_license_disabled_gpl nonfree libfdk_aac
> @@ -5572,6 +5583,11 @@ for func in $COMPLEX_FUNCS; do
> eval check_complexfunc $func \${${func}_args:-1}
> done
>
> +# Enable CUVID by default if CUDA is enabled
> +if enabled cuda && ! disabled cuvid; then
> + enable cuvid
> +fi
> +
> # these are off by default, so fail if requested and not available
> enabled avfoundation_indev && { check_header_objcc
> AVFoundation/AVFoundation.h || disable avfoundation_indev; }
> enabled avfoundation_indev && { check_lib2 CoreGraphics/CoreGraphics.h
> CGGetActiveDisplayList -framework CoreGraphics ||
> @@ -5581,6 +5597,10 @@ enabled avisynth && { { check_lib2
> "windows.h" LoadLibrary; } ||
> die "ERROR: LoadLibrary/dlopen not found for
> avisynth"; }
> enabled cuda && { check_lib cuda.h cuInit -lcuda ||
> die "ERROR: CUDA not found"; }
> +enabled cuvid && { check_lib cuviddec.h cuvidCreateDecoder
> -lnvcuvid ||
> + die "ERROR: CUVID not found"; } &&
> + { enabled cuda ||
> + die "ERROR: CUVID requires CUDA"; }
> enabled chromaprint && require chromaprint chromaprint.h
> chromaprint_get_version -lchromaprint
> enabled coreimage_filter && { check_header_objcc QuartzCore/CoreImage.h ||
> disable coreimage_filter; }
> enabled coreimagesrc_filter && { check_header_objcc QuartzCore/CoreImage.h
> || disable coreimagesrc_filter; }
> diff --git a/libavcodec/Makefile b/libavcodec/Makefile
> index 6e26aad..2927b84 100644
> --- a/libavcodec/Makefile
> +++ b/libavcodec/Makefile
> @@ -767,12 +767,14 @@ OBJS-$(CONFIG_QSV) += qsv.o
> OBJS-$(CONFIG_QSVDEC) += qsvdec.o
> OBJS-$(CONFIG_QSVENC) += qsvenc.o
>
> +OBJS-$(CONFIG_H264_CUVID_DECODER) += cuvid.o
> OBJS-$(CONFIG_H264_MMAL_DECODER) += mmaldec.o
> OBJS-$(CONFIG_H264_VDA_DECODER) += vda_h264_dec.o
> OBJS-$(CONFIG_H264_OMX_ENCODER) += omx.o
> OBJS-$(CONFIG_H264_QSV_DECODER) += qsvdec_h2645.o
> OBJS-$(CONFIG_H264_QSV_ENCODER) += qsvenc_h264.o
> OBJS-$(CONFIG_H264_VAAPI_ENCODER) += vaapi_encode_h264.o
> vaapi_encode_h26x.o
> +OBJS-$(CONFIG_HEVC_CUVID_DECODER) += cuvid.o
> OBJS-$(CONFIG_HEVC_QSV_DECODER) += qsvdec_h2645.o
> OBJS-$(CONFIG_HEVC_QSV_ENCODER) += qsvenc_hevc.o hevc_ps_enc.o
> h2645_parse.o
> OBJS-$(CONFIG_HEVC_VAAPI_ENCODER) += vaapi_encode_h265.o
> vaapi_encode_h26x.o
> diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c
> index 7aa54ee..9256e99 100644
> --- a/libavcodec/allcodecs.c
> +++ b/libavcodec/allcodecs.c
> @@ -69,6 +69,7 @@ void avcodec_register_all(void)
> /* hardware accelerators */
> REGISTER_HWACCEL(H263_VAAPI, h263_vaapi);
> REGISTER_HWACCEL(H263_VIDEOTOOLBOX, h263_videotoolbox);
> + REGISTER_HWACCEL(H264_CUVID, h264_cuvid);
> REGISTER_HWACCEL(H264_D3D11VA, h264_d3d11va);
> REGISTER_HWACCEL(H264_DXVA2, h264_dxva2);
> REGISTER_HWACCEL(H264_MMAL, h264_mmal);
> @@ -78,6 +79,7 @@ void avcodec_register_all(void)
> REGISTER_HWACCEL(H264_VDA_OLD, h264_vda_old);
> REGISTER_HWACCEL(H264_VDPAU, h264_vdpau);
> REGISTER_HWACCEL(H264_VIDEOTOOLBOX, h264_videotoolbox);
> + REGISTER_HWACCEL(HEVC_CUVID, hevc_cuvid);
> REGISTER_HWACCEL(HEVC_D3D11VA, hevc_d3d11va);
> REGISTER_HWACCEL(HEVC_DXVA2, hevc_dxva2);
> REGISTER_HWACCEL(HEVC_QSV, hevc_qsv);
> @@ -617,6 +619,7 @@ void avcodec_register_all(void)
> /* external libraries, that shouldn't be used by default if one of the
> * above is available */
> REGISTER_ENCODER(LIBOPENH264, libopenh264);
> + REGISTER_DECODER(H264_CUVID, h264_cuvid);
> REGISTER_ENCODER(H264_QSV, h264_qsv);
> REGISTER_ENCODER(H264_VAAPI, h264_vaapi);
> REGISTER_ENCODER(H264_VIDEOTOOLBOX, h264_videotoolbox);
> @@ -624,6 +627,7 @@ void avcodec_register_all(void)
> REGISTER_ENCODER(H264_OMX, h264_omx);
> REGISTER_ENCODER(NVENC_H264, nvenc_h264);
> REGISTER_ENCODER(NVENC_HEVC, nvenc_hevc);
> + REGISTER_DECODER(HEVC_CUVID, hevc_cuvid);
> REGISTER_ENCODER(HEVC_QSV, hevc_qsv);
> REGISTER_ENCODER(HEVC_VAAPI, hevc_vaapi);
> REGISTER_ENCODER(LIBKVAZAAR, libkvazaar);
> diff --git a/libavcodec/cuvid.c b/libavcodec/cuvid.c
> new file mode 100644
> index 0000000..6cadadf
> --- /dev/null
> +++ b/libavcodec/cuvid.c
> @@ -0,0 +1,550 @@
> +/*
> + * Nvidia CUVID decoder
> + * Copyright (c) 2016 Timo Rothenpieler <t...@rothenpieler.org>
> + *
> + * 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 "libavutil/buffer.h"
> +#include "libavutil/mathematics.h"
> +#include "libavutil/hwcontext.h"
> +#include "libavutil/hwcontext_cuda.h"
> +#include "libavutil/fifo.h"
> +#include "libavutil/log.h"
> +
> +#include "avcodec.h"
> +#include "internal.h"
> +
> +#include <nvcuvid.h>
> +
> +#define MAX_FRAME_COUNT 20
> +#define FRAME_DELAY 4
> +
> +typedef struct CuvidContext
> +{
> + CUvideodecoder cudecoder;
> + CUvideoparser cuparser;
> +
> + AVBufferRef *hwdevice;
> + AVBufferRef *hwframe;
> +
> + AVBSFContext *bsf;
> +
> + AVFifoBuffer *frame_queue;
> +
> + int internal_error;
> +} CuvidContext;
> +
> +static int CUDAAPI cuvid_handle_video_sequence(void *opaque, CUVIDEOFORMAT*
> format)
> +{
> + AVCodecContext *avctx = opaque;
> + CuvidContext *ctx = avctx->priv_data;
> + AVHWFramesContext *hwframe_ctx = (AVHWFramesContext*)ctx->hwframe->data;
> + CUVIDDECODECREATEINFO cuinfo;
> + CUresult err;
> +
> + ctx->internal_error = 0;
> +
> + if (ctx->cudecoder) {
> + av_log(avctx, AV_LOG_ERROR, "re-initializing decoder is not
> supported\n");
> + ctx->internal_error = AVERROR(EINVAL);
> + return 0;
> + }
> +
> + if (hwframe_ctx->pool) {
> + av_log(avctx, AV_LOG_ERROR, "AVHWFramesContext is already
> initialized\n");
> + ctx->internal_error = AVERROR(EINVAL);
> + return 0;
> + }
> +
> + avctx->width = format->coded_width;
> + avctx->height = format->coded_height;
One thing I forgot in the other mail, it might be nice to export a few
more properties from the format struct into avctx.
At least aspect ratio comes to mind, the video_signal_description
would be icing on the cake!
- Hendrik
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
