summaryrefslogtreecommitdiff
path: root/src/libffmpeg/libavcodec/mpeg12data.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/libffmpeg/libavcodec/mpeg12data.h')
-rw-r--r--src/libffmpeg/libavcodec/mpeg12data.h75
1 files changed, 44 insertions, 31 deletions
diff --git a/src/libffmpeg/libavcodec/mpeg12data.h b/src/libffmpeg/libavcodec/mpeg12data.h
index 8bf063ec1..16d607067 100644
--- a/src/libffmpeg/libavcodec/mpeg12data.h
+++ b/src/libffmpeg/libavcodec/mpeg12data.h
@@ -1,8 +1,9 @@
-/*
- * MPEG1/2 tables
+/**
+ * @file mpeg12data.h
+ * MPEG1/2 tables.
*/
-const INT16 ff_mpeg1_default_intra_matrix[64] = {
+const int16_t ff_mpeg1_default_intra_matrix[64] = {
8, 16, 19, 22, 26, 27, 29, 34,
16, 16, 22, 24, 27, 29, 34, 37,
19, 22, 26, 27, 29, 34, 34, 38,
@@ -13,7 +14,7 @@ const INT16 ff_mpeg1_default_intra_matrix[64] = {
27, 29, 35, 38, 46, 56, 69, 83
};
-const INT16 ff_mpeg1_default_non_intra_matrix[64] = {
+const int16_t ff_mpeg1_default_non_intra_matrix[64] = {
16, 16, 16, 16, 16, 16, 16, 16,
16, 16, 16, 16, 16, 16, 16, 16,
16, 16, 16, 16, 16, 16, 16, 16,
@@ -47,14 +48,14 @@ const unsigned char vlc_dc_table[256] = {
8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
};
-const UINT16 vlc_dc_lum_code[12] = {
+const uint16_t vlc_dc_lum_code[12] = {
0x4, 0x0, 0x1, 0x5, 0x6, 0xe, 0x1e, 0x3e, 0x7e, 0xfe, 0x1fe, 0x1ff,
};
const unsigned char vlc_dc_lum_bits[12] = {
3, 2, 2, 3, 3, 4, 5, 6, 7, 8, 9, 9,
};
-const UINT16 vlc_dc_chroma_code[12] = {
+const uint16_t vlc_dc_chroma_code[12] = {
0x0, 0x1, 0x2, 0x6, 0xe, 0x1e, 0x3e, 0x7e, 0xfe, 0x1fe, 0x3fe, 0x3ff,
};
const unsigned char vlc_dc_chroma_bits[12] = {
@@ -62,10 +63,10 @@ const unsigned char vlc_dc_chroma_bits[12] = {
};
/* simple include everything table for dc, first byte is bits number next 3 are code*/
-static UINT32 mpeg1_lum_dc_uni[512];
-static UINT32 mpeg1_chr_dc_uni[512];
+static uint32_t mpeg1_lum_dc_uni[512];
+static uint32_t mpeg1_chr_dc_uni[512];
-static const UINT16 mpeg1_vlc[113][2] = {
+static const uint16_t mpeg1_vlc[113][2] = {
{ 0x3, 2 }, { 0x4, 4 }, { 0x5, 5 }, { 0x6, 7 },
{ 0x26, 8 }, { 0x21, 8 }, { 0xa, 10 }, { 0x1d, 12 },
{ 0x18, 12 }, { 0x13, 12 }, { 0x10, 12 }, { 0x1a, 13 },
@@ -98,7 +99,7 @@ static const UINT16 mpeg1_vlc[113][2] = {
{ 0x2, 2 }, /* EOB */
};
-static const UINT16 mpeg2_vlc[113][2] = {
+static const uint16_t mpeg2_vlc[113][2] = {
{0x02, 2}, {0x06, 3}, {0x07, 4}, {0x1c, 5},
{0x1d, 5}, {0x05, 6}, {0x04, 6}, {0x7b, 7},
{0x7c, 7}, {0x23, 8}, {0x22, 8}, {0xfa, 8},
@@ -131,7 +132,7 @@ static const UINT16 mpeg2_vlc[113][2] = {
{0x06,4}, /* EOB */
};
-static const INT8 mpeg1_level[111] = {
+static const int8_t mpeg1_level[111] = {
1, 2, 3, 4, 5, 6, 7, 8,
9, 10, 11, 12, 13, 14, 15, 16,
17, 18, 19, 20, 21, 22, 23, 24,
@@ -148,7 +149,7 @@ static const INT8 mpeg1_level[111] = {
1, 1, 1, 1, 1, 1, 1,
};
-static const INT8 mpeg1_run[111] = {
+static const int8_t mpeg1_run[111] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
@@ -165,8 +166,8 @@ static const INT8 mpeg1_run[111] = {
25, 26, 27, 28, 29, 30, 31,
};
-static UINT8 mpeg1_index_run[2][64];
-static INT8 mpeg1_max_level[2][64];
+static uint8_t mpeg1_index_run[2][64];
+static int8_t mpeg1_max_level[2][64];
static RLTable rl_mpeg1 = {
111,
@@ -184,7 +185,7 @@ static RLTable rl_mpeg2 = {
mpeg1_level,
};
-static const UINT8 mbAddrIncrTable[35][2] = {
+static const uint8_t mbAddrIncrTable[35][2] = {
{0x1, 1},
{0x3, 3},
{0x2, 3},
@@ -222,7 +223,7 @@ static const UINT8 mbAddrIncrTable[35][2] = {
{0xf, 11}, /* stuffing */
};
-static const UINT8 mbPatTable[63][2] = {
+static const uint8_t mbPatTable[63][2] = {
{0xb, 5},
{0x9, 5},
{0xd, 6},
@@ -294,7 +295,7 @@ static const UINT8 mbPatTable[63][2] = {
#define MB_FOR 0x08
#define MB_QUANT 0x10
-static const UINT8 table_mb_ptype[32][2] = {
+static const uint8_t table_mb_ptype[32][2] = {
{ 0, 0 }, // 0x00
{ 3, 5 }, // 0x01 MB_INTRA
{ 1, 2 }, // 0x02 MB_PAT
@@ -329,7 +330,7 @@ static const UINT8 table_mb_ptype[32][2] = {
{ 0, 0 }, // 0x1F
};
-static const UINT8 table_mb_btype[32][2] = {
+static const uint8_t table_mb_btype[32][2] = {
{ 0, 0 }, // 0x00
{ 3, 5 }, // 0x01 MB_INTRA
{ 0, 0 }, // 0x02
@@ -364,7 +365,7 @@ static const UINT8 table_mb_btype[32][2] = {
{ 0, 0 }, // 0x1F
};
-static const UINT8 mbMotionVectorTable[17][2] = {
+static const uint8_t mbMotionVectorTable[17][2] = {
{ 0x1, 1 },
{ 0x1, 2 },
{ 0x1, 3 },
@@ -384,26 +385,38 @@ static const UINT8 mbMotionVectorTable[17][2] = {
{ 0xc, 10 },
};
-static const int frame_rate_tab[9] = {
- 0,
- (int)(23.976 * FRAME_RATE_BASE),
- (int)(24 * FRAME_RATE_BASE),
- (int)(25 * FRAME_RATE_BASE),
- (int)(29.97 * FRAME_RATE_BASE),
- (int)(30 * FRAME_RATE_BASE),
- (int)(50 * FRAME_RATE_BASE),
- (int)(59.94 * FRAME_RATE_BASE),
- (int)(60 * FRAME_RATE_BASE),
+#define MPEG1_FRAME_RATE_BASE 1001
+
+static const int frame_rate_tab[16] = {
+ 0,
+ 24000,
+ 24024,
+ 25025,
+ 30000,
+ 30030,
+ 50050,
+ 60000,
+ 60060,
+ // Xing's 15fps: (9)
+ 15015,
+ // libmpeg3's "Unofficial economy rates": (10-13)
+ 5005,
+ 10010,
+ 12012,
+ 15015,
+ // random, just to avoid segfault !never encode these
+ 25025,
+ 25025,
};
-static const UINT8 non_linear_qscale[32] = {
+static const uint8_t non_linear_qscale[32] = {
0, 1, 2, 3, 4, 5, 6, 7,
8,10,12,14,16,18,20,22,
24,28,32,36,40,44,48,52,
56,64,72,80,88,96,104,112,
};
-UINT8 ff_mpeg1_dc_scale_table[128]={ // MN: mpeg2 really can have such large qscales?
+uint8_t ff_mpeg1_dc_scale_table[128]={ // MN: mpeg2 really can have such large qscales?
// 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31
8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,