[FFmpeg-cvslog] avcodec/mlp*: merge flags used by encoder and decoder

[Paul B Mahol]

ffmpeg | branch: master | Paul B Mahol <onemda at gmail.com> | Wed Oct 18 22:56:52 2023 +0200| [e7a6bba51a0efc0d59aa1fc98527c4bef58651c3] | committer: Paul B Mahol

avcodec/mlp*: merge flags used by encoder and decoder

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e7a6bba51a0efc0d59aa1fc98527c4bef58651c3
---

 libavcodec/mlp.h    |  9 +++++++++
 libavcodec/mlpdec.c |  8 --------
 libavcodec/mlpenc.c | 18 ++++--------------
 3 files changed, 13 insertions(+), 22 deletions(-)

diff --git a/libavcodec/mlp.h b/libavcodec/mlp.h
index 8a3e4566a3..cf12ac08fd 100644
--- a/libavcodec/mlp.h
+++ b/libavcodec/mlp.h
@@ -70,6 +70,15 @@
 /** Code that signals end of a stream. */
 #define END_OF_STREAM       0xd234d234
 
+#define PARAM_BLOCKSIZE     (1 << 7)
+#define PARAM_MATRIX        (1 << 6)
+#define PARAM_OUTSHIFT      (1 << 5)
+#define PARAM_QUANTSTEP     (1 << 4)
+#define PARAM_FIR           (1 << 3)
+#define PARAM_IIR           (1 << 2)
+#define PARAM_HUFFOFFSET    (1 << 1)
+#define PARAM_PRESENCE      (1 << 0)
+
 #define FIR 0
 #define IIR 1
 
diff --git a/libavcodec/mlpdec.c b/libavcodec/mlpdec.c
index 572509e1be..11b5d2fe98 100644
--- a/libavcodec/mlpdec.c
+++ b/libavcodec/mlpdec.c
@@ -93,14 +93,6 @@ typedef struct SubStream {
 
     /// Bitmask of which parameter sets are conveyed in a decoding parameter block.
     uint8_t     param_presence_flags;
-#define PARAM_BLOCKSIZE     (1 << 7)
-#define PARAM_MATRIX        (1 << 6)
-#define PARAM_OUTSHIFT      (1 << 5)
-#define PARAM_QUANTSTEP     (1 << 4)
-#define PARAM_FIR           (1 << 3)
-#define PARAM_IIR           (1 << 2)
-#define PARAM_HUFFOFFSET    (1 << 1)
-#define PARAM_PRESENCE      (1 << 0)
     //@}
 
     //@{
diff --git a/libavcodec/mlpenc.c b/libavcodec/mlpenc.c
index c0534ea510..70f9120e8b 100644
--- a/libavcodec/mlpenc.c
+++ b/libavcodec/mlpenc.c
@@ -77,18 +77,8 @@ typedef struct MatrixParams {
     int8_t          bypassed_lsbs[MAX_MATRICES][MAX_BLOCKSIZE];
 } MatrixParams;
 
-enum ParamFlags {
-    PARAMS_DEFAULT       = 0xff,
-    PARAM_PRESENCE_FLAGS = 1 << 8,
-    PARAM_BLOCKSIZE      = 1 << 7,
-    PARAM_MATRIX         = 1 << 6,
-    PARAM_OUTSHIFT       = 1 << 5,
-    PARAM_QUANTSTEP      = 1 << 4,
-    PARAM_FIR            = 1 << 3,
-    PARAM_IIR            = 1 << 2,
-    PARAM_HUFFOFFSET     = 1 << 1,
-    PARAM_PRESENT        = 1 << 0,
-};
+#define PARAMS_DEFAULT (0xff)
+#define PARAM_PRESENCE_FLAGS (1 << 8)
 
 typedef struct DecodingParams {
     uint16_t        blocksize;                  ///< number of PCM samples in current audio block
@@ -334,7 +324,7 @@ static int compare_decoding_params(MLPEncodeContext *ctx,
 
         if (prev_cp->codebook    != cp->codebook  ||
             prev_cp->huff_lsbs   != cp->huff_lsbs  )
-            retval |= PARAM_PRESENT;
+            retval |= PARAM_PRESENCE;
     }
 
     return retval;
@@ -441,7 +431,7 @@ static void default_decoding_params(MLPEncodeContext *ctx, DecodingParams *dp)
     param_presence_flags |= PARAM_FIR;
     param_presence_flags |= PARAM_IIR;
     param_presence_flags |= PARAM_HUFFOFFSET;
-    param_presence_flags |= PARAM_PRESENT;
+    param_presence_flags |= PARAM_PRESENCE;
 
     dp->param_presence_flags = param_presence_flags;
 }