mpeg12dec: avoid signed overflow in bitrate calculation

[ffmpeg] / libavcodec / dv_tablegen.h

diff --git a/libavcodec/dv_tablegen.h b/libavcodec/dv_tablegen.h
index 0810f8e7a5154ff9bc12203518f3ceb855cba1a3..b69721b591c0aad55fc1f208fd3c11e80b34bb38 100644 (file)
--- a/libavcodec/dv_tablegen.h
+++ b/libavcodec/dv_tablegen.h
@@ -20,24 +20,25 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef DV_TABLEGEN_H
-#define DV_TABLEGEN_H
+#ifndef AVCODEC_DV_TABLEGEN_H
+#define AVCODEC_DV_TABLEGEN_H
 
 #include <stdint.h>
-#include "dv_vlc_data.h"
+
+#include "dvdata.h"
 
 #if CONFIG_SMALL
-#define DV_VLC_MAP_RUN_SIZE 15
-#define DV_VLC_MAP_LEV_SIZE 23
+#define DV_VLC_MAP_RUN_SIZE  15
+#define DV_VLC_MAP_LEV_SIZE  23
 #else
 #define DV_VLC_MAP_RUN_SIZE  64
-#define DV_VLC_MAP_LEV_SIZE 512 //FIXME sign was removed so this should be /2 but needs check
+#define DV_VLC_MAP_LEV_SIZE 512 // FIXME sign was removed so this should be /2 but needs check
 #endif
 
 /* VLC encoding lookup table */
 typedef struct dv_vlc_pair {
-   uint32_t vlc;
-   uint32_t size;
+    uint32_t vlc;
+    uint32_t size;
 } dv_vlc_pair;
 
 #if CONFIG_HARDCODED_TABLES
@@ -50,47 +51,47 @@ static void dv_vlc_map_tableinit(void)
 {
     int i, j;
     for (i = 0; i < NB_DV_VLC - 1; i++) {
-       if (dv_vlc_run[i] >= DV_VLC_MAP_RUN_SIZE)
-           continue;
+        if (ff_dv_vlc_run[i] >= DV_VLC_MAP_RUN_SIZE)
+            continue;
 #if CONFIG_SMALL
-       if (dv_vlc_level[i] >= DV_VLC_MAP_LEV_SIZE)
-           continue;
+        if (ff_dv_vlc_level[i] >= DV_VLC_MAP_LEV_SIZE)
+            continue;
 #endif
 
-       if (dv_vlc_map[dv_vlc_run[i]][dv_vlc_level[i]].size != 0)
-           continue;
+        if (dv_vlc_map[ff_dv_vlc_run[i]][ff_dv_vlc_level[i]].size != 0)
+            continue;
 
-       dv_vlc_map[dv_vlc_run[i]][dv_vlc_level[i]].vlc  =
-           dv_vlc_bits[i] << (!!dv_vlc_level[i]);
-       dv_vlc_map[dv_vlc_run[i]][dv_vlc_level[i]].size =
-           dv_vlc_len[i] + (!!dv_vlc_level[i]);
+        dv_vlc_map[ff_dv_vlc_run[i]][ff_dv_vlc_level[i]].vlc  =
+            ff_dv_vlc_bits[i] << (!!ff_dv_vlc_level[i]);
+        dv_vlc_map[ff_dv_vlc_run[i]][ff_dv_vlc_level[i]].size =
+            ff_dv_vlc_len[i]   + (!!ff_dv_vlc_level[i]);
     }
     for (i = 0; i < DV_VLC_MAP_RUN_SIZE; i++) {
 #if CONFIG_SMALL
-       for (j = 1; j < DV_VLC_MAP_LEV_SIZE; j++) {
-          if (dv_vlc_map[i][j].size == 0) {
-              dv_vlc_map[i][j].vlc = dv_vlc_map[0][j].vlc |
-                        (dv_vlc_map[i-1][0].vlc << (dv_vlc_map[0][j].size));
-              dv_vlc_map[i][j].size = dv_vlc_map[i-1][0].size +
-                                      dv_vlc_map[0][j].size;
-          }
-       }
+        for (j = 1; j < DV_VLC_MAP_LEV_SIZE; j++) {
+            if (dv_vlc_map[i][j].size == 0) {
+                dv_vlc_map[i][j].vlc  = dv_vlc_map[0][j].vlc |
+                                        (dv_vlc_map[i - 1][0].vlc <<
+                                         dv_vlc_map[0][j].size);
+                dv_vlc_map[i][j].size = dv_vlc_map[i - 1][0].size +
+                                        dv_vlc_map[0][j].size;
+            }
+        }
 #else
-       for (j = 1; j < DV_VLC_MAP_LEV_SIZE/2; j++) {
-          if (dv_vlc_map[i][j].size == 0) {
-              dv_vlc_map[i][j].vlc = dv_vlc_map[0][j].vlc |
-                        (dv_vlc_map[i-1][0].vlc << (dv_vlc_map[0][j].size));
-              dv_vlc_map[i][j].size = dv_vlc_map[i-1][0].size +
-                                      dv_vlc_map[0][j].size;
-          }
-          dv_vlc_map[i][((uint16_t)(-j))&0x1ff].vlc =
-                                        dv_vlc_map[i][j].vlc | 1;
-          dv_vlc_map[i][((uint16_t)(-j))&0x1ff].size =
-                                        dv_vlc_map[i][j].size;
-       }
+        for (j = 1; j < DV_VLC_MAP_LEV_SIZE / 2; j++) {
+            if (dv_vlc_map[i][j].size == 0) {
+                dv_vlc_map[i][j].vlc  = dv_vlc_map[0][j].vlc |
+                                        (dv_vlc_map[i - 1][0].vlc <<
+                                         dv_vlc_map[0][j].size);
+                dv_vlc_map[i][j].size = dv_vlc_map[i - 1][0].size +
+                                        dv_vlc_map[0][j].size;
+            }
+            dv_vlc_map[i][((uint16_t) (-j)) & 0x1ff].vlc  = dv_vlc_map[i][j].vlc | 1;
+            dv_vlc_map[i][((uint16_t) (-j)) & 0x1ff].size = dv_vlc_map[i][j].size;
+        }
 #endif
     }
 }
 #endif /* CONFIG_HARDCODED_TABLES */
 
-#endif /* DV_TABLEGEN_H */
+#endif /* AVCODEC_DV_TABLEGEN_H */