diff options
| author | Wan-Teh Chang <wtc-at-google.com@ffmpeg.org> | 2022-06-16 09:24:22 -0700 |
|---|---|---|
| committer | James Zern <jzern@google.com> | 2022-06-23 12:44:23 -0700 |
| commit | 38bc24be8d366dbf832fa1a2a4a89901de981067 (patch) | |
| tree | 9b43520d900de8ef6a5e7590546e2b3a030b7e87 /libavcodec | |
| parent | 5a4ffb4f5ef6ab68132f74d845a911ac65c1019f (diff) | |
avcodec/libaomenc: Get number of operating points
Use the new codec control AV1E_GET_NUM_OPERATING_POINTS to get the
number of operating points. This is the size of the output arrays of
AV1E_GET_SEQ_LEVEL_IDX and AV1E_GET_TARGET_SEQ_LEVEL_IDX.
Signed-off-by: Wan-Teh Chang <wtc@google.com>
Signed-off-by: James Zern <jzern@google.com>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/libaomenc.c | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/libavcodec/libaomenc.c b/libavcodec/libaomenc.c index 7865ae161f..6b7e426bfd 100644 --- a/libavcodec/libaomenc.c +++ b/libavcodec/libaomenc.c @@ -199,6 +199,9 @@ 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_NUM_OPERATING_POINTS + [AV1E_GET_NUM_OPERATING_POINTS] = "AV1E_GET_NUM_OPERATING_POINTS", +#endif #ifdef AOM_CTRL_AV1E_GET_SEQ_LEVEL_IDX [AV1E_GET_SEQ_LEVEL_IDX] = "AV1E_GET_SEQ_LEVEL_IDX", #endif @@ -330,7 +333,8 @@ static av_cold int codecctl_int(AVCodecContext *avctx, return 0; } -#if defined(AOM_CTRL_AV1E_GET_SEQ_LEVEL_IDX) && \ +#if defined(AOM_CTRL_AV1E_GET_NUM_OPERATING_POINTS) && \ + 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 @@ -364,16 +368,20 @@ static av_cold int aom_free(AVCodecContext *avctx) { AOMContext *ctx = avctx->priv_data; -#if defined(AOM_CTRL_AV1E_GET_SEQ_LEVEL_IDX) && \ +#if defined(AOM_CTRL_AV1E_GET_NUM_OPERATING_POINTS) && \ + 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 }; + int num_operating_points; + int levels[32]; + int target_levels[32]; - if (!codecctl_intp(avctx, AV1E_GET_SEQ_LEVEL_IDX, levels) && + if (!codecctl_intp(avctx, AV1E_GET_NUM_OPERATING_POINTS, + &num_operating_points) && + !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++) { + for (int i = 0; i < num_operating_points; i++) { if (levels[i] > target_levels[i]) { // Warn when the target level was not met av_log(avctx, AV_LOG_WARNING, |