On Ma, 2022-12-05 at 14:09 +0800, Fei Wang wrote:
> From: Linjie Fu <linjie...@intel.com>
>
> Note that Screen-Extended Main 4:4:4 and 4:4:4 10 supports
> chroma_format_idc from 0, 1 or 3, hence both 420 and 444 are
> supported.
>
> Signed-off-by: Linjie Fu <linjie.justin...@gmail.com>
> Signed-off-by: Fei Wang <fei.w.w...@intel.com>
> ---
> libavcodec/vaapi_decode.c | 4 +++-
> libavcodec/vaapi_hevc.c | 14 ++++++++++++--
> libavcodec/vaapi_hevc.h | 2 +-
> 3 files changed, 16 insertions(+), 4 deletions(-)
>
> diff --git a/libavcodec/vaapi_decode.c b/libavcodec/vaapi_decode.c
> index 134f10eca5..29ac439b36 100644
> --- a/libavcodec/vaapi_decode.c
> +++ b/libavcodec/vaapi_decode.c
> @@ -410,7 +410,9 @@ static const struct {
> #endif
> #if VA_CHECK_VERSION(1, 2, 0) && CONFIG_HEVC_VAAPI_HWACCEL
> MAP(HEVC, HEVC_REXT, None,
> - ff_vaapi_parse_hevc_rext_profile ),
> + ff_vaapi_parse_hevc_profile ),
> + MAP(HEVC, HEVC_SCC, None,
> + ff_vaapi_parse_hevc_profile ),
> #endif
> MAP(MJPEG, MJPEG_HUFFMAN_BASELINE_DCT,
> JPEGBaseline),
> diff --git a/libavcodec/vaapi_hevc.c b/libavcodec/vaapi_hevc.c
> index 750738d36e..6ce1e17fa8 100644
> --- a/libavcodec/vaapi_hevc.c
> +++ b/libavcodec/vaapi_hevc.c
> @@ -586,9 +586,9 @@ static int ptl_convert(const PTLCommon *general_ptl,
> H265RawProfileTierLevel *h2
> }
>
> /*
> - * Find exact va_profile for HEVC Range Extension
> + * Find exact va_profile for HEVC Range Extension and Screen Content Coding
> Extension
> */
> -VAProfile ff_vaapi_parse_hevc_rext_profile(AVCodecContext *avctx)
> +VAProfile ff_vaapi_parse_hevc_profile(AVCodecContext *avctx)
It sounds to me the new function is for all hevc profiles, how about to use
ff_vaapi_parse_hevc_rext_scc_profile instead ?
Thanks
Haihao
> @@ -627,6 +627,16 @@ VAProfile ff_vaapi_parse_hevc_rext_profile(AVCodecContext
> *avctx)
> else if (!strcmp(profile->name, "Main 4:4:4 12") ||
> !strcmp(profile->name, "Main 4:4:4 12 Intra"))
> return VAProfileHEVCMain444_12;
> + else if (!strcmp(profile->name, "Screen-Extended Main"))
> + return VAProfileHEVCSccMain;
> + else if (!strcmp(profile->name, "Screen-Extended Main 10"))
> + return VAProfileHEVCSccMain10;
> + else if (!strcmp(profile->name, "Screen-Extended Main 4:4:4"))
> + return VAProfileHEVCSccMain444;
> +#if VA_CHECK_VERSION(1, 8, 0)
> + else if (!strcmp(profile->name, "Screen-Extended Main 4:4:4 10"))
> + return VAProfileHEVCSccMain444_10;
> +#endif
> #else
> av_log(avctx, AV_LOG_WARNING, "HEVC profile %s is "
> "not supported with this VA version.\n", profile->name);
> diff --git a/libavcodec/vaapi_hevc.h b/libavcodec/vaapi_hevc.h
> index b3b0e6fc1e..7662dca510 100644
> --- a/libavcodec/vaapi_hevc.h
> +++ b/libavcodec/vaapi_hevc.h
> @@ -22,6 +22,6 @@
> #include <va/va.h>
> #include "avcodec.h"
>
> -VAProfile ff_vaapi_parse_hevc_rext_profile(AVCodecContext *avctx);
> +VAProfile ff_vaapi_parse_hevc_profile(AVCodecContext *avctx);
>
> #endif /* AVCODEC_VAAPI_HEVC_H */
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
