virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Merge the >> 4 calculation of cb1_base in the table

Browse Source 
Originally committed as revision 13935 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Vitor Sessak 2008-06-23 21:10:59 +00:00
parent 80e9f30c23
commit 738ef8fd08
2 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/ra144.c
View File

@ -220,8 +220,8 @@ static void do_output_subblock(RA144Context *ractx,
m[0] = 0; m[0] = 0;
} }
m[1] = ((cb1_base[cb1_idx] >> 4) * gval) >> 8; m[1] = (cb1_base[cb1_idx] * gval) >> 8;
m[2] = ((cb2_base[cb2_idx] >> 4) * gval) >> 8; m[2] = (cb2_base[cb2_idx] * gval) >> 8;
memmove(ractx->adapt_cb, ractx->adapt_cb + BLOCKSIZE, memmove(ractx->adapt_cb, ractx->adapt_cb + BLOCKSIZE,
(BUFFERSIZE - BLOCKSIZE) * sizeof(*ractx->adapt_cb)); (BUFFERSIZE - BLOCKSIZE) * sizeof(*ractx->adapt_cb));

64
libavcodec/ra144.h
View File

@ -1832,41 +1832,41 @@ static const int8_t cb2_vects[128][40]={
}; };
static const uint32_t cb1_base[128]={ static const uint32_t cb1_base[128]={
314527, 295599, 293848, 280320, 336779, 291703, 297354, 266749, 19657, 18474, 18365, 17520, 21048, 18231, 18584, 16671,
325815, 305109, 310555, 294891, 349515, 300052, 313812, 278588, 20363, 19069, 19409, 18430, 21844, 18753, 19613, 17411,
326231, 348357, 322076, 347246, 335655, 327567, 314037, 310198, 20389, 21772, 20129, 21702, 20978, 20472, 19627, 19387,
343640, 370152, 349471, 382719, 353433, 344311, 338152, 333632, 21477, 23134, 21841, 23919, 22089, 21519, 21134, 20852,
314810, 285147, 304708, 279643, 319779, 271292, 295149, 257376, 19675, 17821, 19044, 17477, 19986, 16955, 18446, 16086,
338219, 302387, 335244, 302877, 343236, 285341, 321676, 274547, 21138, 18899, 20952, 18929, 21452, 17833, 20104, 17159,
316321, 320899, 325378, 333870, 309279, 291473, 302532, 288065, 19770, 20056, 20336, 20866, 19329, 18217, 18908, 18004,
344907, 351169, 369278, 382224, 334752, 312711, 335747, 316511, 21556, 21948, 23079, 23889, 20922, 19544, 20984, 19781,
316511, 335747, 312711, 334752, 382224, 369278, 351169, 344907, 19781, 20984, 19544, 20922, 23889, 23079, 21948, 21556,
288065, 302532, 291473, 309279, 333870, 325378, 320899, 316321, 18004, 18908, 18217, 19329, 20866, 20336, 20056, 19770,
274547, 321676, 285341, 343236, 302877, 335244, 302387, 338219, 17159, 20104, 17833, 21452, 18929, 20952, 18899, 21138,
257376, 295149, 271292, 319779, 279643, 304708, 285147, 314810, 16086, 18446, 16955, 19986, 17477, 19044, 17821, 19675,
333632, 338152, 344311, 353433, 382719, 349471, 370152, 343640, 20852, 21134, 21519, 22089, 23919, 21841, 23134, 21477,
310198, 314037, 327567, 335655, 347246, 322076, 348357, 326231, 19387, 19627, 20472, 20978, 21702, 20129, 21772, 20389,
278588, 313812, 300052, 349515, 294891, 310555, 305109, 325815, 17411, 19613, 18753, 21844, 18430, 19409, 19069, 20363,
266749, 297354, 291703, 336779, 280320, 293848, 295599, 314527 16671, 18584, 18231, 21048, 17520, 18365, 18474, 19657,
}; };
static const uint32_t cb2_base[128]={ static const uint32_t cb2_base[128]={
194793, 214093, 222075, 221325, 210734, 211641, 211270, 192855, 12174, 13380, 13879, 13832, 13170, 13227, 13204, 12053,
198561, 223821, 229577, 234105, 209600, 214643, 211594, 196292, 12410, 13988, 14348, 14631, 13100, 13415, 13224, 12268,
191722, 221201, 215984, 227369, 222035, 236618, 220978, 209746, 11982, 13825, 13499, 14210, 13877, 14788, 13811, 13109,
183193, 212405, 205343, 219484, 203652, 219140, 204153, 198495, 11449, 13275, 12833, 13717, 12728, 13696, 12759, 12405,
163695, 194973, 186057, 210587, 188197, 215336, 197004, 205097, 10230, 12185, 11628, 13161, 11762, 13458, 12312, 12818,
167090, 204380, 192189, 224334, 189091, 221215, 199256, 211624, 10443, 12773, 12011, 14020, 11818, 13825, 12453, 13226,
167150, 210594, 190109, 228813, 205750, 260616, 215853, 240851, 10446, 13162, 11881, 14300, 12859, 16288, 13490, 15053,
162492, 205131, 184310, 223583, 192669, 241298, 202170, 227169, 10155, 12820, 11519, 13973, 12041, 15081, 12635, 14198,
227169, 202170, 241298, 192669, 223583, 184310, 205131, 162492, 14198, 12635, 15081, 12041, 13973, 11519, 12820, 10155,
240851, 215853, 260616, 205750, 228813, 190109, 210594, 167150, 15053, 13490, 16288, 12859, 14300, 11881, 13162, 10446,
211624, 199256, 221215, 189091, 224334, 192189, 204380, 167090, 13226, 12453, 13825, 11818, 14020, 12011, 12773, 10443,
205097, 197004, 215336, 188197, 210587, 186057, 194973, 163695, 12818, 12312, 13458, 11762, 13161, 11628, 12185, 10230,
198495, 204153, 219140, 203652, 219484, 205343, 212405, 183193, 12405, 12759, 13696, 12728, 13717, 12833, 13275, 11449,
209746, 220978, 236618, 222035, 227369, 215984, 221201, 191722, 13109, 13811, 14788, 13877, 14210, 13499, 13825, 11982,
196292, 211594, 214643, 209600, 234105, 229577, 223821, 198561, 12268, 13224, 13415, 13100, 14631, 14348, 13988, 12410,
192855, 211270, 211641, 210734, 221325, 222075, 214093, 194793 12053, 13204, 13227, 13170, 13832, 13879, 13380, 12174,
}; };
static const int16_t energy_tab[63]={ static const int16_t energy_tab[63]={