[FFmpeg-devel] [PATCH] avcodec/libaomenc: add init cleanup flag

[James Almer]

On 8/25/2022 4:21 PM, James Zern wrote:
> On Thu, Aug 25, 2022 at 10:39 AM James Almer <jamrial at gmail.com> wrote:
>>
>> On 8/25/2022 2:34 PM, James Zern wrote:
>>> On Thu, Aug 25, 2022 at 10:16 AM James Almer <jamrial at gmail.com> wrote:
>>>>
>>>> Signed-off-by: James Almer <jamrial at gmail.com>
>>>> ---
>>>> There doesn't seem to be any proper API to check if an encoder is open.
>>>>
>>>
>>> true.
>>>
>>>>    libavcodec/libaomenc.c | 3 ++-
>>>>    1 file changed, 2 insertions(+), 1 deletion(-)
>>>>
>>>
>>> lgtm.
>>
>> Will apply, thanks.
>>
>>>
>>>> diff --git a/libavcodec/libaomenc.c b/libavcodec/libaomenc.c
>>>> index 485f554165..fb9a6ff8b2 100644
>>>> --- a/libavcodec/libaomenc.c
>>>> +++ b/libavcodec/libaomenc.c
>>>> @@ -400,7 +400,7 @@ static av_cold int aom_free(AVCodecContext *avctx)
>>>>    #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)) {
>>>> +    if (ctx->encoder->iface && !(avctx->flags & AV_CODEC_FLAG_PASS1)) {
> 
> I missed this, it should be 'ctx->encoder.iface'.

Huh. When were those three defines above added? Guess they are not in 
any tagged release?

Fixed in any case. Thanks.

> 
>>>
>>> This check is fine, though the codec control call should fail if iface is null.
>>>
>>>>            int num_operating_points;
>>>>            int levels[32];
>>>>            int target_levels[32];
>>>> @@ -1544,6 +1544,7 @@ FFCodec ff_libaom_av1_encoder = {
>>>>        FF_CODEC_ENCODE_CB(aom_encode),
>>>>        .close          = aom_free,
>>>>        .caps_internal  = FF_CODEC_CAP_NOT_INIT_THREADSAFE |
>>>> +                      FF_CODEC_CAP_INIT_CLEANUP |
>>>>                          FF_CODEC_CAP_AUTO_THREADS,
>>>>        .defaults       = defaults,
>>>>        .init_static_data = av1_init_static,
>>>> --
>>>> 2.37.2
>>>>
>>>> _______________________________________________
>>>> ffmpeg-devel mailing list
>>>> ffmpeg-devel at ffmpeg.org
>>>> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>>>>
>>>> To unsubscribe, visit link above, or email
>>>> ffmpeg-devel-request at ffmpeg.org with subject "unsubscribe".
>>> _______________________________________________
>>> ffmpeg-devel mailing list
>>> ffmpeg-devel at ffmpeg.org
>>> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>>>
>>> To unsubscribe, visit link above, or email
>>> ffmpeg-devel-request at ffmpeg.org with subject "unsubscribe".
>> _______________________________________________
>> ffmpeg-devel mailing list
>> ffmpeg-devel at ffmpeg.org
>> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>>
>> To unsubscribe, visit link above, or email
>> ffmpeg-devel-request at ffmpeg.org with subject "unsubscribe".
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel at ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
> 
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request at ffmpeg.org with subject "unsubscribe".