RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

lavc/decode: pass AVHWAccel instead of AVCodecHWConfigInternal to hwaccel_init() 

The only thing besides the hwaccel that this function uses from
AVCodecHWConfigInternal is the pixel format, which should always match
the hwaccel one.

Will be useful in following commits.
This commit is contained in:
Anton Khirnov 2023-04-28 11:33:38 +02:00 committed by Lynne
parent 62d4110a64
commit a4611e3170
No known key found for this signature in database
GPG Key ID: A2FEA5F03F034464
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/decode.c
View File

@ -1111,12 +1111,10 @@ int avcodec_get_hw_frames_parameters(AVCodecContext *avctx,
} }
static int hwaccel_init(AVCodecContext *avctx, static int hwaccel_init(AVCodecContext *avctx,
const AVCodecHWConfigInternal *hw_config) const AVHWAccel *hwaccel)
{ {
const AVHWAccel *hwaccel;
int err; int err;
hwaccel = hw_config->hwaccel;
if (hwaccel->capabilities & AV_HWACCEL_CODEC_CAP_EXPERIMENTAL && if (hwaccel->capabilities & AV_HWACCEL_CODEC_CAP_EXPERIMENTAL &&
avctx->strict_std_compliance > FF_COMPLIANCE_EXPERIMENTAL) { avctx->strict_std_compliance > FF_COMPLIANCE_EXPERIMENTAL) {
av_log(avctx, AV_LOG_WARNING, "Ignoring experimental hwaccel: %s\n", av_log(avctx, AV_LOG_WARNING, "Ignoring experimental hwaccel: %s\n",
@ -1137,7 +1135,7 @@ static int hwaccel_init(AVCodecContext *avctx,
if (err < 0) { if (err < 0) {
av_log(avctx, AV_LOG_ERROR, "Failed setup for format %s: " av_log(avctx, AV_LOG_ERROR, "Failed setup for format %s: "
"hwaccel initialisation returned error.\n", "hwaccel initialisation returned error.\n",
av_get_pix_fmt_name(hw_config->public.pix_fmt)); av_get_pix_fmt_name(hwaccel->pix_fmt));
av_freep(&avctx->internal->hwaccel_priv_data); av_freep(&avctx->internal->hwaccel_priv_data);
avctx->hwaccel = NULL; avctx->hwaccel = NULL;
return err; return err;
@ -1271,7 +1269,7 @@ int ff_get_format(AVCodecContext *avctx, const enum AVPixelFormat *fmt)
if (hw_config->hwaccel) { if (hw_config->hwaccel) {
av_log(avctx, AV_LOG_DEBUG, "Format %s requires hwaccel " av_log(avctx, AV_LOG_DEBUG, "Format %s requires hwaccel "
"initialisation.\n", desc->name); "initialisation.\n", desc->name);
err = hwaccel_init(avctx, hw_config); err = hwaccel_init(avctx, hw_config->hwaccel);
if (err < 0) if (err < 0)
goto try_again; goto try_again;
} }