[FFmpeg-cvslog] g722: Fix the QMF scaling
Martin Storsjö
git at videolan.org
Sat Mar 3 00:38:30 CET 2012
ffmpeg | branch: master | Martin Storsjö <martin at martin.st> | Fri Mar 2 17:03:06 2012 +0200| [b087ce2bee81db8cc5caffb8f0a4f6c7c92a30fe] | committer: Martin Storsjö
g722: Fix the QMF scaling
This fixes clipping if the encoder input used the full 16 bit
input range (samples with a magnitude below 16383 worked fine).
The filtered subband samples should be 15 bit maximum, while
the code earlier produced them scaled to 16 bit.
This makes the decoder output have double the magnitude
compared to before.
The spec reference samples doesn't test the QMF at all, which
was why this part slipped past initially.
Signed-off-by: Martin Storsjö <martin at martin.st>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b087ce2bee81db8cc5caffb8f0a4f6c7c92a30fe
---
libavcodec/g722dec.c | 4 +-
libavcodec/g722enc.c | 4 +-
tests/ref/acodec/g722 | 8 +-
tests/ref/fate/g722dec-1 | 334 +++++++++++++++++++++++-----------------------
tests/ref/fate/g722enc | 2 +-
5 files changed, 176 insertions(+), 176 deletions(-)
diff --git a/libavcodec/g722dec.c b/libavcodec/g722dec.c
index 50a224b..72bb0ef 100644
--- a/libavcodec/g722dec.c
+++ b/libavcodec/g722dec.c
@@ -126,8 +126,8 @@ static int g722_decode_frame(AVCodecContext *avctx, void *data,
c->prev_samples[c->prev_samples_pos++] = rlow - rhigh;
ff_g722_apply_qmf(c->prev_samples + c->prev_samples_pos - 24,
&xout1, &xout2);
- *out_buf++ = av_clip_int16(xout1 >> 12);
- *out_buf++ = av_clip_int16(xout2 >> 12);
+ *out_buf++ = av_clip_int16(xout1 >> 11);
+ *out_buf++ = av_clip_int16(xout2 >> 11);
if (c->prev_samples_pos >= PREV_SAMPLES_BUF_SIZE) {
memmove(c->prev_samples, c->prev_samples + c->prev_samples_pos - 22,
22 * sizeof(c->prev_samples[0]));
diff --git a/libavcodec/g722enc.c b/libavcodec/g722enc.c
index a5ae0a5..ba8ceef 100644
--- a/libavcodec/g722enc.c
+++ b/libavcodec/g722enc.c
@@ -136,8 +136,8 @@ static inline void filter_samples(G722Context *c, const int16_t *samples,
c->prev_samples[c->prev_samples_pos++] = samples[0];
c->prev_samples[c->prev_samples_pos++] = samples[1];
ff_g722_apply_qmf(c->prev_samples + c->prev_samples_pos - 24, &xout1, &xout2);
- *xlow = xout1 + xout2 >> 13;
- *xhigh = xout1 - xout2 >> 13;
+ *xlow = xout1 + xout2 >> 14;
+ *xhigh = xout1 - xout2 >> 14;
if (c->prev_samples_pos >= PREV_SAMPLES_BUF_SIZE) {
memmove(c->prev_samples,
c->prev_samples + c->prev_samples_pos - 22,
diff --git a/tests/ref/acodec/g722 b/tests/ref/acodec/g722
index 6ea492a..0e2f7e7 100644
--- a/tests/ref/acodec/g722
+++ b/tests/ref/acodec/g722
@@ -1,4 +1,4 @@
-1975cc4a3521e374b33ae042e182f6b6 *./tests/data/acodec/g722.wav
-48053 ./tests/data/acodec/g722.wav
-ade04cdcf249e6946395f109b077dd62 *./tests/data/g722.acodec.out.wav
-stddev: 8841.24 PSNR: 17.40 MAXDIFF:36225 bytes: 191980/ 1058400
+7b0492eee76b04b710990235f97a0bf2 *./tests/data/acodec/g722.wav
+ 48053 ./tests/data/acodec/g722.wav
+b5568e0e3930ff563824156e8e1015f0 *./tests/data/g722.acodec.out.wav
+stddev: 8939.44 PSNR: 17.30 MAXDIFF:40370 bytes: 191980/ 1058400
diff --git a/tests/ref/fate/g722dec-1 b/tests/ref/fate/g722dec-1
index 55f1259..e94c3e6 100644
--- a/tests/ref/fate/g722dec-1
+++ b/tests/ref/fate/g722dec-1
@@ -1,168 +1,168 @@
#tb 0: 1/16000
-0, 0, 0, 2048, 4096, 0xde68394d
-0, 2048, 2048, 2048, 4096, 0xa5c28cb7
-0, 4096, 4096, 2048, 4096, 0x2e3c2f23
-0, 6144, 6144, 2048, 4096, 0xd7757825
-0, 8192, 8192, 2048, 4096, 0xafd1fd61
-0, 10240, 10240, 2048, 4096, 0x686afcbe
-0, 12288, 12288, 2048, 4096, 0x2290e848
-0, 14336, 14336, 2048, 4096, 0xddd484ad
-0, 16384, 16384, 2048, 4096, 0x148811a6
-0, 18432, 18432, 2048, 4096, 0x8b965613
-0, 20480, 20480, 2048, 4096, 0x8b095d51
-0, 22528, 22528, 2048, 4096, 0xf7625485
-0, 24576, 24576, 2048, 4096, 0x982a688c
-0, 26624, 26624, 2048, 4096, 0xc290dcfc
-0, 28672, 28672, 2048, 4096, 0x8bdef225
-0, 30720, 30720, 2048, 4096, 0xfca27fdc
-0, 32768, 32768, 2048, 4096, 0x95eff313
-0, 34816, 34816, 2048, 4096, 0x691ed4f7
-0, 36864, 36864, 2048, 4096, 0xd7e7b492
-0, 38912, 38912, 2048, 4096, 0xb0416bfe
-0, 40960, 40960, 2048, 4096, 0xf94b3ebd
-0, 43008, 43008, 2048, 4096, 0x7f73ca12
-0, 45056, 45056, 2048, 4096, 0xe91da4a3
-0, 47104, 47104, 2048, 4096, 0x1f74dc0e
-0, 49152, 49152, 2048, 4096, 0xd95b35e8
-0, 51200, 51200, 2048, 4096, 0x6dcdde1a
-0, 53248, 53248, 2048, 4096, 0x614fd4e4
-0, 55296, 55296, 2048, 4096, 0xe38d0fd5
-0, 57344, 57344, 2048, 4096, 0xfeba2999
-0, 59392, 59392, 2048, 4096, 0x1bf541e1
-0, 61440, 61440, 2048, 4096, 0x689f50d8
-0, 63488, 63488, 2048, 4096, 0x0aa60f5f
-0, 65536, 65536, 2048, 4096, 0x60ac3116
-0, 67584, 67584, 2048, 4096, 0xfa60e5e6
-0, 69632, 69632, 2048, 4096, 0xc7207c5b
-0, 71680, 71680, 2048, 4096, 0x01196277
-0, 73728, 73728, 2048, 4096, 0x609ca46c
-0, 75776, 75776, 2048, 4096, 0xfb799142
-0, 77824, 77824, 2048, 4096, 0x720910df
-0, 79872, 79872, 2048, 4096, 0xe21a8662
-0, 81920, 81920, 2048, 4096, 0x07105120
-0, 83968, 83968, 2048, 4096, 0x593f627e
-0, 86016, 86016, 2048, 4096, 0x28ddc80c
-0, 88064, 88064, 2048, 4096, 0xc69ef356
-0, 90112, 90112, 2048, 4096, 0x2defc5bd
-0, 92160, 92160, 2048, 4096, 0x82a4f418
-0, 94208, 94208, 2048, 4096, 0x424cb997
-0, 96256, 96256, 2048, 4096, 0x167a49b7
-0, 98304, 98304, 2048, 4096, 0x32a3e0d4
-0, 100352, 100352, 2048, 4096, 0x08a353ae
-0, 102400, 102400, 2048, 4096, 0x9543577b
-0, 104448, 104448, 2048, 4096, 0x2ed137cf
-0, 106496, 106496, 2048, 4096, 0xd80b0538
-0, 108544, 108544, 2048, 4096, 0x2ad31bef
-0, 110592, 110592, 2048, 4096, 0x1060cff8
-0, 112640, 112640, 2048, 4096, 0x76ab5ab8
-0, 114688, 114688, 2048, 4096, 0x8eedb68d
-0, 116736, 116736, 2048, 4096, 0xf4e2dc46
-0, 118784, 118784, 2048, 4096, 0xc52d3326
-0, 120832, 120832, 2048, 4096, 0x25201a26
-0, 122880, 122880, 2048, 4096, 0x16419378
-0, 124928, 124928, 2048, 4096, 0x97061f3c
-0, 126976, 126976, 2048, 4096, 0xd54edecd
-0, 129024, 129024, 2048, 4096, 0xc830b07b
-0, 131072, 131072, 2048, 4096, 0x804bae00
-0, 133120, 133120, 2048, 4096, 0xbb279150
-0, 135168, 135168, 2048, 4096, 0x95c4d5aa
-0, 137216, 137216, 2048, 4096, 0xc51d5259
-0, 139264, 139264, 2048, 4096, 0x856e1ab0
-0, 141312, 141312, 2048, 4096, 0x9e6ccb12
-0, 143360, 143360, 2048, 4096, 0xa2e5c1bb
-0, 145408, 145408, 2048, 4096, 0xe62fb62f
-0, 147456, 147456, 2048, 4096, 0xf10e3df0
-0, 149504, 149504, 2048, 4096, 0x76def18b
-0, 151552, 151552, 2048, 4096, 0xc9c3a26d
-0, 153600, 153600, 2048, 4096, 0x8ec0e061
-0, 155648, 155648, 2048, 4096, 0x3d4e8512
-0, 157696, 157696, 2048, 4096, 0xec45cd46
-0, 159744, 159744, 2048, 4096, 0xa34f3ddf
-0, 161792, 161792, 2048, 4096, 0x52b81c53
-0, 163840, 163840, 2048, 4096, 0xd0f0397a
-0, 165888, 165888, 2048, 4096, 0x7c0de231
-0, 167936, 167936, 2048, 4096, 0xfe86c032
-0, 169984, 169984, 2048, 4096, 0x67cdb848
-0, 172032, 172032, 2048, 4096, 0x90532cc0
-0, 174080, 174080, 2048, 4096, 0x03bca9e9
-0, 176128, 176128, 2048, 4096, 0x73169fd1
-0, 178176, 178176, 2048, 4096, 0x0b93967d
-0, 180224, 180224, 2048, 4096, 0x6486d8be
-0, 182272, 182272, 2048, 4096, 0x555cc2ac
-0, 184320, 184320, 2048, 4096, 0x07c1912e
-0, 186368, 186368, 2048, 4096, 0xe0423c66
-0, 188416, 188416, 2048, 4096, 0xc12d0fa1
-0, 190464, 190464, 2048, 4096, 0xdf497c2f
-0, 192512, 192512, 2048, 4096, 0x9298d1ba
-0, 194560, 194560, 2048, 4096, 0x691a4e15
-0, 196608, 196608, 2048, 4096, 0x725adc6e
-0, 198656, 198656, 2048, 4096, 0xf68e88de
-0, 200704, 200704, 2048, 4096, 0x37a234aa
-0, 202752, 202752, 2048, 4096, 0x43fb0558
-0, 204800, 204800, 2048, 4096, 0x653e4320
-0, 206848, 206848, 2048, 4096, 0x651e2f13
-0, 208896, 208896, 2048, 4096, 0x179049f9
-0, 210944, 210944, 2048, 4096, 0xe02fbb9d
-0, 212992, 212992, 2048, 4096, 0xb7e9f2a0
-0, 215040, 215040, 2048, 4096, 0x94ee81df
-0, 217088, 217088, 2048, 4096, 0x398a98de
-0, 219136, 219136, 2048, 4096, 0x1267594a
-0, 221184, 221184, 2048, 4096, 0x715adbaf
-0, 223232, 223232, 2048, 4096, 0x28ce1a20
-0, 225280, 225280, 2048, 4096, 0x4f8073d0
-0, 227328, 227328, 2048, 4096, 0x536846d3
-0, 229376, 229376, 2048, 4096, 0x7dc7defe
-0, 231424, 231424, 2048, 4096, 0x08a28e2a
-0, 233472, 233472, 2048, 4096, 0xd717c5cd
-0, 235520, 235520, 2048, 4096, 0x5d6e1efd
-0, 237568, 237568, 2048, 4096, 0x4d0eea27
-0, 239616, 239616, 2048, 4096, 0x70fff90c
-0, 241664, 241664, 2048, 4096, 0xd5cc8207
-0, 243712, 243712, 2048, 4096, 0xf87cae0e
-0, 245760, 245760, 2048, 4096, 0x26814ab5
-0, 247808, 247808, 2048, 4096, 0x9569fb8d
-0, 249856, 249856, 2048, 4096, 0x7835122e
-0, 251904, 251904, 2048, 4096, 0xa38840dd
-0, 253952, 253952, 2048, 4096, 0xfc499ba3
-0, 256000, 256000, 2048, 4096, 0x0aa60cb0
-0, 258048, 258048, 2048, 4096, 0x530ef56e
-0, 260096, 260096, 2048, 4096, 0xead968db
-0, 262144, 262144, 2048, 4096, 0x64484214
-0, 264192, 264192, 2048, 4096, 0xfd0cc89e
-0, 266240, 266240, 2048, 4096, 0x0d452a5d
-0, 268288, 268288, 2048, 4096, 0x36ef8482
-0, 270336, 270336, 2048, 4096, 0x462b641b
-0, 272384, 272384, 2048, 4096, 0x2a5c1c0c
-0, 274432, 274432, 2048, 4096, 0x8837ff80
-0, 276480, 276480, 2048, 4096, 0x27a3de22
-0, 278528, 278528, 2048, 4096, 0xf88d28c1
-0, 280576, 280576, 2048, 4096, 0xed85ea97
-0, 282624, 282624, 2048, 4096, 0x50c3e7db
-0, 284672, 284672, 2048, 4096, 0x82bcb480
-0, 286720, 286720, 2048, 4096, 0xc50ee536
-0, 288768, 288768, 2048, 4096, 0x086280ee
-0, 290816, 290816, 2048, 4096, 0x6f18f2b2
-0, 292864, 292864, 2048, 4096, 0x1c7c0856
-0, 294912, 294912, 2048, 4096, 0xc576268a
-0, 296960, 296960, 2048, 4096, 0x7a9af56d
-0, 299008, 299008, 2048, 4096, 0x6d058fc5
-0, 301056, 301056, 2048, 4096, 0x8fb1107b
-0, 303104, 303104, 2048, 4096, 0x807588d1
-0, 305152, 305152, 2048, 4096, 0x56178443
-0, 307200, 307200, 2048, 4096, 0xf2460763
-0, 309248, 309248, 2048, 4096, 0x284255f2
-0, 311296, 311296, 2048, 4096, 0xb29d17fb
-0, 313344, 313344, 2048, 4096, 0x5e7e4633
-0, 315392, 315392, 2048, 4096, 0x57704db1
-0, 317440, 317440, 2048, 4096, 0xd87dcc1d
-0, 319488, 319488, 2048, 4096, 0x28d4bb93
-0, 321536, 321536, 2048, 4096, 0x3a2e5c6c
-0, 323584, 323584, 2048, 4096, 0xf3581656
-0, 325632, 325632, 2048, 4096, 0x42f1942f
-0, 327680, 327680, 2048, 4096, 0xe75c5092
-0, 329728, 329728, 2048, 4096, 0x3fae7f6d
-0, 331776, 331776, 2048, 4096, 0xf99ad73e
-0, 333824, 333824, 2048, 4096, 0x80564e3e
-0, 335872, 335872, 2048, 4096, 0x8ff6ebe5
-0, 337920, 337920, 2048, 4096, 0x436d5e69
-0, 339968, 339968, 684, 1368, 0xe0ebeda3
+0, 0, 0, 2048, 4096, 0x4f9228b3
+0, 2048, 2048, 2048, 4096, 0xfab58157
+0, 4096, 4096, 2048, 4096, 0x0b641c78
+0, 6144, 6144, 2048, 4096, 0x601c6803
+0, 8192, 8192, 2048, 4096, 0xb3e2f166
+0, 10240, 10240, 2048, 4096, 0x5681f206
+0, 12288, 12288, 2048, 4096, 0x1e69e71f
+0, 14336, 14336, 2048, 4096, 0x05628be3
+0, 16384, 16384, 2048, 4096, 0x109b1aef
+0, 18432, 18432, 2048, 4096, 0xd5435a9e
+0, 20480, 20480, 2048, 4096, 0xb38b5d28
+0, 22528, 22528, 2048, 4096, 0x64514c93
+0, 24576, 24576, 2048, 4096, 0x453350e7
+0, 26624, 26624, 2048, 4096, 0x6deccce6
+0, 28672, 28672, 2048, 4096, 0xd427ede1
+0, 30720, 30720, 2048, 4096, 0xdecb8c42
+0, 32768, 32768, 2048, 4096, 0x3841e4d2
+0, 34816, 34816, 2048, 4096, 0x858ac1b1
+0, 36864, 36864, 2048, 4096, 0x8e9dbfa0
+0, 38912, 38912, 2048, 4096, 0xcbc0766f
+0, 40960, 40960, 2048, 4096, 0x78d52555
+0, 43008, 43008, 2048, 4096, 0x600ac7d5
+0, 45056, 45056, 2048, 4096, 0xafadb7ee
+0, 47104, 47104, 2048, 4096, 0x8009d5a1
+0, 49152, 49152, 2048, 4096, 0xb07d475e
+0, 51200, 51200, 2048, 4096, 0xfcfecceb
+0, 53248, 53248, 2048, 4096, 0x38b5d85f
+0, 55296, 55296, 2048, 4096, 0xbd48072e
+0, 57344, 57344, 2048, 4096, 0xd04724d8
+0, 59392, 59392, 2048, 4096, 0x08425144
+0, 61440, 61440, 2048, 4096, 0x7b14483e
+0, 63488, 63488, 2048, 4096, 0x8858ef4c
+0, 65536, 65536, 2048, 4096, 0x1e3024c2
+0, 67584, 67584, 2048, 4096, 0xcd6bfe4f
+0, 69632, 69632, 2048, 4096, 0x8cde8d18
+0, 71680, 71680, 2048, 4096, 0xbbd856b8
+0, 73728, 73728, 2048, 4096, 0x988c9b7a
+0, 75776, 75776, 2048, 4096, 0x2a858e03
+0, 77824, 77824, 2048, 4096, 0x6dee1e4a
+0, 79872, 79872, 2048, 4096, 0x8cc38b41
+0, 81920, 81920, 2048, 4096, 0x48bd5cec
+0, 83968, 83968, 2048, 4096, 0xeb7f606b
+0, 86016, 86016, 2048, 4096, 0x75f5d28c
+0, 88064, 88064, 2048, 4096, 0x5bfeec4b
+0, 90112, 90112, 2048, 4096, 0xfc35c22a
+0, 92160, 92160, 2048, 4096, 0x3a95efba
+0, 94208, 94208, 2048, 4096, 0xefdbce9c
+0, 96256, 96256, 2048, 4096, 0x00594ada
+0, 98304, 98304, 2048, 4096, 0x20ffebfa
+0, 100352, 100352, 2048, 4096, 0x1b31370a
+0, 102400, 102400, 2048, 4096, 0x50766a56
+0, 104448, 104448, 2048, 4096, 0x0058315a
+0, 106496, 106496, 2048, 4096, 0x98090cbf
+0, 108544, 108544, 2048, 4096, 0x66ed2d40
+0, 110592, 110592, 2048, 4096, 0xdfd7c0a7
+0, 112640, 112640, 2048, 4096, 0x2adc57e1
+0, 114688, 114688, 2048, 4096, 0x838bbc82
+0, 116736, 116736, 2048, 4096, 0x2c55de1a
+0, 118784, 118784, 2048, 4096, 0xeae027f4
+0, 120832, 120832, 2048, 4096, 0x09fe00f6
+0, 122880, 122880, 2048, 4096, 0xa25d9970
+0, 124928, 124928, 2048, 4096, 0xedb11a20
+0, 126976, 126976, 2048, 4096, 0x9ce2e63e
+0, 129024, 129024, 2048, 4096, 0xeb699974
+0, 131072, 131072, 2048, 4096, 0xcc04a296
+0, 133120, 133120, 2048, 4096, 0xe90e9a12
+0, 135168, 135168, 2048, 4096, 0xae85c0f7
+0, 137216, 137216, 2048, 4096, 0x7ee877db
+0, 139264, 139264, 2048, 4096, 0x9ecf14ee
+0, 141312, 141312, 2048, 4096, 0xa821cecd
+0, 143360, 143360, 2048, 4096, 0x2714bb11
+0, 145408, 145408, 2048, 4096, 0x28f1c1e0
+0, 147456, 147456, 2048, 4096, 0xf81c4f60
+0, 149504, 149504, 2048, 4096, 0x1ae0e5a1
+0, 151552, 151552, 2048, 4096, 0xbdae9d9a
+0, 153600, 153600, 2048, 4096, 0x5202e560
+0, 155648, 155648, 2048, 4096, 0x82408396
+0, 157696, 157696, 2048, 4096, 0xc850ce0c
+0, 159744, 159744, 2048, 4096, 0x1d732d88
+0, 161792, 161792, 2048, 4096, 0xc5c01e33
+0, 163840, 163840, 2048, 4096, 0x84942d6c
+0, 165888, 165888, 2048, 4096, 0x7c27cd3a
+0, 167936, 167936, 2048, 4096, 0x22adc503
+0, 169984, 169984, 2048, 4096, 0xfbc3af31
+0, 172032, 172032, 2048, 4096, 0xe9652b18
+0, 174080, 174080, 2048, 4096, 0xae75987e
+0, 176128, 176128, 2048, 4096, 0x0f7ea428
+0, 178176, 178176, 2048, 4096, 0x92b89582
+0, 180224, 180224, 2048, 4096, 0xf393d910
+0, 182272, 182272, 2048, 4096, 0x6349b600
+0, 184320, 184320, 2048, 4096, 0x16918dbd
+0, 186368, 186368, 2048, 4096, 0x14ee15ad
+0, 188416, 188416, 2048, 4096, 0x26b510d3
+0, 190464, 190464, 2048, 4096, 0x97007bf8
+0, 192512, 192512, 2048, 4096, 0x3718c509
+0, 194560, 194560, 2048, 4096, 0x24a54ccd
+0, 196608, 196608, 2048, 4096, 0xc960df4e
+0, 198656, 198656, 2048, 4096, 0xc7cb6e6f
+0, 200704, 200704, 2048, 4096, 0x4c563ae5
+0, 202752, 202752, 2048, 4096, 0x0dd51432
+0, 204800, 204800, 2048, 4096, 0xdb4243c8
+0, 206848, 206848, 2048, 4096, 0x9bb6417f
+0, 208896, 208896, 2048, 4096, 0xec6a40a1
+0, 210944, 210944, 2048, 4096, 0x82d6c3b4
+0, 212992, 212992, 2048, 4096, 0xd181e2ec
+0, 215040, 215040, 2048, 4096, 0xba5d7b55
+0, 217088, 217088, 2048, 4096, 0x78fcb938
+0, 219136, 219136, 2048, 4096, 0x6691671c
+0, 221184, 221184, 2048, 4096, 0x44fadee7
+0, 223232, 223232, 2048, 4096, 0xa42720d5
+0, 225280, 225280, 2048, 4096, 0xc1165a91
+0, 227328, 227328, 2048, 4096, 0x86aa3e3f
+0, 229376, 229376, 2048, 4096, 0xab5ae57d
+0, 231424, 231424, 2048, 4096, 0x291a91f3
+0, 233472, 233472, 2048, 4096, 0xfdf0dcfc
+0, 235520, 235520, 2048, 4096, 0x1ef91f67
+0, 237568, 237568, 2048, 4096, 0xc899efee
+0, 239616, 239616, 2048, 4096, 0x5ade15ac
+0, 241664, 241664, 2048, 4096, 0x04516beb
+0, 243712, 243712, 2048, 4096, 0xbf5ebbb9
+0, 245760, 245760, 2048, 4096, 0x4a235122
+0, 247808, 247808, 2048, 4096, 0xd7a3f4a6
+0, 249856, 249856, 2048, 4096, 0x5f900f20
+0, 251904, 251904, 2048, 4096, 0xa90b4365
+0, 253952, 253952, 2048, 4096, 0x63149dc4
+0, 256000, 256000, 2048, 4096, 0xf12c1ee8
+0, 258048, 258048, 2048, 4096, 0x6d0fec8c
+0, 260096, 260096, 2048, 4096, 0x65e07850
+0, 262144, 262144, 2048, 4096, 0x16d951cc
+0, 264192, 264192, 2048, 4096, 0xd296d0c4
+0, 266240, 266240, 2048, 4096, 0x619b2a53
+0, 268288, 268288, 2048, 4096, 0x316972d5
+0, 270336, 270336, 2048, 4096, 0xcfd64e21
+0, 272384, 272384, 2048, 4096, 0xcbcb10c6
+0, 274432, 274432, 2048, 4096, 0x20aeff7c
+0, 276480, 276480, 2048, 4096, 0xd205dabd
+0, 278528, 278528, 2048, 4096, 0xac9d3001
+0, 280576, 280576, 2048, 4096, 0x6d53dfdd
+0, 282624, 282624, 2048, 4096, 0xbb9fe15c
+0, 284672, 284672, 2048, 4096, 0x1852b88b
+0, 286720, 286720, 2048, 4096, 0xb0acec01
+0, 288768, 288768, 2048, 4096, 0xb52a9342
+0, 290816, 290816, 2048, 4096, 0x7529faee
+0, 292864, 292864, 2048, 4096, 0x150ff449
+0, 294912, 294912, 2048, 4096, 0xa81d31d9
+0, 296960, 296960, 2048, 4096, 0xbcb8084a
+0, 299008, 299008, 2048, 4096, 0x07229514
+0, 301056, 301056, 2048, 4096, 0xa85cfd88
+0, 303104, 303104, 2048, 4096, 0x0aef9c27
+0, 305152, 305152, 2048, 4096, 0x8ec47b39
+0, 307200, 307200, 2048, 4096, 0x910b0560
+0, 309248, 309248, 2048, 4096, 0x99a8578e
+0, 311296, 311296, 2048, 4096, 0xb3df1d84
+0, 313344, 313344, 2048, 4096, 0x48e52559
+0, 315392, 315392, 2048, 4096, 0xb25c4800
+0, 317440, 317440, 2048, 4096, 0x913bc8ce
+0, 319488, 319488, 2048, 4096, 0xb736cc8c
+0, 321536, 321536, 2048, 4096, 0x13c66646
+0, 323584, 323584, 2048, 4096, 0x70a71221
+0, 325632, 325632, 2048, 4096, 0x3a50a08e
+0, 327680, 327680, 2048, 4096, 0xc0a037b0
+0, 329728, 329728, 2048, 4096, 0x9a789475
+0, 331776, 331776, 2048, 4096, 0xc890ca16
+0, 333824, 333824, 2048, 4096, 0xa0d34bed
+0, 335872, 335872, 2048, 4096, 0x1689fa60
+0, 337920, 337920, 2048, 4096, 0x5bac4c83
+0, 339968, 339968, 684, 1368, 0x904be5e5
diff --git a/tests/ref/fate/g722enc b/tests/ref/fate/g722enc
index c109456..9b8e469 100644
--- a/tests/ref/fate/g722enc
+++ b/tests/ref/fate/g722enc
@@ -1 +1 @@
-750269cc236541df28e15da5c7b0df7a
+94e2f200d6e05b47cec4aa3e94571cf3
More information about the ffmpeg-cvslog
mailing list