diff mbox series

[FFmpeg-devel,07/42] avcodec/wavpack: Use RefStruct API for DSD context

Message ID AS8P250MB0744BF5B6CE85ECFD25AA7FC8FFAA@AS8P250MB0744.EURP250.PROD.OUTLOOK.COM
State Accepted
Commit 05f557b2591094f1885e7f91660dd8c937cbe785
Headers show
Series New API for reference counting and ThreadFrames | expand

Checks

Context Check Description
andriy/make_x86 success Make finished
andriy/make_fate_x86 success Make fate finished

Commit Message

Andreas Rheinhardt Sept. 19, 2023, 7:56 p.m. UTC 
It avoids allocations and the corresponding error checks.
It also avoids indirections and casts.

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

Comments

Anton Khirnov Oct. 2, 2023, 9:46 a.m. UTC | #1 
Quoting Andreas Rheinhardt (2023-09-19 21:56:59)
> It avoids allocations and the corresponding error checks.
> It also avoids indirections and casts.
> 
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
> ---
>  libavcodec/wavpack.c | 25 ++++++++-----------------
>  1 file changed, 8 insertions(+), 17 deletions(-)

LGTM
diff mbox series

Patch

diff --git a/libavcodec/wavpack.c b/libavcodec/wavpack.c
index 966f4b83db..97705c8854 100644
--- a/libavcodec/wavpack.c
+++ b/libavcodec/wavpack.c
@@ -28,6 +28,7 @@ 
 #include "bytestream.h"
 #include "codec_internal.h"
 #include "get_bits.h"
+#include "refstruct.h"
 #include "thread.h"
 #include "threadframe.h"
 #include "unary.h"
@@ -110,8 +111,7 @@  typedef struct WavpackContext {
     ThreadFrame curr_frame, prev_frame;
     Modulation modulation;
 
-    AVBufferRef *dsd_ref;
-    DSDContext *dsdctx;
+    DSDContext *dsdctx; ///< RefStruct reference
     int dsd_channels;
 } WavpackContext;
 
@@ -990,9 +990,8 @@  static int wv_dsd_reset(WavpackContext *s, int channels)
 {
     int i;
 
-    s->dsdctx = NULL;
     s->dsd_channels = 0;
-    av_buffer_unref(&s->dsd_ref);
+    ff_refstruct_unref(&s->dsdctx);
 
     if (!channels)
         return 0;
@@ -1000,10 +999,9 @@  static int wv_dsd_reset(WavpackContext *s, int channels)
     if (channels > INT_MAX / sizeof(*s->dsdctx))
         return AVERROR(EINVAL);
 
-    s->dsd_ref = av_buffer_allocz(channels * sizeof(*s->dsdctx));
-    if (!s->dsd_ref)
+    s->dsdctx = ff_refstruct_allocz(channels * sizeof(*s->dsdctx));
+    if (!s->dsdctx)
         return AVERROR(ENOMEM);
-    s->dsdctx = (DSDContext*)s->dsd_ref->data;
     s->dsd_channels = channels;
 
     for (i = 0; i < channels; i++)
@@ -1028,15 +1026,8 @@  static int update_thread_context(AVCodecContext *dst, const AVCodecContext *src)
             return ret;
     }
 
-    fdst->dsdctx = NULL;
-    fdst->dsd_channels = 0;
-    ret = av_buffer_replace(&fdst->dsd_ref, fsrc->dsd_ref);
-    if (ret < 0)
-        return ret;
-    if (fsrc->dsd_ref) {
-        fdst->dsdctx = (DSDContext*)fdst->dsd_ref->data;
-        fdst->dsd_channels = fsrc->dsd_channels;
-    }
+    ff_refstruct_replace(&fdst->dsdctx, fsrc->dsdctx);
+    fdst->dsd_channels = fsrc->dsd_channels;
 
     return 0;
 }
@@ -1076,7 +1067,7 @@  static av_cold int wavpack_decode_end(AVCodecContext *avctx)
     ff_thread_release_ext_buffer(avctx, &s->prev_frame);
     av_frame_free(&s->prev_frame.f);
 
-    av_buffer_unref(&s->dsd_ref);
+    ff_refstruct_unref(&s->dsdctx);
 
     return 0;
 }