Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthieu Patou <mpatou@fb.com>2021-06-14 21:18:24 +0300
committerThilo Borgmann <thilo.borgmann@mail.de>2021-06-14 21:25:52 +0300
commit268f134e51e59581cd5951fb4cc9f80c6cba8094 (patch)
tree65e9c522c4a81e8ef6c238ab24daa97401c932df /libavcodec/libaomenc.c
parent7d1464721ebf5c90308e48cb81ad52dbada47c18 (diff)
lavc/libaomenc: Show encoder config as a warning in case of failed initialization
Suggested-By: ffmpeg@fb.com
Diffstat (limited to 'libavcodec/libaomenc.c')
-rw-r--r--libavcodec/libaomenc.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/libavcodec/libaomenc.c b/libavcodec/libaomenc.c
index 779714fdaa..f977fb4889 100644
--- a/libavcodec/libaomenc.c
+++ b/libavcodec/libaomenc.c
@@ -209,10 +209,10 @@ static av_cold void log_encoder_error(AVCodecContext *avctx, const char *desc)
}
static av_cold void dump_enc_cfg(AVCodecContext *avctx,
- const struct aom_codec_enc_cfg *cfg)
+ const struct aom_codec_enc_cfg *cfg,
+ int level)
{
int width = -30;
- int level = AV_LOG_DEBUG;
av_log(avctx, level, "aom_codec_enc_cfg\n");
av_log(avctx, level, "generic settings\n"
@@ -612,7 +612,7 @@ static av_cold int aom_init(AVCodecContext *avctx,
return AVERROR(EINVAL);
}
- dump_enc_cfg(avctx, &enccfg);
+ dump_enc_cfg(avctx, &enccfg, AV_LOG_DEBUG);
enccfg.g_w = avctx->width;
enccfg.g_h = avctx->height;
@@ -746,13 +746,14 @@ static av_cold int aom_init(AVCodecContext *avctx,
if (res < 0)
return res;
- dump_enc_cfg(avctx, &enccfg);
/* Construct Encoder Context */
res = aom_codec_enc_init(&ctx->encoder, iface, &enccfg, flags);
if (res != AOM_CODEC_OK) {
+ dump_enc_cfg(avctx, &enccfg, AV_LOG_WARNING);
log_encoder_error(avctx, "Failed to initialize encoder");
return AVERROR(EINVAL);
}
+ dump_enc_cfg(avctx, &enccfg, AV_LOG_DEBUG);
// codec control failures are currently treated only as warnings
av_log(avctx, AV_LOG_DEBUG, "aom_codec_control\n");