X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Ftableprint.h;h=6f46a7cc8a82160929bdcd032b86a76931007b26;hb=3a6765fb5d263f1b16be57d5564678147ba7f438;hp=e73a9e20b376d19cd164fba3c85d2e105dab8fec;hpb=a7c6e766387e8b3922bc710267c41163017bd316;p=ffmpeg

diff --git a/libavcodec/tableprint.h b/libavcodec/tableprint.h
index e73a9e20b37..6f46a7cc8a8 100644
--- a/libavcodec/tableprint.h
+++ b/libavcodec/tableprint.h
@@ -3,57 +3,109 @@
  *
  * Copyright (c) 2009 Reimar Döffinger <Reimar.Doeffinger@gmx.de>
  *
- * This file is part of FFmpeg.
+ * This file is part of Libav.
  *
- * FFmpeg is free software; you can redistribute it and/or
+ * Libav is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
  *
- * FFmpeg is distributed in the hope that it will be useful,
+ * Libav is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
+ * License along with Libav; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #ifndef AVCODEC_TABLEPRINT_H
 #define AVCODEC_TABLEPRINT_H
 
-#include <stdint.h>
+#include <inttypes.h>
+#include <stdio.h>
+
+#include "libavutil/common.h"
+
+#define WRITE_1D_FUNC_ARGV(type, linebrk, fmtstr, ...)\
+void write_##type##_array(const type *data, int len)\
+{\
+    int i;\
+    printf("   ");\
+    for (i = 0; i < len - 1; i++) {\
+       printf(" "fmtstr",", __VA_ARGS__);\
+       if ((i & linebrk) == linebrk) printf("\n   ");\
+    }\
+    printf(" "fmtstr"\n", __VA_ARGS__);\
+}
+
+#define WRITE_1D_FUNC(type, fmtstr, linebrk)\
+    WRITE_1D_FUNC_ARGV(type, linebrk, fmtstr, data[i])
+
+#define WRITE_2D_FUNC(type)\
+void write_##type##_2d_array(const void *arg, int len, int len2)\
+{\
+    const type *data = arg;\
+    int i;\
+    printf("    {\n");\
+    for (i = 0; i < len; i++) {\
+        write_##type##_array(data + i * len2, len2);\
+        printf(i == len - 1 ? "    }\n" : "    }, {\n");\
+    }\
+}
 
 /**
- * \defgroup printfuncs Predefined functions for printing tables
+ * @name Predefined functions for printing tables
  *
  * \{
  */
-void write_int8_array     (const void *, int, int);
-void write_uint32_array   (const void *, int, int);
-void write_int8_2d_array  (const void *, int, int);
-void write_uint32_2d_array(const void *, int, int);
+void write_int8_t_array     (const int8_t   *, int);
+void write_uint8_t_array    (const uint8_t  *, int);
+void write_uint16_t_array   (const uint16_t *, int);
+void write_uint32_t_array   (const uint32_t *, int);
+void write_float_array      (const float    *, int);
+void write_int8_t_2d_array  (const void *, int, int);
+void write_uint8_t_2d_array (const void *, int, int);
+void write_uint32_t_2d_array(const void *, int, int);
+void write_float_2d_array   (const void *, int, int);
 /** \} */ // end of printfuncs group
 
-struct tabledef {
-    /** String that declares the array. Adding " = { ..." after it should
-     * make a valid initializer, adding "extern" before and ";" if possible
-     * should make a valid extern declaration. */
-    const char *declaration;
-    /** Function used to print the table data (i.e. the part in {}).
-     * Should be one of the predefined write_*_array functions. */
-    void (*printfunc)(const void *, int, int);
-    /** Pointer passed to the printfunc, usually a pointer to the start
-     * of the array to be printed. */
-    const void *data;
-    int size;   ///< size of the first dimension of the array
-    int size2;  ///< size of the second dimension of the array if any
-};
-
-/** Initializes all the tables described in the tables array */
-void tableinit(void);
-/** Describes the tables that should be printed */
-extern const struct tabledef tables[];
+#define WRITE_ARRAY(prefix, type, name)                 \
+    do {                                                \
+        const size_t array_size = FF_ARRAY_ELEMS(name); \
+        printf(prefix" "#type" "#name"[%zu] = {\n",     \
+               array_size);                             \
+        write_##type##_array(name, array_size);         \
+        printf("};\n");                                 \
+    } while(0)
+
+#define WRITE_2D_ARRAY(prefix, type, name)                              \
+    do {                                                                \
+        const size_t array_size1 = FF_ARRAY_ELEMS(name);                \
+        const size_t array_size2 = FF_ARRAY_ELEMS(name[0]);             \
+        printf(prefix" "#type" "#name"[%zu][%zu] = {\n",                \
+               array_size1, array_size2 );                              \
+        write_##type##_2d_array(name, array_size1, array_size2);        \
+        printf("};\n");                                                 \
+    } while(0)
+
+
+WRITE_1D_FUNC(int8_t,   "%3"PRIi8, 15)
+WRITE_1D_FUNC(uint8_t,  "0x%02"PRIx8, 15)
+WRITE_1D_FUNC(uint16_t, "0x%08"PRIx16, 7)
+WRITE_1D_FUNC(uint32_t, "0x%08"PRIx32, 7)
+WRITE_1D_FUNC(float,    "%.18e", 3)
+
+WRITE_2D_FUNC(int8_t)
+WRITE_2D_FUNC(uint8_t)
+WRITE_2D_FUNC(uint32_t)
+WRITE_2D_FUNC(float)
+
+static inline void write_fileheader(void)
+{
+    printf("/* This file was automatically generated. */\n");
+    printf("#include <stdint.h>\n");
+}
 
 #endif /* AVCODEC_TABLEPRINT_H */