avcodec/elbg: Add persistent ELBGContext

It will be used in future commits to avoid having to allocate and free
all the buffers used.

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>

1 files changed, 5 insertions, 2 deletions

diff --git a/libavcodec/roqvideoenc.c b/libavcodec/roqvideoenc.c
index 7fa175c629..a9ec5950ff 100644
--- a/libavcodec/roqvideoenc.c
+++ b/libavcodec/roqvideoenc.c
@@ -133,6 +133,7 @@ typedef struct CelEvaluation {
 
 typedef struct RoqEncContext {
     RoqContext common;
+    struct ELBGContext *elbg;
     AVLFG randctx;
     uint64_t lambda;
 
@@ -824,8 +825,8 @@ static int generate_codebook(RoqEncContext *enc,
     int *codebook = enc->tmp_codebook_buf;
     int *closest_cb = enc->closest_cb;
 
-    ret = avpriv_do_elbg(points, 6 * c_size, inputCount, codebook,
-                     cbsize, 1, closest_cb, &enc->randctx);
+    ret = avpriv_elbg_do(&enc->elbg, points, 6 * c_size, inputCount, codebook,
+                         cbsize, 1, closest_cb, &enc->randctx);
     if (ret < 0)
         return ret;
 
@@ -961,6 +962,8 @@ static av_cold int roq_encode_end(AVCodecContext *avctx)
     av_freep(&enc->this_motion8);
     av_freep(&enc->last_motion8);
 
+    avpriv_elbg_free(&enc->elbg);
+
     return 0;
 }