virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

avcodec/libaomenc: Add unmet target level warning

Browse Source 
When target levels are set, this patch checks whether they are
satisfied by libaom. If not, a warning is shown. Otherwise the output
levels are also logged.

This patch applies basically the same approach used for libvpx.

Signed-off-by: Bohan Li <bohanli@google.com>
Signed-off-by: James Zern <jzern@google.com>
This commit is contained in:
Bohan Li
2022-04-19 11:18:51 -07:00
committed by James Zern
parent 93b31dae1d
commit 950123dc31
2 changed files with 65 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
libavcodec/libaomenc.c
View File

@@ -199,6 +199,12 @@ static const char *const ctlidstr[] = {
[AV1E_SET_ENABLE_SMOOTH_INTERINTRA] = "AV1E_SET_ENABLE_SMOOTH_INTERINTRA",
[AV1E_SET_ENABLE_REF_FRAME_MVS] = "AV1E_SET_ENABLE_REF_FRAME_MVS",
#endif
#ifdef AOM_CTRL_AV1E_GET_SEQ_LEVEL_IDX
[AV1E_GET_SEQ_LEVEL_IDX] = "AV1E_GET_SEQ_LEVEL_IDX",
#endif
#ifdef AOM_CTRL_AV1E_GET_TARGET_SEQ_LEVEL_IDX
[AV1E_GET_TARGET_SEQ_LEVEL_IDX] = "AV1E_GET_TARGET_SEQ_LEVEL_IDX",
#endif
};
static av_cold void log_encoder_error(AVCodecContext *avctx, const char *desc)
@@ -324,10 +330,68 @@ static av_cold int codecctl_int(AVCodecContext *avctx,
return 0;
}
#if defined(AOM_CTRL_AV1E_GET_SEQ_LEVEL_IDX) && \
defined(AOM_CTRL_AV1E_GET_TARGET_SEQ_LEVEL_IDX)
static av_cold int codecctl_intp(AVCodecContext *avctx,
#ifdef UENUM1BYTE
aome_enc_control_id id,
#else
enum aome_enc_control_id id,
#endif
int* ptr)
{
AOMContext *ctx = avctx->priv_data;
char buf[80];
int width = -30;
int res;
snprintf(buf, sizeof(buf), "%s:", ctlidstr[id]);
av_log(avctx, AV_LOG_DEBUG, " %*s%d\n", width, buf, *ptr);
res = aom_codec_control(&ctx->encoder, id, ptr);
if (res != AOM_CODEC_OK) {
snprintf(buf, sizeof(buf), "Failed to set %s codec control",
ctlidstr[id]);
log_encoder_error(avctx, buf);
return AVERROR(EINVAL);
}
return 0;
}
#endif
static av_cold int aom_free(AVCodecContext *avctx)
{
AOMContext *ctx = avctx->priv_data;
#if defined(AOM_CTRL_AV1E_GET_SEQ_LEVEL_IDX) && \
defined(AOM_CTRL_AV1E_GET_TARGET_SEQ_LEVEL_IDX)
if (!(avctx->flags & AV_CODEC_FLAG_PASS1)) {
int levels[32] = { 0 };
int target_levels[32] = { 0 };
if (!codecctl_intp(avctx, AV1E_GET_SEQ_LEVEL_IDX, levels) &&
!codecctl_intp(avctx, AV1E_GET_TARGET_SEQ_LEVEL_IDX,
target_levels)) {
for (int i = 0; i < 32; i++) {
if (levels[i] > target_levels[i]) {
// Warn when the target level was not met
av_log(avctx, AV_LOG_WARNING,
"Could not encode to target level %d.%d for "
"operating point %d. The output level is %d.%d.\n",
2 + (target_levels[i] >> 2), target_levels[i] & 3,
i, 2 + (levels[i] >> 2), levels[i] & 3);
} else if (target_levels[i] < 31) {
// Log the encoded level if a target level was given
av_log(avctx, AV_LOG_INFO,
"Output level for operating point %d is %d.%d.\n",
i, 2 + (levels[i] >> 2), levels[i] & 3);
}
}
}
}
#endif
aom_codec_destroy(&ctx->encoder);
av_freep(&ctx->twopass_stats.buf);
av_freep(&avctx->stats_out);

2
libavcodec/version.h
View File

@@ -30,7 +30,7 @@
#include "version_major.h"
#define LIBAVCODEC_VERSION_MINOR 32
#define LIBAVCODEC_VERSION_MICRO 100
#define LIBAVCODEC_VERSION_MICRO 101
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
LIBAVCODEC_VERSION_MINOR, \