[FFmpeg-devel] [PATCH 1/2] avcodec/diracdec: Use FF_CODEC_CAP_INIT_CLEANUP

[FFmpeg-devel] [PATCH 1/2] avcodec/diracdec: Use FF_CODEC_CAP_INIT_CLEANUP

[Andreas Rheinhardt]

This was one of the few decoders incompatible with the flag.
Also only call free_sequence_buffers(), dirac_decode_flush()
in dirac_decode_end().

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 libavcodec/diracdec.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/libavcodec/diracdec.c b/libavcodec/diracdec.c
index 3a36479c59..5bf0dcc2db 100644
--- a/libavcodec/diracdec.c
+++ b/libavcodec/diracdec.c
@@ -403,11 +403,8 @@ static av_cold int dirac_decode_init(AVCodecContext *avctx)
 
     for (i = 0; i < MAX_FRAMES; i++) {
         s->all_frames[i].avframe = av_frame_alloc();
-        if (!s->all_frames[i].avframe) {
-            while (i > 0)
-                av_frame_free(&s->all_frames[--i].avframe);
+        if (!s->all_frames[i].avframe)
             return AVERROR(ENOMEM);
-        }
     }
     ret = ff_thread_once(&dirac_arith_init, ff_dirac_init_arith_tables);
     if (ret != 0)
@@ -429,7 +426,9 @@ static av_cold int dirac_decode_end(AVCodecContext *avctx)
     DiracContext *s = avctx->priv_data;
     int i;
 
-    dirac_decode_flush(avctx);
+    // Necessary in case dirac_decode_init() failed
+    if (s->all_frames[MAX_FRAMES - 1].avframe)
+        free_sequence_buffers(s);
     for (i = 0; i < MAX_FRAMES; i++)
         av_frame_free(&s->all_frames[i].avframe);
 
@@ -2371,4 +2370,5 @@ const FFCodec ff_dirac_decoder = {
     FF_CODEC_DECODE_CB(dirac_decode_frame),
     .p.capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_SLICE_THREADS | AV_CODEC_CAP_DR1,
     .flush          = dirac_decode_flush,
+    .caps_internal  = FF_CODEC_CAP_INIT_CLEANUP,
 };
-- 
2.40.1

_______________________________________________
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] [PATCH 2/2] avcodec/diracdec: Mark flush as av_cold

[Andreas Rheinhardt]

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 libavcodec/diracdec.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavcodec/diracdec.c b/libavcodec/diracdec.c
index 5bf0dcc2db..76209aebba 100644
--- a/libavcodec/diracdec.c
+++ b/libavcodec/diracdec.c
@@ -351,7 +351,7 @@ static int alloc_buffers(DiracContext *s, int stride)
     return 0;
 }
 
-static void free_sequence_buffers(DiracContext *s)
+static av_cold void free_sequence_buffers(DiracContext *s)
 {
     int i, j, k;
 
@@ -413,7 +413,7 @@ static av_cold int dirac_decode_init(AVCodecContext *avctx)
     return 0;
 }
 
-static void dirac_decode_flush(AVCodecContext *avctx)
+static av_cold void dirac_decode_flush(AVCodecContext *avctx)
 {
     DiracContext *s = avctx->priv_data;
     free_sequence_buffers(s);
-- 
2.40.1

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

Re: [FFmpeg-devel] [PATCH 2/2] avcodec/diracdec: Mark flush as av_cold

[Lynne via ffmpeg-devel]

[-- Attachment #1.1.1.1: Type: text/plain, Size: 1062 bytes --]

On 28/05/2024 16:03, Andreas Rheinhardt wrote:
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
> ---
>   libavcodec/diracdec.c | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/libavcodec/diracdec.c b/libavcodec/diracdec.c
> index 5bf0dcc2db..76209aebba 100644
> --- a/libavcodec/diracdec.c
> +++ b/libavcodec/diracdec.c
> @@ -351,7 +351,7 @@ static int alloc_buffers(DiracContext *s, int stride)
>       return 0;
>   }
>   
> -static void free_sequence_buffers(DiracContext *s)
> +static av_cold void free_sequence_buffers(DiracContext *s)
>   {
>       int i, j, k;
>   
> @@ -413,7 +413,7 @@ static av_cold int dirac_decode_init(AVCodecContext *avctx)
>       return 0;
>   }
>   
> -static void dirac_decode_flush(AVCodecContext *avctx)
> +static av_cold void dirac_decode_flush(AVCodecContext *avctx)
>   {
>       DiracContext *s = avctx->priv_data;
>       free_sequence_buffers(s);

Both patches look good to me.
I'll remember to mark future decoders' flush with av_cold.

[-- Attachment #1.1.1.2: OpenPGP public key --]
[-- Type: application/pgp-keys, Size: 637 bytes --]

[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 236 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".

Re: [FFmpeg-devel] [PATCH 1/2] avcodec/diracdec: Use FF_CODEC_CAP_INIT_CLEANUP

[Andreas Rheinhardt]

Andreas Rheinhardt:
> This was one of the few decoders incompatible with the flag.
> Also only call free_sequence_buffers(), dirac_decode_flush()
> in dirac_decode_end().
> 
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
> ---
>  libavcodec/diracdec.c | 10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/libavcodec/diracdec.c b/libavcodec/diracdec.c
> index 3a36479c59..5bf0dcc2db 100644
> --- a/libavcodec/diracdec.c
> +++ b/libavcodec/diracdec.c
> @@ -403,11 +403,8 @@ static av_cold int dirac_decode_init(AVCodecContext *avctx)
>  
>      for (i = 0; i < MAX_FRAMES; i++) {
>          s->all_frames[i].avframe = av_frame_alloc();
> -        if (!s->all_frames[i].avframe) {
> -            while (i > 0)
> -                av_frame_free(&s->all_frames[--i].avframe);
> +        if (!s->all_frames[i].avframe)
>              return AVERROR(ENOMEM);
> -        }
>      }
>      ret = ff_thread_once(&dirac_arith_init, ff_dirac_init_arith_tables);
>      if (ret != 0)
> @@ -429,7 +426,9 @@ static av_cold int dirac_decode_end(AVCodecContext *avctx)
>      DiracContext *s = avctx->priv_data;
>      int i;
>  
> -    dirac_decode_flush(avctx);
> +    // Necessary in case dirac_decode_init() failed
> +    if (s->all_frames[MAX_FRAMES - 1].avframe)
> +        free_sequence_buffers(s);
>      for (i = 0; i < MAX_FRAMES; i++)
>          av_frame_free(&s->all_frames[i].avframe);
>  
> @@ -2371,4 +2370,5 @@ const FFCodec ff_dirac_decoder = {
>      FF_CODEC_DECODE_CB(dirac_decode_frame),
>      .p.capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_SLICE_THREADS | AV_CODEC_CAP_DR1,
>      .flush          = dirac_decode_flush,
> +    .caps_internal  = FF_CODEC_CAP_INIT_CLEANUP,
>  };

Will apply the patchset tomorrow unless there are objections.

- Andreas

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