From: "Wang, Fei W" <fei.w.wang-at-intel.com@ffmpeg.org>
To: "ffmpeg-devel@ffmpeg.org" <ffmpeg-devel@ffmpeg.org>
Subject: Re: [FFmpeg-devel] [PATCH v1] lavc/qsvdec: Add VVC decoder
Date: Wed, 12 Jun 2024 07:07:08 +0000
Message-ID: <8c54ab8ce958d3ac1bd09ccc469c43735b6752aa.camel@intel.com> (raw)
In-Reply-To: <20240612065903.3190528-1-fei.w.wang@intel.com>
On Wed, 2024-06-12 at 14:59 +0800, fei.w.wang@intel.com wrote:
> From: Fei Wang <fei.w.wang@intel.com>
Sorry for duplicate version. Please ignore this one.
Thanks
>
> Signed-off-by: Fei Wang <fei.w.wang@intel.com>
> ---
> Changelog | 1 +
> configure | 1 +
> doc/decoders.texi | 2 +-
> libavcodec/allcodecs.c | 1 +
> libavcodec/qsv.c | 4 ++++
> libavcodec/qsvdec.c | 7 ++++++-
> libavcodec/version.h | 2 +-
> 7 files changed, 15 insertions(+), 3 deletions(-)
>
> diff --git a/Changelog b/Changelog
> index 03d6b29ad8..a238a1c1f3 100644
> --- a/Changelog
> +++ b/Changelog
> @@ -12,6 +12,7 @@ version <next>:
> - qsv_params option added for QSV encoders
> - VVC decoder compatible with DVB test content
> - xHE-AAC decoder
> +- Intel QSV-accelerated VVC decoding
>
>
> version 7.0:
> diff --git a/configure b/configure
> index 6c5b8aab9a..b4cf12658d 100755
> --- a/configure
> +++ b/configure
> @@ -3423,6 +3423,7 @@ av1_qsv_encoder_deps="libvpl"
> av1_amf_encoder_deps="amf"
> av1_vaapi_encoder_deps="VAEncPictureParameterBufferAV1"
> av1_vaapi_encoder_select="cbs_av1 vaapi_encode"
> +vvc_qsv_decoder_select="qsvdec"
>
> # parsers
> aac_parser_select="adts_header mpeg4audio"
> diff --git a/doc/decoders.texi b/doc/decoders.texi
> index 293c82c2ba..2fcc761d2f 100644
> --- a/doc/decoders.texi
> +++ b/doc/decoders.texi
> @@ -157,7 +157,7 @@ Force to use a specific number of threads
> @section QSV Decoders
>
> The family of Intel QuickSync Video decoders (VC1, MPEG-2, H.264,
> HEVC,
> -JPEG/MJPEG, VP8, VP9, AV1).
> +JPEG/MJPEG, VP8, VP9, AV1, VVC).
>
> @subsection Common Options
>
> diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c
> index b102a8069e..a73b4e1673 100644
> --- a/libavcodec/allcodecs.c
> +++ b/libavcodec/allcodecs.c
> @@ -885,6 +885,7 @@ extern const FFCodec ff_vp9_mediacodec_encoder;
> extern const FFCodec ff_vp9_qsv_decoder;
> extern const FFCodec ff_vp9_vaapi_encoder;
> extern const FFCodec ff_vp9_qsv_encoder;
> +extern const FFCodec ff_vvc_qsv_decoder;
>
> // null codecs
> extern const FFCodec ff_vnull_decoder;
> diff --git a/libavcodec/qsv.c b/libavcodec/qsv.c
> index 0c6fbd0dc0..221c1b24e5 100644
> --- a/libavcodec/qsv.c
> +++ b/libavcodec/qsv.c
> @@ -73,6 +73,10 @@ int ff_qsv_codec_id_to_mfx(enum AVCodecID
> codec_id)
> case AV_CODEC_ID_AV1:
> return MFX_CODEC_AV1;
> #endif
> +#if QSV_VERSION_ATLEAST(2, 11)
> + case AV_CODEC_ID_VVC:
> + return MFX_CODEC_VVC;
> +#endif
>
> default:
> break;
> diff --git a/libavcodec/qsvdec.c b/libavcodec/qsvdec.c
> index f2cd6ae05c..9ad3439991 100644
> --- a/libavcodec/qsvdec.c
> +++ b/libavcodec/qsvdec.c
> @@ -933,7 +933,8 @@ static int qsv_decode(AVCodecContext *avctx,
> QSVContext *q,
> frame->pict_type = ff_qsv_map_pictype(aframe.frame-
> >dec_info.FrameType);
>
> if (avctx->codec_id == AV_CODEC_ID_H264 ||
> - avctx->codec_id == AV_CODEC_ID_HEVC) {
> + avctx->codec_id == AV_CODEC_ID_HEVC ||
> + avctx->codec_id == AV_CODEC_ID_VVC) {
> if (aframe.frame->dec_info.FrameType &
> MFX_FRAMETYPE_IDR)
> frame->flags |= AV_FRAME_FLAG_KEY;
> else
> @@ -1300,3 +1301,7 @@ DEFINE_QSV_DECODER(vp9, VP9, NULL)
> #if CONFIG_AV1_QSV_DECODER
> DEFINE_QSV_DECODER(av1, AV1, NULL)
> #endif
> +
> +#if CONFIG_VVC_QSV_DECODER
> +DEFINE_QSV_DECODER(vvc, VVC, NULL)
> +#endif
> diff --git a/libavcodec/version.h b/libavcodec/version.h
> index 7acb261bb3..37c4c39451 100644
> --- a/libavcodec/version.h
> +++ b/libavcodec/version.h
> @@ -29,7 +29,7 @@
>
> #include "version_major.h"
>
> -#define LIBAVCODEC_VERSION_MINOR 7
> +#define LIBAVCODEC_VERSION_MINOR 8
> #define LIBAVCODEC_VERSION_MICRO 100
>
> #define
> LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
next prev parent reply other threads:[~2024-06-12 7:07 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-12 6:59 fei.w.wang-at-intel.com
2024-06-12 7:07 ` Wang, Fei W [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-06-12 0:58 fei.w.wang-at-intel.com
2024-06-12 12:12 ` Nuo Mi
2024-06-13 6:29 ` Wang, Fei W
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=8c54ab8ce958d3ac1bd09ccc469c43735b6752aa.camel@intel.com \
--to=fei.w.wang-at-intel.com@ffmpeg.org \
--cc=ffmpeg-devel@ffmpeg.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git