fix 6 channels raw pcm demuxing, raw pcm now demux a fixed number of samples

Originally committed as revision 18453 to svn://svn.ffmpeg.org/ffmpeg/trunk

5 files changed, 76 insertions, 72 deletions

diff --git a/libavformat/raw.c b/libavformat/raw.c
index 78662ae6e8..0b6f87041d 100644
--- a/libavformat/raw.c
+++ b/libavformat/raw.c
@@ -84,6 +84,9 @@ static int raw_read_header(AVFormatContext *s, AVFormatParameters *ap)
             st->codec->sample_rate = ap->sample_rate;
             if(ap->channels) st->codec->channels = ap->channels;
             else             st->codec->channels = 1;
+            st->codec->bits_per_coded_sample = av_get_bits_per_sample(st->codec->codec_id);
+            assert(st->codec->bits_per_coded_sample > 0);
+            st->codec->block_align = st->codec->bits_per_coded_sample*st->codec->channels/8;
             av_set_pts_info(st, 64, 1, st->codec->sample_rate);
             break;
         case CODEC_TYPE_VIDEO:
@@ -104,13 +107,14 @@ static int raw_read_header(AVFormatContext *s, AVFormatParameters *ap)
 }
 
 #define RAW_PACKET_SIZE 1024
+#define RAW_SAMPLES     1024
 
 static int raw_read_packet(AVFormatContext *s, AVPacket *pkt)
 {
     int ret, size, bps;
     //    AVStream *st = s->streams[0];
 
-    size= RAW_PACKET_SIZE;
+    size= RAW_SAMPLES*s->streams[0]->codec->block_align;
 
     ret= av_get_packet(s->pb, pkt, size);
 
diff --git a/tests/ffmpeg.regression.ref b/tests/ffmpeg.regression.ref
index 6c1d462245..2a3f082d30 100644
--- a/tests/ffmpeg.regression.ref
+++ b/tests/ffmpeg.regression.ref
@@ -177,10 +177,10 @@ stddev: 9328.41 PSNR: 16.92 bytes:  1055276/  1058444
 stddev: 4394.71 PSNR: 23.46 bytes:  1053352/  1058444
 3bfe347421de458dbfe572b8d4047b46 *./tests/data/a-ac3.rm
 98183 ./tests/data/a-ac3.rm
-39878597b1d65cce473639a7d8c93b02 *./tests/data/a-g726.wav
-24279 ./tests/data/a-g726.wav
-888f2f016e608d044a1bacbca5497ed2 *./tests/data/g726.vsynth.out.wav
-stddev: 8364.40 PSNR: 17.87 bytes:    96936/  1058444
+5d8cce28f83dd33c3c7eaf43a5db5294 *./tests/data/a-g726.wav
+24082 ./tests/data/a-g726.wav
+4f1ba1af75dee64625a1c852e6cd01d3 *./tests/data/g726.vsynth.out.wav
+stddev: 8506.46 PSNR: 17.72 bytes:    96148/  1058444
 3b969c43e45582f713e3c35faee9e0cc *./tests/data/a-adpcm_ima.wav
 266300 ./tests/data/a-adpcm_ima.wav
 947196b1739a9d6fe0c29424cf61cd8c *./tests/data/adpcm_ima_wav.vsynth.out.wav
@@ -221,40 +221,40 @@ f443a8eeb1647ec1eeb8370c939e52d4 *./tests/data/a-pcm_mulaw.wav
 529256 ./tests/data/a-pcm_mulaw.wav
 1c3eeaa8814ebd4916780dff80ed6dc5 *./tests/data/pcm.vsynth.out.wav
 stddev:  103.38 PSNR: 56.03 bytes:  1058444/  1058444
-9b883ee7a5256b26e16c419b76f373d7 *./tests/data/a-pcm_s8.mov
-533937 ./tests/data/a-pcm_s8.mov
+b7936d7170e0efefb379349d81aed360 *./tests/data/a-pcm_s8.mov
+530837 ./tests/data/a-pcm_s8.mov
 652edf30f35ad89bf27bcc9d2f9c7b53 *./tests/data/pcm.vsynth.out.wav
 stddev:  147.89 PSNR: 52.92 bytes:  1058444/  1058444
 98cadb3502dbdc99e6e077c28b1a036c *./tests/data/a-pcm_u8.wav
 529244 ./tests/data/a-pcm_u8.wav
 652edf30f35ad89bf27bcc9d2f9c7b53 *./tests/data/pcm.vsynth.out.wav
 stddev:  147.89 PSNR: 52.92 bytes:  1058444/  1058444
-5c8718508599b5c87af8e9a7158a9e66 *./tests/data/a-pcm_s16be.mov
-1063137 ./tests/data/a-pcm_s16be.mov
+c42b9c04305455250366c84e17c1023f *./tests/data/a-pcm_s16be.mov
+1060037 ./tests/data/a-pcm_s16be.mov
 95e54b261530a1bcf6de6fe3b21dc5f6 *./tests/data/pcm.vsynth.out.wav
 stddev:    0.00 PSNR:999.99 bytes:  1058444/  1058444
 95e54b261530a1bcf6de6fe3b21dc5f6 *./tests/data/a-pcm_s16le.wav
 1058444 ./tests/data/a-pcm_s16le.wav
 95e54b261530a1bcf6de6fe3b21dc5f6 *./tests/data/pcm.vsynth.out.wav
 stddev:    0.00 PSNR:999.99 bytes:  1058444/  1058444
-60594366d252826f839d527fb61fd31b *./tests/data/a-pcm_s16be.mkv
-1066118 ./tests/data/a-pcm_s16be.mkv
+83e2d1c6ff07f4dfba71c01f595811fc *./tests/data/a-pcm_s16be.mkv
+1060693 ./tests/data/a-pcm_s16be.mkv
 95e54b261530a1bcf6de6fe3b21dc5f6 *./tests/data/pcm.vsynth.out.wav
 stddev:    0.00 PSNR:999.99 bytes:  1058444/  1058444
-73172ccaabfc945a6908955951ead16b *./tests/data/a-pcm_s16le.mkv
-1066118 ./tests/data/a-pcm_s16le.mkv
+d31310a3263403fffbe28453dabeae74 *./tests/data/a-pcm_s16le.mkv
+1060693 ./tests/data/a-pcm_s16le.mkv
 95e54b261530a1bcf6de6fe3b21dc5f6 *./tests/data/pcm.vsynth.out.wav
 stddev:    0.00 PSNR:999.99 bytes:  1058444/  1058444
-4bc4cd19722f6456fd0e9b51ee0c30cf *./tests/data/a-pcm_s24be.mov
-1592337 ./tests/data/a-pcm_s24be.mov
+07ffe7ffb78f3648b6524debdde5aec1 *./tests/data/a-pcm_s24be.mov
+1589237 ./tests/data/a-pcm_s24be.mov
 95e54b261530a1bcf6de6fe3b21dc5f6 *./tests/data/pcm.vsynth.out.wav
 stddev:    0.00 PSNR:999.99 bytes:  1058444/  1058444
 aaba3cf534ddddf5bcf663bc8c5b5331 *./tests/data/a-pcm_s24le.wav
 1587644 ./tests/data/a-pcm_s24le.wav
 95e54b261530a1bcf6de6fe3b21dc5f6 *./tests/data/pcm.vsynth.out.wav
 stddev:    0.00 PSNR:999.99 bytes:  1058444/  1058444
-e60d8004d926d5f27beeb92a9bdd4b3d *./tests/data/a-pcm_s32be.mov
-2121537 ./tests/data/a-pcm_s32be.mov
+d7792f0343cd66fda8b50b569e2bcc48 *./tests/data/a-pcm_s32be.mov
+2118437 ./tests/data/a-pcm_s32be.mov
 95e54b261530a1bcf6de6fe3b21dc5f6 *./tests/data/pcm.vsynth.out.wav
 stddev:    0.00 PSNR:999.99 bytes:  1058444/  1058444
 7661c9b6f221d9f57985a9e4d92c4e63 *./tests/data/a-pcm_s32le.wav
@@ -281,7 +281,7 @@ stddev:    0.00 PSNR:999.99 bytes:  1058444/  1058444
 529256 ./tests/data/a-pcm_zork.wav
 864c8c866ac25642c29a13b122c70709 *./tests/data/pcm.vsynth.out.wav
 stddev:  633.10 PSNR: 40.29 bytes:  1058444/  1058444
-f0c1c9bae445267d4ab8fb91d4f56071 *./tests/data/a-pcm_s24daud.302
-10371830 ./tests/data/a-pcm_s24daud.302
+8168a5c1343553ef027541830f2cb879 *./tests/data/a-pcm_s24daud.302
+10368730 ./tests/data/a-pcm_s24daud.302
 fff1dc03aa2750031203a7d72b832fad *./tests/data/pcm.vsynth.out.wav
 stddev: 9416.45 PSNR: 16.84 bytes:  6911840/  1058444
diff --git a/tests/lavf.regression.ref b/tests/lavf.regression.ref
index d304f7c4f7..e88a14caba 100644
--- a/tests/lavf.regression.ref
+++ b/tests/lavf.regression.ref
@@ -27,15 +27,15 @@ c0cc2ae4df6a8b3df84986929a393116 *./tests/data/b-lavf.ts
 8617c30b4e862199555fd75890473e66 *./tests/data/b-lavf.flv
 335833 ./tests/data/b-lavf.flv
 ./tests/data/b-lavf.flv CRC=0xe14e8847
-af78858062599fcbba049e4a02588a15 *./tests/data/b-lavf.mov
-366879 ./tests/data/b-lavf.mov
-./tests/data/b-lavf.mov CRC=0x45079dca
+feabd6a186403dc3006b7de6015cffea *./tests/data/b-lavf.mov
+367219 ./tests/data/b-lavf.mov
+./tests/data/b-lavf.mov CRC=0xf7dd4032
 913b6199765b1dcba196706574621c2f *./tests/data/b-lavf.dv
 3600000 ./tests/data/b-lavf.dv
 ./tests/data/b-lavf.dv CRC=0x7787e173
-06339162f4e859b31125eb6d6382081f *./tests/data/b-lavf.gxf
+69d372c4061eda1e87ee63230ba4e38a *./tests/data/b-lavf.gxf
 810268 ./tests/data/b-lavf.gxf
-./tests/data/b-lavf.gxf CRC=0x9c06676e
+./tests/data/b-lavf.gxf CRC=0x651e9b0f
 66a6584f9e83e8ea3af822a3ba71fbbe *./tests/data/b-lavf.nut
 329264 ./tests/data/b-lavf.nut
 ./tests/data/b-lavf.nut CRC=0x400c29e9
@@ -76,27 +76,27 @@ a61d4116ee455880c9b788b6086a8ffa *./tests/data/b-lavf02.tiff
 8dd3739ea6778335f57fb3e2a28c6453 *./tests/data/b-lavf02.jpg
 ./tests/data/b-lavf%02d.jpg CRC=0x2e3e4535
 31586 ./tests/data/b-lavf02.jpg
-b0a8c8063d81921db5d7c8f50a1cc454 *./tests/data/b-lavf.wav
-89132 ./tests/data/b-lavf.wav
-./tests/data/b-lavf.wav CRC=0x2a09519c
-e2a6d6fae17394dfe87cb5bb8ae11837 *./tests/data/b-lavf.al
-44544 ./tests/data/b-lavf.al
-./tests/data/b-lavf.al CRC=0xefdf94c3
-4574d7e2c09e1e13663e61bd2889f12d *./tests/data/b-lavf.ul
-44544 ./tests/data/b-lavf.ul
-./tests/data/b-lavf.ul CRC=0x6064b2f8
-7a21ff174e3cca1702e0826c4ca0eccf *./tests/data/b-lavf.au
-89112 ./tests/data/b-lavf.au
-./tests/data/b-lavf.au CRC=0x2a09519c
+6a3bec31d92baf52161e25179ebba315 *./tests/data/b-lavf.wav
+90156 ./tests/data/b-lavf.wav
+./tests/data/b-lavf.wav CRC=0xf1ae5536
+8bce9c3758b0d38da2e0718b6ab57fb4 *./tests/data/b-lavf.al
+45056 ./tests/data/b-lavf.al
+./tests/data/b-lavf.al CRC=0x5e6d372b
+e64027a96ad5907ee281deff3286da0a *./tests/data/b-lavf.ul
+45056 ./tests/data/b-lavf.ul
+./tests/data/b-lavf.ul CRC=0xe028b50a
+dbd11f783219485cae32024e47c19dfb *./tests/data/b-lavf.au
+90136 ./tests/data/b-lavf.au
+./tests/data/b-lavf.au CRC=0xf1ae5536
 272b91d8fc31ed43b08246d182719751 *./tests/data/b-lavf.mmf
 22609 ./tests/data/b-lavf.mmf
 ./tests/data/b-lavf.mmf CRC=0x03633476
-ae3a23a7ea13c92a2909445ca8144dcd *./tests/data/b-lavf.aif
-89142 ./tests/data/b-lavf.aif
-./tests/data/b-lavf.aif CRC=0x2a09519c
-8d117c49d6b210abe783d1b0b897cec7 *./tests/data/b-lavf.voc
+379908755146d4ead062abe9c3b5c582 *./tests/data/b-lavf.aif
+90166 ./tests/data/b-lavf.aif
+./tests/data/b-lavf.aif CRC=0xf1ae5536
+b0bc287ce4e3eef7c1012610dd7ff6d0 *./tests/data/b-lavf.voc
 32768 ./tests/data/b-lavf.voc
-./tests/data/b-lavf.voc CRC=0x49972c8c
+./tests/data/b-lavf.voc CRC=0xa2d77c12
 767a75e9abf9754bfdc880d6faed69cf *./tests/data/b-lavf.ogg
 14210 ./tests/data/b-lavf.ogg
 ./tests/data/b-lavf.ogg CRC=0x37a143ea
diff --git a/tests/rotozoom.regression.ref b/tests/rotozoom.regression.ref
index 2bd52c6e92..c4e15d8fb8 100644
--- a/tests/rotozoom.regression.ref
+++ b/tests/rotozoom.regression.ref
@@ -177,10 +177,10 @@ stddev: 9328.41 PSNR: 16.92 bytes:  1055276/  1058444
 stddev: 4394.71 PSNR: 23.46 bytes:  1053352/  1058444
 3bfe347421de458dbfe572b8d4047b46 *./tests/data/a-ac3.rm
 98183 ./tests/data/a-ac3.rm
-39878597b1d65cce473639a7d8c93b02 *./tests/data/a-g726.wav
-24279 ./tests/data/a-g726.wav
-888f2f016e608d044a1bacbca5497ed2 *./tests/data/g726.rotozoom.out.wav
-stddev: 8364.40 PSNR: 17.87 bytes:    96936/  1058444
+5d8cce28f83dd33c3c7eaf43a5db5294 *./tests/data/a-g726.wav
+24082 ./tests/data/a-g726.wav
+4f1ba1af75dee64625a1c852e6cd01d3 *./tests/data/g726.rotozoom.out.wav
+stddev: 8506.46 PSNR: 17.72 bytes:    96148/  1058444
 3b969c43e45582f713e3c35faee9e0cc *./tests/data/a-adpcm_ima.wav
 266300 ./tests/data/a-adpcm_ima.wav
 947196b1739a9d6fe0c29424cf61cd8c *./tests/data/adpcm_ima_wav.rotozoom.out.wav
@@ -221,40 +221,40 @@ f443a8eeb1647ec1eeb8370c939e52d4 *./tests/data/a-pcm_mulaw.wav
 529256 ./tests/data/a-pcm_mulaw.wav
 1c3eeaa8814ebd4916780dff80ed6dc5 *./tests/data/pcm.rotozoom.out.wav
 stddev:  103.38 PSNR: 56.03 bytes:  1058444/  1058444
-9b883ee7a5256b26e16c419b76f373d7 *./tests/data/a-pcm_s8.mov
-533937 ./tests/data/a-pcm_s8.mov
+b7936d7170e0efefb379349d81aed360 *./tests/data/a-pcm_s8.mov
+530837 ./tests/data/a-pcm_s8.mov
 652edf30f35ad89bf27bcc9d2f9c7b53 *./tests/data/pcm.rotozoom.out.wav
 stddev:  147.89 PSNR: 52.92 bytes:  1058444/  1058444
 98cadb3502dbdc99e6e077c28b1a036c *./tests/data/a-pcm_u8.wav
 529244 ./tests/data/a-pcm_u8.wav
 652edf30f35ad89bf27bcc9d2f9c7b53 *./tests/data/pcm.rotozoom.out.wav
 stddev:  147.89 PSNR: 52.92 bytes:  1058444/  1058444
-5c8718508599b5c87af8e9a7158a9e66 *./tests/data/a-pcm_s16be.mov
-1063137 ./tests/data/a-pcm_s16be.mov
+c42b9c04305455250366c84e17c1023f *./tests/data/a-pcm_s16be.mov
+1060037 ./tests/data/a-pcm_s16be.mov
 95e54b261530a1bcf6de6fe3b21dc5f6 *./tests/data/pcm.rotozoom.out.wav
 stddev:    0.00 PSNR:999.99 bytes:  1058444/  1058444
 95e54b261530a1bcf6de6fe3b21dc5f6 *./tests/data/a-pcm_s16le.wav
 1058444 ./tests/data/a-pcm_s16le.wav
 95e54b261530a1bcf6de6fe3b21dc5f6 *./tests/data/pcm.rotozoom.out.wav
 stddev:    0.00 PSNR:999.99 bytes:  1058444/  1058444
-60594366d252826f839d527fb61fd31b *./tests/data/a-pcm_s16be.mkv
-1066118 ./tests/data/a-pcm_s16be.mkv
+83e2d1c6ff07f4dfba71c01f595811fc *./tests/data/a-pcm_s16be.mkv
+1060693 ./tests/data/a-pcm_s16be.mkv
 95e54b261530a1bcf6de6fe3b21dc5f6 *./tests/data/pcm.rotozoom.out.wav
 stddev:    0.00 PSNR:999.99 bytes:  1058444/  1058444
-73172ccaabfc945a6908955951ead16b *./tests/data/a-pcm_s16le.mkv
-1066118 ./tests/data/a-pcm_s16le.mkv
+d31310a3263403fffbe28453dabeae74 *./tests/data/a-pcm_s16le.mkv
+1060693 ./tests/data/a-pcm_s16le.mkv
 95e54b261530a1bcf6de6fe3b21dc5f6 *./tests/data/pcm.rotozoom.out.wav
 stddev:    0.00 PSNR:999.99 bytes:  1058444/  1058444
-4bc4cd19722f6456fd0e9b51ee0c30cf *./tests/data/a-pcm_s24be.mov
-1592337 ./tests/data/a-pcm_s24be.mov
+07ffe7ffb78f3648b6524debdde5aec1 *./tests/data/a-pcm_s24be.mov
+1589237 ./tests/data/a-pcm_s24be.mov
 95e54b261530a1bcf6de6fe3b21dc5f6 *./tests/data/pcm.rotozoom.out.wav
 stddev:    0.00 PSNR:999.99 bytes:  1058444/  1058444
 aaba3cf534ddddf5bcf663bc8c5b5331 *./tests/data/a-pcm_s24le.wav
 1587644 ./tests/data/a-pcm_s24le.wav
 95e54b261530a1bcf6de6fe3b21dc5f6 *./tests/data/pcm.rotozoom.out.wav
 stddev:    0.00 PSNR:999.99 bytes:  1058444/  1058444
-e60d8004d926d5f27beeb92a9bdd4b3d *./tests/data/a-pcm_s32be.mov
-2121537 ./tests/data/a-pcm_s32be.mov
+d7792f0343cd66fda8b50b569e2bcc48 *./tests/data/a-pcm_s32be.mov
+2118437 ./tests/data/a-pcm_s32be.mov
 95e54b261530a1bcf6de6fe3b21dc5f6 *./tests/data/pcm.rotozoom.out.wav
 stddev:    0.00 PSNR:999.99 bytes:  1058444/  1058444
 7661c9b6f221d9f57985a9e4d92c4e63 *./tests/data/a-pcm_s32le.wav
@@ -281,7 +281,7 @@ stddev:    0.00 PSNR:999.99 bytes:  1058444/  1058444
 529256 ./tests/data/a-pcm_zork.wav
 864c8c866ac25642c29a13b122c70709 *./tests/data/pcm.rotozoom.out.wav
 stddev:  633.10 PSNR: 40.29 bytes:  1058444/  1058444
-f0c1c9bae445267d4ab8fb91d4f56071 *./tests/data/a-pcm_s24daud.302
-10371830 ./tests/data/a-pcm_s24daud.302
+8168a5c1343553ef027541830f2cb879 *./tests/data/a-pcm_s24daud.302
+10368730 ./tests/data/a-pcm_s24daud.302
 fff1dc03aa2750031203a7d72b832fad *./tests/data/pcm.rotozoom.out.wav
 stddev: 9416.45 PSNR: 16.84 bytes:  6911840/  1058444
diff --git a/tests/seek.regression.ref b/tests/seek.regression.ref
index 52282682e7..bf0525e705 100644
--- a/tests/seek.regression.ref
+++ b/tests/seek.regression.ref
@@ -2612,7 +2612,7 @@ ret: 0 st: 0 dts:0.200816 pts:0.200816 pos:4428 size:1024 flags:1
 ret: 0 st: 0 ts:-0.904989 flags:0
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:0 size:1024 flags:1
 ret: 0 st: 0 ts:1.989161 flags:1
-ret: 0 st: 0 dts:1.989161 pts:1.989161 pos:43861 size:683 flags:1
+ret: 0 st: 0 dts:1.989161 pts:1.989161 pos:43861 size:1024 flags:1
 ret: 0 st:-1 ts:0.883340 flags:0
 ret: 0 st: 0 dts:0.883356 pts:0.883356 pos:19478 size:1024 flags:1
 ret: 0 st:-1 ts:-0.222493 flags:1
@@ -3111,46 +3111,46 @@ ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:36 size:28088 flags:1
 ret: 0 st:-1 ts:-1.000000 flags:0
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:36 size:28088 flags:1
 ret: 0 st:-1 ts:1.894167 flags:1
-ret: 0 st: 1 dts:0.952018 pts:0.952018 pos:334735 size:512 flags:1
+ret: 0 st: 1 dts:0.952018 pts:0.952018 pos:334735 size:1024 flags:1
 ret: 0 st: 0 ts:0.800000 flags:0
-ret: 0 st: 0 dts:0.960000 pts:0.960000 pos:335247 size:27897 flags:1
+ret: 0 st: 0 dts:0.960000 pts:0.960000 pos:335759 size:27897 flags:1
 ret: 0 st: 0 ts:-0.320000 flags:1
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:36 size:28088 flags:1
 ret:-1 st: 1 ts:2.576667 flags:0
 ret: 0 st: 1 ts:1.470839 flags:1
-ret: 0 st: 0 dts:0.960000 pts:0.960000 pos:335247 size:27897 flags:1
+ret: 0 st: 0 dts:0.960000 pts:0.960000 pos:335759 size:27897 flags:1
 ret: 0 st:-1 ts:0.365002 flags:0
 ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:166272 size:27412 flags:1
 ret: 0 st:-1 ts:-0.740831 flags:1
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:36 size:28088 flags:1
 ret:-1 st: 0 ts:2.160000 flags:0
 ret: 0 st: 0 ts:1.040000 flags:1
-ret: 0 st: 1 dts:0.952018 pts:0.952018 pos:334735 size:512 flags:1
+ret: 0 st: 1 dts:0.952018 pts:0.952018 pos:334735 size:1024 flags:1
 ret: 0 st: 1 ts:-0.058322 flags:0
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:36 size:28088 flags:1
 ret: 0 st: 1 ts:2.835828 flags:1
-ret: 0 st: 0 dts:0.960000 pts:0.960000 pos:335247 size:27897 flags:1
+ret: 0 st: 0 dts:0.960000 pts:0.960000 pos:335759 size:27897 flags:1
 ret:-1 st:-1 ts:1.730004 flags:0
 ret: 0 st:-1 ts:0.624171 flags:1
-ret: 0 st: 1 dts:0.476009 pts:0.476009 pos:165760 size:512 flags:1
+ret: 0 st: 1 dts:0.464399 pts:0.464399 pos:165248 size:1024 flags:1
 ret: 0 st: 0 ts:-0.480000 flags:0
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:36 size:28088 flags:1
 ret: 0 st: 0 ts:2.400000 flags:1
-ret: 0 st: 1 dts:0.952018 pts:0.952018 pos:334735 size:512 flags:1
+ret: 0 st: 1 dts:0.952018 pts:0.952018 pos:334735 size:1024 flags:1
 ret:-1 st: 1 ts:1.306667 flags:0
 ret: 0 st: 1 ts:0.200839 flags:1
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:36 size:28088 flags:1
 ret: 0 st:-1 ts:-0.904994 flags:0
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:36 size:28088 flags:1
 ret: 0 st:-1 ts:1.989173 flags:1
-ret: 0 st: 1 dts:0.952018 pts:0.952018 pos:334735 size:512 flags:1
+ret: 0 st: 1 dts:0.952018 pts:0.952018 pos:334735 size:1024 flags:1
 ret: 0 st: 0 ts:0.880000 flags:0
-ret: 0 st: 0 dts:0.960000 pts:0.960000 pos:335247 size:27897 flags:1
+ret: 0 st: 0 dts:0.960000 pts:0.960000 pos:335759 size:27897 flags:1
 ret: 0 st: 0 ts:-0.240000 flags:1
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:36 size:28088 flags:1
 ret:-1 st: 1 ts:2.671678 flags:0
 ret: 0 st: 1 ts:1.565850 flags:1
-ret: 0 st: 0 dts:0.960000 pts:0.960000 pos:335247 size:27897 flags:1
+ret: 0 st: 0 dts:0.960000 pts:0.960000 pos:335759 size:27897 flags:1
 ret: 0 st:-1 ts:0.460008 flags:0
 ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:166272 size:27412 flags:1
 ret: 0 st:-1 ts:-0.645825 flags:1
@@ -3698,7 +3698,7 @@ ret: 0 st: 0 dts:0.200816 pts:0.200816 pos:4428 size:1024 flags:1
 ret: 0 st: 0 ts:-0.904989 flags:0
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:0 size:1024 flags:1
 ret: 0 st: 0 ts:1.989161 flags:1
-ret: 0 st: 0 dts:1.989161 pts:1.989161 pos:43861 size:683 flags:1
+ret: 0 st: 0 dts:1.989161 pts:1.989161 pos:43861 size:1024 flags:1
 ret: 0 st:-1 ts:0.883340 flags:0
 ret: 0 st: 0 dts:0.883356 pts:0.883356 pos:19478 size:1024 flags:1
 ret: 0 st:-1 ts:-0.222493 flags:1
@@ -3713,7 +3713,7 @@ ret: 0 st:-1 ts:-0.645825 flags:1
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:0 size:1024 flags:1
 ----------------
 tests/data/b-lavf.voc
-ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:32 size:512 flags:1
+ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:32 size:1024 flags:1
 ret:-1 st:-1 ts:-1.000000 flags:0
 ret:-1 st:-1 ts:1.894167 flags:1
 ret:-1 st: 0 ts:0.788333 flags:0