Re: [FFmpeg-devel] [PATCH] libtheoraenc: Add encoding speed level option

[Michael Niedermayer <michael@niedermayer.cc>]

[-- Attachment #1.1: Type: text/plain, Size: 3766 bytes --]

Hi Bernat

On Sun, Jul 20, 2025 at 09:15:07PM +0200, Bernat Arlandis wrote:
> El 19/7/25 a las 18:26, bernat.arlandis@gmail.com escribió:
> > From: Bernat Arlandis <berarma@hotmail.com>
> > 
> > ---
> >   libavcodec/libtheoraenc.c | 27 +++++++++++++++++++++++++++
> >   1 file changed, 27 insertions(+)
> > 
> > diff --git a/libavcodec/libtheoraenc.c b/libavcodec/libtheoraenc.c
> > index eb94458639..de2b913634 100644
> > --- a/libavcodec/libtheoraenc.c
> > +++ b/libavcodec/libtheoraenc.c
> > @@ -37,6 +37,7 @@
> >   #include "libavutil/pixdesc.h"
> >   #include "libavutil/log.h"
> >   #include "libavutil/base64.h"
> > +#include "libavutil/opt.h"
> >   #include "avcodec.h"
> >   #include "codec_internal.h"
> >   #include "encode.h"
> > @@ -45,6 +46,7 @@
> >   #include <theora/theoraenc.h>
> >   typedef struct TheoraContext {
> > +    AVClass    *av_class;                  /**< class for AVOptions            */
> >       th_enc_ctx *t_state;
> >       uint8_t    *stats;
> >       int         stats_size;
> > @@ -52,8 +54,21 @@ typedef struct TheoraContext {
> >       int         uv_hshift;
> >       int         uv_vshift;
> >       int         keyframe_mask;
> > +    int         speed_level;
> >   } TheoraContext;
> > +static const AVOption options[] = {
> > +    { "speed_level", "Sets the encoding speed level", offsetof(TheoraContext, speed_level), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, INT_MAX, AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM },
> > +    { NULL }
> > +};
> > +
> > +static const AVClass theora_class = {
> > +    .class_name = "libtheora",
> > +    .item_name  = av_default_item_name,
> > +    .option     = options,
> > +    .version    = LIBAVUTIL_VERSION_INT,
> > +};
> > +
> >   /** Concatenate an ogg_packet into the extradata. */
> >   static int concatenate_packet(unsigned int* offset,
> >                                 AVCodecContext* avc_context,
> > @@ -244,6 +259,17 @@ static av_cold int encode_init(AVCodecContext* avc_context)
> >           return AVERROR_EXTERNAL;
> >       }
> > +    // Set encoding speed level
> > +    if (h->speed_level != -1) {
> > +        int max_speed_level;
> > +        int speed_level = h->speed_level;
> > +        th_encode_ctl(h->t_state, TH_ENCCTL_GET_SPLEVEL_MAX, &max_speed_level, sizeof(max_speed_level));
> > +        if (speed_level > max_speed_level) {
> > +            speed_level = max_speed_level;
> > +        }
> > +        th_encode_ctl(h->t_state, TH_ENCCTL_SET_SPLEVEL, &speed_level, sizeof(speed_level));
> > +    }
> > +
> >       // need to enable 2 pass (via TH_ENCCTL_2PASS_) before encoding headers
> >       if (avc_context->flags & AV_CODEC_FLAG_PASS1) {
> >           if ((ret = get_stats(avc_context, 0)) < 0)
> > @@ -389,6 +415,7 @@ const FFCodec ff_libtheora_encoder = {
> >       .close          = encode_close,
> >       FF_CODEC_ENCODE_CB(encode_frame),
> >       CODEC_PIXFMTS(AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUV444P),
> > +    .p.priv_class   = &theora_class,
> >       .color_ranges   = AVCOL_RANGE_MPEG,
> >       .p.wrapper_name = "libtheora",
> >   };
> > 
> > base-commit: bedfb6eca402037f5cbb115fa767d106b8c14f1c
> I've used -1 for the default library value, but there might be a better way
> to tell the code to use the default value without exposing this value to the
> user.  I just don't know how.

-1 is ok, will apply with
speed_level = FFMIN(speed_level, max_speed_level); instead of teh if()...

thx

[...]
-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

"Nothing to hide" only works if the folks in power share the values of
you and everyone you know entirely and always will -- Tom Scott


[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 195 bytes --]

[-- Attachment #2: Type: text/plain, Size: 251 bytes --]

_______________________________________________
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".