Re: [FFmpeg-devel] [PATCH v3] avcodec/videotoolboxenc: Add CBR option to H264 and HEVC encoder

[Rick Kern <kernrj@gmail.com>]

On Sun, Aug 28, 2022 at 4:27 PM Sebastian Beckmann <
beckmann.sebastian@outlook.de> wrote:

> Adds an option to use constant bitrate instead of average bitrate to the
> videotoolbox encoders. This is enabled via -constant_bit_rate true.
> macOS 13 is required for this option to work.
>
> Signed-off-by: Sebastian Beckmann <beckmann.sebastian@outlook.de>
> ---
> Removed the hard-coded check for Apple Silicon CPUs.
>
> libavcodec/videotoolboxenc.c | 27 ++++++++++++++++++++++++---
> 1 file changed, 24 insertions(+), 3 deletions(-)
>
> diff --git a/libavcodec/videotoolboxenc.c b/libavcodec/videotoolboxenc.c
> index 823e5ad94e..9de86cc4d9 100644
> --- a/libavcodec/videotoolboxenc.c
> +++ b/libavcodec/videotoolboxenc.c
> @@ -101,6 +101,7 @@ static struct{
>     CFStringRef kVTCompressionPropertyKey_RealTime;
>     CFStringRef kVTCompressionPropertyKey_TargetQualityForAlpha;
>     CFStringRef
> kVTCompressionPropertyKey_PrioritizeEncodingSpeedOverQuality;
> +    CFStringRef kVTCompressionPropertyKey_ConstantBitRate;
>
>     CFStringRef
> kVTVideoEncoderSpecification_EnableHardwareAcceleratedVideoEncoder;
>     CFStringRef
> kVTVideoEncoderSpecification_RequireHardwareAcceleratedVideoEncoder;
> @@ -164,6 +165,7 @@ static void loadVTEncSymbols(){
>             "TargetQualityForAlpha");
>     GET_SYM(kVTCompressionPropertyKey_PrioritizeEncodingSpeedOverQuality,
>             "PrioritizeEncodingSpeedOverQuality");
> +    GET_SYM(kVTCompressionPropertyKey_ConstantBitRate, "ConstantBitRate");
>
>
> GET_SYM(kVTVideoEncoderSpecification_EnableHardwareAcceleratedVideoEncoder,
>             "EnableHardwareAcceleratedVideoEncoder");
> @@ -236,6 +238,7 @@ typedef struct VTEncContext {
>     int realtime;
>     int frames_before;
>     int frames_after;
> +    bool constant_bit_rate;
>
>     int allow_sw;
>     int require_sw;
> @@ -1079,6 +1082,7 @@ static int vtenc_create_encoder(AVCodecContext
>  *avctx,
>                                 CFNumberRef      gamma_level,
>                                 CFDictionaryRef  enc_info,
>                                 CFDictionaryRef  pixel_buffer_info,
> +                                bool constant_bit_rate,
>                                 VTCompressionSessionRef *session)
> {
>     VTEncContext *vtctx = avctx->priv_data;
> @@ -1139,9 +1143,20 @@ static int vtenc_create_encoder(AVCodecContext
>  *avctx,
>                                       &bit_rate);
>         if (!bit_rate_num) return AVERROR(ENOMEM);
>
> -        status = VTSessionSetProperty(vtctx->session,
> -
> kVTCompressionPropertyKey_AverageBitRate,
> -                                      bit_rate_num);
> +        if (constant_bit_rate) {
> +            status = VTSessionSetProperty(vtctx->session,
> +
> compat_keys.kVTCompressionPropertyKey_ConstantBitRate,
> +                                          bit_rate_num);
> +            if (status == kVTPropertyNotSupportedErr) {
> +                av_log(avctx, AV_LOG_ERROR, "Error: -constant_bit_rate
> true is not supported by the encoder.\n");
> +                return AVERROR_EXTERNAL;
> +            }
> +        } else {
> +            status = VTSessionSetProperty(vtctx->session,
> +
> kVTCompressionPropertyKey_AverageBitRate,
> +                                          bit_rate_num);
> +        }
> +
>         CFRelease(bit_rate_num);
>     }
>
> @@ -1530,6 +1545,7 @@ static int vtenc_configure_encoder(AVCodecContext
> *avctx)
>                                   gamma_level,
>                                   enc_info,
>                                   pixel_buffer_info,
> +                                  vtctx->constant_bit_rate,
>                                   &vtctx->session);
>
> init_cleanup:
> @@ -2532,6 +2548,7 @@ static int vtenc_populate_extradata(AVCodecContext
>  *avctx,
>                                   gamma_level,
>                                   enc_info,
>                                   pixel_buffer_info,
> +                                  vtctx->constant_bit_rate,
>                                   &vtctx->session);
>     if (status)
>         goto pe_cleanup;
> @@ -2727,6 +2744,8 @@ static const AVOption h264_options[] = {
>
>     { "a53cc", "Use A53 Closed Captions (if available)", OFFSET(a53_cc),
> AV_OPT_TYPE_BOOL, {.i64 = 1}, 0, 1, VE },
>
> +    { "constant_bit_rate", "Require constant bit rate (macOS 13 or
> newer)", OFFSET(constant_bit_rate), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1,
> VE },
> +
>     COMMON_OPTIONS
>     { NULL },
> };
> @@ -2760,6 +2779,8 @@ static const AVOption hevc_options[] = {
>
>     { "alpha_quality", "Compression quality for the alpha channel",
> OFFSET(alpha_quality), AV_OPT_TYPE_DOUBLE, { .dbl = 0.0 }, 0.0, 1.0, VE },
>
> +    { "constant_bit_rate", "Require constant bit rate (macOS 13 or
> newer)", OFFSET(constant_bit_rate), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1,
> VE },
> +
>     COMMON_OPTIONS
>     { NULL },
> };
> --
> 2.37.0 (Apple Git-136)
>

The patch doesn't apply. Can you create a .patch file with git format-patch
and send the file as an attachment? Sometimes email clients/providers
corrupt inline patches.

The error message is:

git am ~/Downloads/\[FFmpeg-devel\]\ \[PATCH\ v3\]\
avcodec_videotoolboxenc_\ Add\ CBR\ option\ to\ H264\ and\ HEVC\ encoder.eml

Applying: avcodec/videotoolboxenc: Add CBR option to H264 and HEVC encoder

error: corrupt patch at line 41

Patch failed at 0001 avcodec/videotoolboxenc: Add CBR option to H264 and
HEVC encoder

hint: Use 'git am --show-current-patch' to see the failed patch

When you have resolved this problem, run "git am --continue".

If you prefer to skip this patch, run "git am --skip" instead.

To restore the original branch and stop patching, run "git am --abort".




>
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
>
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".