RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit '79866803ffc4c1a1b02663de9bab216b8cfdb8b4' 

* commit '79866803ffc4c1a1b02663de9bab216b8cfdb8b4':
  msmpeg4data: K&R formatting cosmetics

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
This commit is contained in:
Derek Buitenhuis 2016-02-24 18:13:10 +00:00
parent d61849f0b7 79866803ff
commit 133aa68601
1 changed files with 1793 additions and 1817 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
libavcodec/msmpeg4data.c
View File

@ -601,54 +601,42 @@ static const int8_t table4_run[168] = {
RLTable ff_rl_table[NB_RL_TABLES] = { RLTable ff_rl_table[NB_RL_TABLES] = {
/* intra luminance tables */ /* intra luminance tables */
/* low motion */ /* low motion */
{ { 132,
132,
85, 85,
table0_vlc, table0_vlc,
table0_run, table0_run,
table0_level, table0_level, },
},
/* high motion */ /* high motion */
{ { 185,
185,
119, 119,
table2_vlc, table2_vlc,
table2_run, table2_run,
table2_level, table2_level, },
},
/* mid-rate */ /* mid-rate */
{ { 102,
102,
67, 67,
ff_mpeg4_intra_vlc, ff_mpeg4_intra_vlc,
ff_mpeg4_intra_run, ff_mpeg4_intra_run,
ff_mpeg4_intra_level, ff_mpeg4_intra_level, },
},
/* intra chrominance / non intra tables */ /* intra chrominance / non intra tables */
/* low motion inter */ /* low motion inter */
{ { 148,
148,
81, 81,
table1_vlc, table1_vlc,
table1_run, table1_run,
table1_level, table1_level, },
},
/* high motion inter */ /* high motion inter */
{ { 168,
168,
99, 99,
table4_vlc, table4_vlc,
table4_run, table4_run,
table4_level, table4_level, },
},
/* mid rate inter */ /* mid rate inter */
{ { 102,
102,
58, 58,
ff_inter_vlc, ff_inter_vlc,
ff_inter_run, ff_inter_run,
ff_inter_level, ff_inter_level, },
},
}; };
/* motion vector table 0 */ /* motion vector table 0 */
@ -1783,20 +1771,16 @@ static const uint8_t table1_mvy[1099] = {
}; };
MVTable ff_mv_tables[2] = { MVTable ff_mv_tables[2] = {
{ { 1099,
1099,
table0_mv_code, table0_mv_code,
table0_mv_bits, table0_mv_bits,
table0_mvx, table0_mvx,
table0_mvy, table0_mvy, },
}, { 1099,
{
1099,
table1_mv_code, table1_mv_code,
table1_mv_bits, table1_mv_bits,
table1_mvx, table1_mvx,
table1_mvy, table1_mvy, }
}
}; };
const uint8_t ff_v2_mb_type[8][2] = { const uint8_t ff_v2_mb_type[8][2] = {
@ -1809,60 +1793,52 @@ const uint8_t ff_v2_intra_cbpc[4][2] = {
}; };
const uint8_t ff_wmv1_y_dc_scale_table[32] = { const uint8_t ff_wmv1_y_dc_scale_table[32] = {
// 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 0, 8, 8, 8, 8, 8, 9, 9, 10, 10, 11, 11, 12, 12, 13, 13,
0, 8, 8, 8, 8, 8, 9, 9,10,10,11,11,12,12,13,13,14,14,15,15,16,16,17,17,18,18,19,19,20,20,21,21 14, 14, 15, 15, 16, 16, 17, 17, 18, 18, 19, 19, 20, 20, 21, 21
}; };
const uint8_t ff_wmv1_c_dc_scale_table[32] = { const uint8_t ff_wmv1_c_dc_scale_table[32] = {
// 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 0, 8, 8, 8, 8, 9, 9, 10, 10, 11, 11, 12, 12, 13, 13, 14,
0, 8, 8, 8, 8, 9, 9,10,10,11,11,12,12,13,13,14,14,15,15,16,16,17,17,18,18,19,19,20,20,21,21,22 14, 15, 15, 16, 16, 17, 17, 18, 18, 19, 19, 20, 20, 21, 21, 22
}; };
const uint8_t ff_old_ff_y_dc_scale_table[32] = { const uint8_t ff_old_ff_y_dc_scale_table[32] = {
// 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 0, 8, 8, 8, 8, 10, 12, 14, 16, 17, 18, 19, 20, 21, 22, 23,
0, 8, 8, 8, 8,10,12,14,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39
}; };
const uint8_t ff_wmv1_scantable[WMV1_SCANTABLE_COUNT][64] = { const uint8_t ff_wmv1_scantable[WMV1_SCANTABLE_COUNT][64] = {
{ { 0x00, 0x08, 0x01, 0x02, 0x09, 0x10, 0x18, 0x11,
0x00, 0x08, 0x01, 0x02, 0x09, 0x10, 0x18, 0x11,
0x0A, 0x03, 0x04, 0x0B, 0x12, 0x19, 0x20, 0x28, 0x0A, 0x03, 0x04, 0x0B, 0x12, 0x19, 0x20, 0x28,
0x30, 0x38, 0x29, 0x21, 0x1A, 0x13, 0x0C, 0x05, 0x30, 0x38, 0x29, 0x21, 0x1A, 0x13, 0x0C, 0x05,
0x06, 0x0D, 0x14, 0x1B, 0x22, 0x31, 0x39, 0x3A, 0x06, 0x0D, 0x14, 0x1B, 0x22, 0x31, 0x39, 0x3A,
0x32, 0x2A, 0x23, 0x1C, 0x15, 0x0E, 0x07, 0x0F, 0x32, 0x2A, 0x23, 0x1C, 0x15, 0x0E, 0x07, 0x0F,
0x16, 0x1D, 0x24, 0x2B, 0x33, 0x3B, 0x3C, 0x34, 0x16, 0x1D, 0x24, 0x2B, 0x33, 0x3B, 0x3C, 0x34,
0x2C, 0x25, 0x1E, 0x17, 0x1F, 0x26, 0x2D, 0x35, 0x2C, 0x25, 0x1E, 0x17, 0x1F, 0x26, 0x2D, 0x35,
0x3D, 0x3E, 0x36, 0x2E, 0x27, 0x2F, 0x37, 0x3F, 0x3D, 0x3E, 0x36, 0x2E, 0x27, 0x2F, 0x37, 0x3F, },
}, { 0x00, 0x08, 0x01, 0x02, 0x09, 0x10, 0x18, 0x11,
{
0x00, 0x08, 0x01, 0x02, 0x09, 0x10, 0x18, 0x11,
0x0A, 0x03, 0x04, 0x0B, 0x12, 0x19, 0x20, 0x28, 0x0A, 0x03, 0x04, 0x0B, 0x12, 0x19, 0x20, 0x28,
0x21, 0x30, 0x1A, 0x13, 0x0C, 0x05, 0x06, 0x0D, 0x21, 0x30, 0x1A, 0x13, 0x0C, 0x05, 0x06, 0x0D,
0x14, 0x1B, 0x22, 0x29, 0x38, 0x31, 0x39, 0x2A, 0x14, 0x1B, 0x22, 0x29, 0x38, 0x31, 0x39, 0x2A,
0x23, 0x1C, 0x15, 0x0E, 0x07, 0x0F, 0x16, 0x1D, 0x23, 0x1C, 0x15, 0x0E, 0x07, 0x0F, 0x16, 0x1D,
0x24, 0x2B, 0x32, 0x3A, 0x33, 0x3B, 0x2C, 0x25, 0x24, 0x2B, 0x32, 0x3A, 0x33, 0x3B, 0x2C, 0x25,
0x1E, 0x17, 0x1F, 0x26, 0x2D, 0x34, 0x3C, 0x35, 0x1E, 0x17, 0x1F, 0x26, 0x2D, 0x34, 0x3C, 0x35,
0x3D, 0x2E, 0x27, 0x2F, 0x36, 0x3E, 0x37, 0x3F, 0x3D, 0x2E, 0x27, 0x2F, 0x36, 0x3E, 0x37, 0x3F, },
}, { 0x00, 0x01, 0x08, 0x02, 0x03, 0x09, 0x10, 0x18,
{
0x00, 0x01, 0x08, 0x02, 0x03, 0x09, 0x10, 0x18,
0x11, 0x0A, 0x04, 0x05, 0x0B, 0x12, 0x19, 0x20, 0x11, 0x0A, 0x04, 0x05, 0x0B, 0x12, 0x19, 0x20,
0x28, 0x30, 0x21, 0x1A, 0x13, 0x0C, 0x06, 0x07, 0x28, 0x30, 0x21, 0x1A, 0x13, 0x0C, 0x06, 0x07,
0x0D, 0x14, 0x1B, 0x22, 0x29, 0x38, 0x31, 0x39, 0x0D, 0x14, 0x1B, 0x22, 0x29, 0x38, 0x31, 0x39,
0x2A, 0x23, 0x1C, 0x15, 0x0E, 0x0F, 0x16, 0x1D, 0x2A, 0x23, 0x1C, 0x15, 0x0E, 0x0F, 0x16, 0x1D,
0x24, 0x2B, 0x32, 0x3A, 0x33, 0x2C, 0x25, 0x1E, 0x24, 0x2B, 0x32, 0x3A, 0x33, 0x2C, 0x25, 0x1E,
0x17, 0x1F, 0x26, 0x2D, 0x34, 0x3B, 0x3C, 0x35, 0x17, 0x1F, 0x26, 0x2D, 0x34, 0x3B, 0x3C, 0x35,
0x2E, 0x27, 0x2F, 0x36, 0x3D, 0x3E, 0x37, 0x3F, 0x2E, 0x27, 0x2F, 0x36, 0x3D, 0x3E, 0x37, 0x3F, },
}, { 0x00, 0x08, 0x10, 0x01, 0x18, 0x20, 0x28, 0x09,
{
0x00, 0x08, 0x10, 0x01, 0x18, 0x20, 0x28, 0x09,
0x02, 0x03, 0x0A, 0x11, 0x19, 0x30, 0x38, 0x29, 0x02, 0x03, 0x0A, 0x11, 0x19, 0x30, 0x38, 0x29,
0x21, 0x1A, 0x12, 0x0B, 0x04, 0x05, 0x0C, 0x13, 0x21, 0x1A, 0x12, 0x0B, 0x04, 0x05, 0x0C, 0x13,
0x1B, 0x22, 0x31, 0x39, 0x32, 0x2A, 0x23, 0x1C, 0x1B, 0x22, 0x31, 0x39, 0x32, 0x2A, 0x23, 0x1C,
0x14, 0x0D, 0x06, 0x07, 0x0E, 0x15, 0x1D, 0x24, 0x14, 0x0D, 0x06, 0x07, 0x0E, 0x15, 0x1D, 0x24,
0x2B, 0x33, 0x3A, 0x3B, 0x34, 0x2C, 0x25, 0x1E, 0x2B, 0x33, 0x3A, 0x3B, 0x34, 0x2C, 0x25, 0x1E,
0x16, 0x0F, 0x17, 0x1F, 0x26, 0x2D, 0x3C, 0x35, 0x16, 0x0F, 0x17, 0x1F, 0x26, 0x2D, 0x3C, 0x35,
0x2E, 0x27, 0x2F, 0x36, 0x3D, 0x3E, 0x37, 0x3F, 0x2E, 0x27, 0x2F, 0x36, 0x3D, 0x3E, 0x37, 0x3F, }
}
}; };
const uint8_t ff_table_inter_intra[4][2] = { const uint8_t ff_table_inter_intra[4][2] = {