diff options
| -rw-r--r-- | libavcodec/adpcm.c | 17 | ||||
| -rw-r--r-- | libavcodec/adpcm_data.c | 26 |
2 files changed, 23 insertions, 20 deletions
diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c index 5e83e4b37a..25432f6160 100644 --- a/libavcodec/adpcm.c +++ b/libavcodec/adpcm.c @@ -57,16 +57,19 @@ /* These are for CD-ROM XA ADPCM */ static const int xa_adpcm_table[5][2] = { - { 0, 0 }, - { 60, 0 }, - { 115, -52 }, - { 98, -55 }, - { 122, -60 } + { 0, 0 }, + { 60, 0 }, + { 115, -52 }, + { 98, -55 }, + { 122, -60 } }; static const int ea_adpcm_table[] = { - 0, 240, 460, 392, 0, 0, -208, -220, 0, 1, - 3, 4, 7, 8, 10, 11, 0, -1, -3, -4 + 0, 240, 460, 392, + 0, 0, -208, -220, + 0, 1, 3, 4, + 7, 8, 10, 11, + 0, -1, -3, -4 }; // padded to zero where table size is less then 16 diff --git a/libavcodec/adpcm_data.c b/libavcodec/adpcm_data.c index 9dc5670bfc..3bc5de23b3 100644 --- a/libavcodec/adpcm_data.c +++ b/libavcodec/adpcm_data.c @@ -38,14 +38,14 @@ const int8_t ff_adpcm_index_table[16] = { * this table, but such deviations are negligible: */ const int16_t ff_adpcm_step_table[89] = { - 7, 8, 9, 10, 11, 12, 13, 14, 16, 17, - 19, 21, 23, 25, 28, 31, 34, 37, 41, 45, - 50, 55, 60, 66, 73, 80, 88, 97, 107, 118, - 130, 143, 157, 173, 190, 209, 230, 253, 279, 307, - 337, 371, 408, 449, 494, 544, 598, 658, 724, 796, - 876, 963, 1060, 1166, 1282, 1411, 1552, 1707, 1878, 2066, - 2272, 2499, 2749, 3024, 3327, 3660, 4026, 4428, 4871, 5358, - 5894, 6484, 7132, 7845, 8630, 9493, 10442, 11487, 12635, 13899, + 7, 8, 9, 10, 11, 12, 13, 14, 16, 17, + 19, 21, 23, 25, 28, 31, 34, 37, 41, 45, + 50, 55, 60, 66, 73, 80, 88, 97, 107, 118, + 130, 143, 157, 173, 190, 209, 230, 253, 279, 307, + 337, 371, 408, 449, 494, 544, 598, 658, 724, 796, + 876, 963, 1060, 1166, 1282, 1411, 1552, 1707, 1878, 2066, + 2272, 2499, 2749, 3024, 3327, 3660, 4026, 4428, 4871, 5358, + 5894, 6484, 7132, 7845, 8630, 9493, 10442, 11487, 12635, 13899, 15289, 16818, 18500, 20350, 22385, 24623, 27086, 29794, 32767 }; @@ -53,18 +53,18 @@ const int16_t ff_adpcm_step_table[89] = { /* ff_adpcm_AdaptationTable[], ff_adpcm_AdaptCoeff1[], and ff_adpcm_AdaptCoeff2[] are from libsndfile */ const int16_t ff_adpcm_AdaptationTable[] = { - 230, 230, 230, 230, 307, 409, 512, 614, - 768, 614, 512, 409, 307, 230, 230, 230 + 230, 230, 230, 230, 307, 409, 512, 614, + 768, 614, 512, 409, 307, 230, 230, 230 }; /** Divided by 4 to fit in 8-bit integers */ const uint8_t ff_adpcm_AdaptCoeff1[] = { - 64, 128, 0, 48, 60, 115, 98 + 64, 128, 0, 48, 60, 115, 98 }; /** Divided by 4 to fit in 8-bit integers */ const int8_t ff_adpcm_AdaptCoeff2[] = { - 0, -64, 0, 16, 0, -52, -58 + 0, -64, 0, 16, 0, -52, -58 }; const int16_t ff_adpcm_yamaha_indexscale[] = { @@ -73,6 +73,6 @@ const int16_t ff_adpcm_yamaha_indexscale[] = { }; const int8_t ff_adpcm_yamaha_difflookup[] = { - 1, 3, 5, 7, 9, 11, 13, 15, + 1, 3, 5, 7, 9, 11, 13, 15, -1, -3, -5, -7, -9, -11, -13, -15 }; |