* [FFmpeg-devel] [PATCH] avcodec/libaomenc: add init cleanup flag
@ 2022-08-25 17:16 James Almer
2022-08-25 17:34 ` James Zern
0 siblings, 1 reply; 6+ messages in thread
From: James Almer @ 2022-08-25 17:16 UTC (permalink / raw)
To: ffmpeg-devel
Signed-off-by: James Almer <jamrial@gmail.com>
---
There doesn't seem to be any proper API to check if an encoder is open.
libavcodec/libaomenc.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
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)) {
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@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [FFmpeg-devel] [PATCH] avcodec/libaomenc: add init cleanup flag
2022-08-25 17:16 [FFmpeg-devel] [PATCH] avcodec/libaomenc: add init cleanup flag James Almer
@ 2022-08-25 17:34 ` James Zern
2022-08-25 17:39 ` James Almer
0 siblings, 1 reply; 6+ messages in thread
From: James Zern @ 2022-08-25 17:34 UTC (permalink / raw)
To: FFmpeg development discussions and patches
On Thu, Aug 25, 2022 at 10:16 AM James Almer <jamrial@gmail.com> wrote:
>
> Signed-off-by: James Almer <jamrial@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.
> 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)) {
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@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".
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [FFmpeg-devel] [PATCH] avcodec/libaomenc: add init cleanup flag
2022-08-25 17:34 ` James Zern
@ 2022-08-25 17:39 ` James Almer
2022-08-25 19:21 ` James Zern
0 siblings, 1 reply; 6+ messages in thread
From: James Almer @ 2022-08-25 17:39 UTC (permalink / raw)
To: ffmpeg-devel
On 8/25/2022 2:34 PM, James Zern wrote:
> On Thu, Aug 25, 2022 at 10:16 AM James Almer <jamrial@gmail.com> wrote:
>>
>> Signed-off-by: James Almer <jamrial@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)) {
>
> 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@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".
_______________________________________________
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".
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [FFmpeg-devel] [PATCH] avcodec/libaomenc: add init cleanup flag
2022-08-25 17:39 ` James Almer
@ 2022-08-25 19:21 ` James Zern
2022-08-25 19:28 ` James Almer
0 siblings, 1 reply; 6+ messages in thread
From: James Zern @ 2022-08-25 19:21 UTC (permalink / raw)
To: FFmpeg development discussions and patches
On Thu, Aug 25, 2022 at 10:39 AM James Almer <jamrial@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@gmail.com> wrote:
> >>
> >> Signed-off-by: James Almer <jamrial@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'.
> >
> > 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@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".
> _______________________________________________
> 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".
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [FFmpeg-devel] [PATCH] avcodec/libaomenc: add init cleanup flag
2022-08-25 19:21 ` James Zern
@ 2022-08-25 19:28 ` James Almer
2022-08-25 19:32 ` James Zern
0 siblings, 1 reply; 6+ messages in thread
From: James Almer @ 2022-08-25 19:28 UTC (permalink / raw)
To: ffmpeg-devel
On 8/25/2022 4:21 PM, James Zern wrote:
> On Thu, Aug 25, 2022 at 10:39 AM James Almer <jamrial@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@gmail.com> wrote:
>>>>
>>>> Signed-off-by: James Almer <jamrial@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@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".
>> _______________________________________________
>> 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".
_______________________________________________
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".
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [FFmpeg-devel] [PATCH] avcodec/libaomenc: add init cleanup flag
2022-08-25 19:28 ` James Almer
@ 2022-08-25 19:32 ` James Zern
0 siblings, 0 replies; 6+ messages in thread
From: James Zern @ 2022-08-25 19:32 UTC (permalink / raw)
To: FFmpeg development discussions and patches
On Thu, Aug 25, 2022 at 12:28 PM James Almer <jamrial@gmail.com> wrote:
>
> On 8/25/2022 4:21 PM, James Zern wrote:
> > On Thu, Aug 25, 2022 at 10:39 AM James Almer <jamrial@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@gmail.com> wrote:
> >>>>
> >>>> Signed-off-by: James Almer <jamrial@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.
>
Thanks, you beat me to it. You're right, they're not in a tagged
release yet. 3.5.0 will have them.
_______________________________________________
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".
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2022-08-25 19:32 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-08-25 17:16 [FFmpeg-devel] [PATCH] avcodec/libaomenc: add init cleanup flag James Almer
2022-08-25 17:34 ` James Zern
2022-08-25 17:39 ` James Almer
2022-08-25 19:21 ` James Zern
2022-08-25 19:28 ` James Almer
2022-08-25 19:32 ` James Zern
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git