pad last audio frame when encoding

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

ffmpeg.c

@@ -1464,11 +1464,20 @@ static int output_packet(AVInputStream *ist, int ist_index,
                             fifo_bytes = av_fifo_size(ost->fifo);
                             ret = 0;
                             /* encode any samples remaining in fifo */
-                            if(fifo_bytes > 0 && enc->codec->capabilities & CODEC_CAP_SMALL_LAST_FRAME) {
+                            if (fifo_bytes > 0) {
                                 int osize = av_get_bits_per_sample_format(enc->sample_fmt) >> 3;
                                 int fs_tmp = enc->frame_size;
-                                enc->frame_size = fifo_bytes / (osize * enc->channels);
+
                                 av_fifo_generic_read(ost->fifo, samples, fifo_bytes, NULL);
+                                if (enc->codec->capabilities & CODEC_CAP_SMALL_LAST_FRAME) {
+                                    enc->frame_size = fifo_bytes / (osize * enc->channels);
+                                } else { /* pad */
+                                    int frame_bytes = enc->frame_size*osize*enc->channels;
+                                    if (samples_size < frame_bytes)
+                                        av_exit(1);
+                                    memset((uint8_t*)samples+fifo_bytes, 0, frame_bytes - fifo_bytes);
+                                }
+
                                 ret = avcodec_encode_audio(enc, bit_buffer, bit_buffer_size, samples);
                                 pkt.duration = av_rescale((int64_t)enc->frame_size*ost->st->time_base.den,
                                                           ost->st->time_base.num, enc->sample_rate);

tests/ffmpeg.regression.ref

@@ -170,49 +170,49 @@ stddev:    9.53 PSNR: 28.53 bytes:  7603200/  7603200
 14684984 ./tests/data/a-flashsv.flv
 012717e7c928641410eaa6abaf126fdc *./tests/data/flashsv.vsynth.out.yuv
 stddev:    2.84 PSNR: 39.05 bytes:  7603200/  7603200
-21f8ff9f1daacd9133683bb4ea0f50a4 *./tests/data/a-mp2.mp2
-95712 ./tests/data/a-mp2.mp2
-83f8df5d5f84480566af548bb037fceb *./tests/data/mp2.vsynth.out.wav
-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
+28fbc7485c7939f40368f79adccb3e3d *./tests/data/a-mp2.mp2
+96130 ./tests/data/a-mp2.mp2
+c02d5b881c424498457298739f168368 *./tests/data/mp2.vsynth.out.wav
+stddev: 9315.45 PSNR: 16.94 bytes:  1059884/  1058444
+stddev: 4385.18 PSNR: 23.48 bytes:  1057960/  1058444
+081bfd5e683b13cccf1b07c43c1c5005 *./tests/data/a-ac3.rm
+98751 ./tests/data/a-ac3.rm
 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
-stddev:  903.80 PSNR: 37.20 bytes:  1057724/  1058444
-efdae2746040dbc27be402b149556f1e *./tests/data/a-adpcm_qt.aiff
-281184 ./tests/data/a-adpcm_qt.aiff
-5a2084ad27674d5cf3bc2945061e7910 *./tests/data/adpcm_ima_qt.vsynth.out.wav
-stddev:  914.67 PSNR: 37.09 bytes:  1058348/  1058444
-88a0c48c9bc6d50a84c408151c6a3d64 *./tests/data/a-adpcm_ms.wav
-267320 ./tests/data/a-adpcm_ms.wav
-d5f98f5136040be42232a34df92d61f2 *./tests/data/adpcm_ms.vsynth.out.wav
-stddev: 1050.92 PSNR: 35.89 bytes:  1056572/  1058444
-ab11d9151644cbff27827b7e89f37aa9 *./tests/data/a-adpcm_yam.wav
-264248 ./tests/data/a-adpcm_yam.wav
-e92cec8c07913ffb91ad2b11f79cdc00 *./tests/data/adpcm_yam.vsynth.out.wav
-stddev:18312.78 PSNR: 11.06 bytes:  1056812/  1058444
-7187eb46a4987b7ca9beafecffbda55d *./tests/data/a-adpcm_swf.flv
-267097 ./tests/data/a-adpcm_swf.flv
-e48b800e2d9be6afcd430d4f08a34eb6 *./tests/data/adpcm_swf.vsynth.out.wav
-stddev:  934.28 PSNR: 36.91 bytes:  1056812/  1058444
+56b75c3a6dacedcf2ce7b0586aa33594 *./tests/data/a-adpcm_ima.wav
+267324 ./tests/data/a-adpcm_ima.wav
+78a2af1c895792d0c221d127bdd48ece *./tests/data/adpcm_ima_wav.vsynth.out.wav
+stddev:  903.51 PSNR: 37.20 bytes:  1061792/  1058444
+3c06fd2f7831e3e8735b936e23ca220c *./tests/data/a-adpcm_qt.aiff
+281252 ./tests/data/a-adpcm_qt.aiff
+9580492803ba1c1a3746367b24b751c8 *./tests/data/adpcm_ima_qt.vsynth.out.wav
+stddev:  914.63 PSNR: 37.09 bytes:  1058604/  1058444
+9f813f0cc8b2c05821a31828eadf1188 *./tests/data/a-adpcm_ms.wav
+268344 ./tests/data/a-adpcm_ms.wav
+7be370f937c51e8a967e6a3d08d5156a *./tests/data/adpcm_ms.vsynth.out.wav
+stddev: 1050.00 PSNR: 35.90 bytes:  1060620/  1058444
+14df8b8bb7c127ec70c0167df1c0dbf7 *./tests/data/a-adpcm_yam.wav
+266296 ./tests/data/a-adpcm_yam.wav
+2f73107dafef6db42e545f9e466d3f05 *./tests/data/adpcm_yam.vsynth.out.wav
+stddev:18302.45 PSNR: 11.07 bytes:  1065004/  1058444
+c0c2a66f75ea32ef6656ac7cdd08023c *./tests/data/a-adpcm_swf.flv
+269166 ./tests/data/a-adpcm_swf.flv
+628089745a7059ae4055c2515b6d668b *./tests/data/adpcm_swf.vsynth.out.wav
+stddev:  933.65 PSNR: 36.92 bytes:  1065004/  1058444
 7781a016edfc242a39e4d65af02d861a *./tests/data/a-flac.flac
 353368 ./tests/data/a-flac.flac
 95e54b261530a1bcf6de6fe3b21dc5f6 *./tests/data/flac.vsynth.out.wav
 stddev:    0.00 PSNR:999.99 bytes:  1058444/  1058444
-4435d87463cd6c5407bd88cca241ca56 *./tests/data/a-wmav1.asf
+26a7f6b0f0b7181df8df3fa589f6bf81 *./tests/data/a-wmav1.asf
 106004 ./tests/data/a-wmav1.asf
-stddev:12251.38 PSNR: 14.56 bytes:  1056812/  1058444
-stddev: 2105.96 PSNR: 29.85 bytes:  1048620/  1058444
-24ae726aef89e5d17e315c64182f4c61 *./tests/data/a-wmav2.asf
+stddev:12245.27 PSNR: 14.56 bytes:  1065004/  1058444
+stddev: 2097.78 PSNR: 29.88 bytes:  1056812/  1058444
+7c6c0cb692af01b312ae345723674b5f *./tests/data/a-wmav2.asf
 106044 ./tests/data/a-wmav2.asf
-stddev:12255.80 PSNR: 14.55 bytes:  1056812/  1058444
-stddev: 2099.27 PSNR: 29.88 bytes:  1048620/  1058444
+stddev:12249.69 PSNR: 14.56 bytes:  1065004/  1058444
+stddev: 2091.12 PSNR: 29.91 bytes:  1056812/  1058444
 89f5b8dd97e0dddbe59af0d44fd229f3 *./tests/data/a-pcm_alaw.wav
 529256 ./tests/data/a-pcm_alaw.wav
 0568b0b9a72e31559e150e7e09d301cd *./tests/data/pcm.vsynth.out.wav

tests/lavf.regression.ref

@@ -1,29 +1,29 @@
-8a0536ccfe36f4fff408b3327d33e1dd *./tests/data/b-lavf.avi
-340344 ./tests/data/b-lavf.avi
-./tests/data/b-lavf.avi CRC=0x400c29e9
-bd9e0012aa39e956605387dd499365fb *./tests/data/b-lavf.asf
+bc5e914594523f7c48f9e044c9a9c0b6 *./tests/data/b-lavf.avi
+340578 ./tests/data/b-lavf.avi
+./tests/data/b-lavf.avi CRC=0xfee88bbc
+11105815213dc09c4b56f91320cfc568 *./tests/data/b-lavf.asf
 339775 ./tests/data/b-lavf.asf
-./tests/data/b-lavf.asf CRC=0x74113749
-db5797d4c00c8b15e2e44216389be591 *./tests/data/b-lavf.rm
-355387 ./tests/data/b-lavf.rm
-bdb7484c68db722f66ba1630cf79844c *./tests/data/b-lavf.mpg
+./tests/data/b-lavf.asf CRC=0x9a04991c
+337a4b2fb1d6c808714b555f1139eb89 *./tests/data/b-lavf.rm
+355679 ./tests/data/b-lavf.rm
+bfdec98337e6a9d89dc648d1e65a41db *./tests/data/b-lavf.mpg
 378880 ./tests/data/b-lavf.mpg
-./tests/data/b-lavf.mpg CRC=0x2b71a386
+./tests/data/b-lavf.mpg CRC=0xaf760568
 259a87c8d22aab76665047ecdbfa9267 *./tests/data/b-lavf.mxf
 535097 ./tests/data/b-lavf.mxf
 ./tests/data/b-lavf.mxf CRC=0xd7ff387d
 0a7cc51de3da754ce36dffeeda290c45 *./tests/data/b-lavf.mxf_d10
 5330989 ./tests/data/b-lavf.mxf_d10
 ./tests/data/b-lavf.mxf_d10 CRC=0xd241c8b6
-88ed42ab4e1974c902b22ca17dfb3474 *./tests/data/b-lavf.ts
-451764 ./tests/data/b-lavf.ts
-./tests/data/b-lavf.ts CRC=0xcc4948e1
+27ccd081757e4242493ee46e548ef237 *./tests/data/b-lavf.ts
+451952 ./tests/data/b-lavf.ts
+./tests/data/b-lavf.ts CRC=0x538daab4
 1b28a16652bb8ac528b33f7478ca18b6 *./tests/data/b-lavf.swf
 335771 ./tests/data/b-lavf.swf
 ./tests/data/b-lavf.swf CRC=0xe14e8847
-49d04c063b7741d3ee8f85c92baa69bf *./tests/data/b-lavf.ffm
+3bce2db7383ad5588dd150c6d425e73d *./tests/data/b-lavf.ffm
 380928 ./tests/data/b-lavf.ffm
-./tests/data/b-lavf.ffm CRC=0x2b71a386
+./tests/data/b-lavf.ffm CRC=0xaf760568
 8617c30b4e862199555fd75890473e66 *./tests/data/b-lavf.flv
 335833 ./tests/data/b-lavf.flv
 ./tests/data/b-lavf.flv CRC=0xe14e8847
@@ -36,12 +36,12 @@ feabd6a186403dc3006b7de6015cffea *./tests/data/b-lavf.mov
 69d372c4061eda1e87ee63230ba4e38a *./tests/data/b-lavf.gxf
 810268 ./tests/data/b-lavf.gxf
 ./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
-6f4e64d21325f6721cdbddca2626e5df *./tests/data/b-lavf.mkv
-329797 ./tests/data/b-lavf.mkv
-./tests/data/b-lavf.mkv CRC=0x400c29e9
+d4aef795560a5ae94c7a424151603c22 *./tests/data/b-lavf.nut
+329472 ./tests/data/b-lavf.nut
+./tests/data/b-lavf.nut CRC=0xfee88bbc
+218510c167e627824b2df5bd3f73680b *./tests/data/b-lavf.mkv
+330013 ./tests/data/b-lavf.mkv
+./tests/data/b-lavf.mkv CRC=0xfee88bbc
 1008f5b7487c76314772e1346e0bd478 *./tests/data/b-pbmpipe.pbm
 317075 ./tests/data/b-pbmpipe.pbm
 ./tests/data/b-pbmpipe.pbm CRC=0x806e17d8

tests/rotozoom.regression.ref

@@ -170,49 +170,49 @@ stddev:    3.23 PSNR: 37.92 bytes:  7603200/  7603200
 12368953 ./tests/data/a-flashsv.flv
 592b3321994e26a990deb3a0a1415de9 *./tests/data/flashsv.rotozoom.out.yuv
 stddev:    0.65 PSNR: 51.83 bytes:  7603200/  7603200
-21f8ff9f1daacd9133683bb4ea0f50a4 *./tests/data/a-mp2.mp2
-95712 ./tests/data/a-mp2.mp2
-83f8df5d5f84480566af548bb037fceb *./tests/data/mp2.rotozoom.out.wav
-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
+28fbc7485c7939f40368f79adccb3e3d *./tests/data/a-mp2.mp2
+96130 ./tests/data/a-mp2.mp2
+c02d5b881c424498457298739f168368 *./tests/data/mp2.rotozoom.out.wav
+stddev: 9315.45 PSNR: 16.94 bytes:  1059884/  1058444
+stddev: 4385.18 PSNR: 23.48 bytes:  1057960/  1058444
+081bfd5e683b13cccf1b07c43c1c5005 *./tests/data/a-ac3.rm
+98751 ./tests/data/a-ac3.rm
 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
-stddev:  903.80 PSNR: 37.20 bytes:  1057724/  1058444
-efdae2746040dbc27be402b149556f1e *./tests/data/a-adpcm_qt.aiff
-281184 ./tests/data/a-adpcm_qt.aiff
-5a2084ad27674d5cf3bc2945061e7910 *./tests/data/adpcm_ima_qt.rotozoom.out.wav
-stddev:  914.67 PSNR: 37.09 bytes:  1058348/  1058444
-88a0c48c9bc6d50a84c408151c6a3d64 *./tests/data/a-adpcm_ms.wav
-267320 ./tests/data/a-adpcm_ms.wav
-d5f98f5136040be42232a34df92d61f2 *./tests/data/adpcm_ms.rotozoom.out.wav
-stddev: 1050.92 PSNR: 35.89 bytes:  1056572/  1058444
-ab11d9151644cbff27827b7e89f37aa9 *./tests/data/a-adpcm_yam.wav
-264248 ./tests/data/a-adpcm_yam.wav
-e92cec8c07913ffb91ad2b11f79cdc00 *./tests/data/adpcm_yam.rotozoom.out.wav
-stddev:18312.78 PSNR: 11.06 bytes:  1056812/  1058444
-7187eb46a4987b7ca9beafecffbda55d *./tests/data/a-adpcm_swf.flv
-267097 ./tests/data/a-adpcm_swf.flv
-e48b800e2d9be6afcd430d4f08a34eb6 *./tests/data/adpcm_swf.rotozoom.out.wav
-stddev:  934.28 PSNR: 36.91 bytes:  1056812/  1058444
+56b75c3a6dacedcf2ce7b0586aa33594 *./tests/data/a-adpcm_ima.wav
+267324 ./tests/data/a-adpcm_ima.wav
+78a2af1c895792d0c221d127bdd48ece *./tests/data/adpcm_ima_wav.rotozoom.out.wav
+stddev:  903.51 PSNR: 37.20 bytes:  1061792/  1058444
+3c06fd2f7831e3e8735b936e23ca220c *./tests/data/a-adpcm_qt.aiff
+281252 ./tests/data/a-adpcm_qt.aiff
+9580492803ba1c1a3746367b24b751c8 *./tests/data/adpcm_ima_qt.rotozoom.out.wav
+stddev:  914.63 PSNR: 37.09 bytes:  1058604/  1058444
+9f813f0cc8b2c05821a31828eadf1188 *./tests/data/a-adpcm_ms.wav
+268344 ./tests/data/a-adpcm_ms.wav
+7be370f937c51e8a967e6a3d08d5156a *./tests/data/adpcm_ms.rotozoom.out.wav
+stddev: 1050.00 PSNR: 35.90 bytes:  1060620/  1058444
+14df8b8bb7c127ec70c0167df1c0dbf7 *./tests/data/a-adpcm_yam.wav
+266296 ./tests/data/a-adpcm_yam.wav
+2f73107dafef6db42e545f9e466d3f05 *./tests/data/adpcm_yam.rotozoom.out.wav
+stddev:18302.45 PSNR: 11.07 bytes:  1065004/  1058444
+c0c2a66f75ea32ef6656ac7cdd08023c *./tests/data/a-adpcm_swf.flv
+269166 ./tests/data/a-adpcm_swf.flv
+628089745a7059ae4055c2515b6d668b *./tests/data/adpcm_swf.rotozoom.out.wav
+stddev:  933.65 PSNR: 36.92 bytes:  1065004/  1058444
 7781a016edfc242a39e4d65af02d861a *./tests/data/a-flac.flac
 353368 ./tests/data/a-flac.flac
 95e54b261530a1bcf6de6fe3b21dc5f6 *./tests/data/flac.rotozoom.out.wav
 stddev:    0.00 PSNR:999.99 bytes:  1058444/  1058444
-4435d87463cd6c5407bd88cca241ca56 *./tests/data/a-wmav1.asf
+26a7f6b0f0b7181df8df3fa589f6bf81 *./tests/data/a-wmav1.asf
 106004 ./tests/data/a-wmav1.asf
-stddev:12251.38 PSNR: 14.56 bytes:  1056812/  1058444
-stddev: 2105.96 PSNR: 29.85 bytes:  1048620/  1058444
-24ae726aef89e5d17e315c64182f4c61 *./tests/data/a-wmav2.asf
+stddev:12245.27 PSNR: 14.56 bytes:  1065004/  1058444
+stddev: 2097.78 PSNR: 29.88 bytes:  1056812/  1058444
+7c6c0cb692af01b312ae345723674b5f *./tests/data/a-wmav2.asf
 106044 ./tests/data/a-wmav2.asf
-stddev:12255.80 PSNR: 14.55 bytes:  1056812/  1058444
-stddev: 2099.27 PSNR: 29.88 bytes:  1048620/  1058444
+stddev:12249.69 PSNR: 14.56 bytes:  1065004/  1058444
+stddev: 2091.12 PSNR: 29.91 bytes:  1056812/  1058444
 89f5b8dd97e0dddbe59af0d44fd229f3 *./tests/data/a-pcm_alaw.wav
 529256 ./tests/data/a-pcm_alaw.wav
 0568b0b9a72e31559e150e7e09d301cd *./tests/data/pcm.rotozoom.out.wav

tests/seek.regression.ref

@@ -2747,7 +2747,7 @@ ret: 0 st: 0 dts:0.960000 pts:0.960000 pos:310948 size:27927 flags:1
 ret:-1 st: 0 ts:-0.320000 flags:1
 ret:-1 st: 1 ts:2.586122 flags:0
 ret: 0 st: 1 ts:1.462857 flags:1
-ret: 0 st: 1 dts:0.992653 pts:0.992653 pos:339102 size:209 flags:1
+ret: 0 st: 1 dts:1.018776 pts:1.018776 pos:339320 size:209 flags:1
 ret: 0 st:-1 ts:0.365002 flags:0
 ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:158912 size:27442 flags:1
 ret:-1 st:-1 ts:-0.740831 flags:1
@@ -2757,7 +2757,7 @@ ret: 0 st: 0 dts:0.960000 pts:0.960000 pos:310948 size:27927 flags:1
 ret: 0 st: 1 ts:-0.052245 flags:0
 ret: 0 st: 1 dts:0.000000 pts:0.000000 pos:38034 size:208 flags:1
 ret: 0 st: 1 ts:2.847347 flags:1
-ret: 0 st: 1 dts:0.992653 pts:0.992653 pos:339102 size:209 flags:1
+ret: 0 st: 1 dts:1.018776 pts:1.018776 pos:339320 size:209 flags:1
 ret:-1 st:-1 ts:1.730004 flags:0
 ret: 0 st:-1 ts:0.624171 flags:1
 ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:158912 size:27442 flags:1
@@ -2777,7 +2777,7 @@ ret: 0 st: 0 dts:0.960000 pts:0.960000 pos:310948 size:27927 flags:1
 ret:-1 st: 0 ts:-0.240000 flags:1
 ret:-1 st: 1 ts:2.664490 flags:0
 ret: 0 st: 1 ts:1.567347 flags:1
-ret: 0 st: 1 dts:0.992653 pts:0.992653 pos:339102 size:209 flags:1
+ret: 0 st: 1 dts:1.018776 pts:1.018776 pos:339320 size:209 flags:1
 ret: 0 st:-1 ts:0.460008 flags:0
 ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:158912 size:27442 flags:1
 ret:-1 st:-1 ts:-0.645825 flags:1
@@ -3035,7 +3035,7 @@ ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:505 size:28088 flags:1
 ret: 0 st: 1 ts:2.577000 flags:0
 ret:-32
 ret: 0 st: 1 ts:1.471000 flags:1
-ret: 0 st: 1 dts:0.993000 pts:0.993000 pos:329501 size:209 flags:1
+ret: 0 st: 1 dts:1.019000 pts:1.019000 pos:329717 size:209 flags:1
 ret: 0 st:-1 ts:0.365002 flags:0
 ret: 0 st: 0 dts:0.400000 pts:0.400000 pos:128828 size:9787 flags:0
 ret: 0 st:-1 ts:-0.740831 flags:1
@@ -3047,7 +3047,7 @@ ret: 0 st: 0 dts:0.960000 pts:0.960000 pos:301381 size:27897 flags:1
 ret: 0 st: 1 ts:-0.058000 flags:0
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:505 size:28088 flags:1
 ret: 0 st: 1 ts:2.836000 flags:1
-ret: 0 st: 1 dts:0.993000 pts:0.993000 pos:329501 size:209 flags:1
+ret: 0 st: 1 dts:1.019000 pts:1.019000 pos:329717 size:209 flags:1
 ret: 0 st:-1 ts:1.730004 flags:0
 ret:-32
 ret: 0 st:-1 ts:0.624171 flags:1
@@ -3071,7 +3071,7 @@ ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:505 size:28088 flags:1
 ret: 0 st: 1 ts:2.672000 flags:0
 ret:-32
 ret: 0 st: 1 ts:1.566000 flags:1
-ret: 0 st: 1 dts:0.993000 pts:0.993000 pos:329501 size:209 flags:1
+ret: 0 st: 1 dts:1.019000 pts:1.019000 pos:329717 size:209 flags:1
 ret: 0 st:-1 ts:0.460008 flags:0
 ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:149425 size:27412 flags:1
 ret: 0 st:-1 ts:-0.645825 flags:1
@@ -3167,7 +3167,7 @@ ret: 0 st: 1 dts:0.761222 pts:0.761222 pos:-1 size:209 flags:1
 ret: 0 st: 0 ts:-0.317500 flags:1
 ret: 0 st: 1 dts:0.500000 pts:0.500000 pos:-1 size:208 flags:1
 ret: 0 st: 1 ts:2.576667 flags:0
-ret: 0 st: 1 dts:1.283678 pts:1.283678 pos:-1 size:209 flags:1
+ret: 0 st: 1 dts:1.518778 pts:1.518778 pos:-1 size:209 flags:1
 ret: 0 st: 1 ts:1.470833 flags:1
 ret: 0 st: 1 dts:1.283678 pts:1.283678 pos:-1 size:209 flags:1
 ret: 0 st:-1 ts:0.365002 flags:0
@@ -3181,7 +3181,7 @@ ret: 0 st: 0 dts:1.020000 pts:1.060000 pos:-1 size:14482 flags:0
 ret: 0 st: 1 ts:-0.058333 flags:0
 ret: 0 st: 1 dts:0.500000 pts:0.500000 pos:-1 size:208 flags:1
 ret: 0 st: 1 ts:2.835833 flags:1
-ret: 0 st: 1 dts:1.283678 pts:1.283678 pos:-1 size:209 flags:1
+ret: 0 st: 1 dts:1.518778 pts:1.518778 pos:-1 size:209 flags:1
 ret: 0 st:-1 ts:1.730004 flags:0
 ret: 0 st: 1 dts:1.022444 pts:1.022444 pos:-1 size:209 flags:1
 ret: 0 st:-1 ts:0.624171 flags:1
@@ -3191,7 +3191,7 @@ ret: 0 st: 1 dts:0.500000 pts:0.500000 pos:-1 size:208 flags:1
 ret: 0 st: 0 ts:2.412500 flags:1
 ret: 0 st: 1 dts:1.022444 pts:1.022444 pos:-1 size:209 flags:1
 ret: 0 st: 1 ts:1.306667 flags:0
-ret: 0 st: 1 dts:1.283678 pts:1.283678 pos:-1 size:209 flags:1
+ret: 0 st: 1 dts:1.518778 pts:1.518778 pos:-1 size:209 flags:1
 ret: 0 st: 1 ts:0.200844 flags:1
 ret: 0 st: 1 dts:0.500000 pts:0.500000 pos:-1 size:208 flags:1
 ret: 0 st:-1 ts:-0.904994 flags:0
@@ -3203,9 +3203,9 @@ ret: 0 st: 0 dts:0.900000 pts:0.940000 pos:-1 size:13124 flags:0
 ret: 0 st: 0 ts:-0.222489 flags:1
 ret: 0 st: 1 dts:0.500000 pts:0.500000 pos:-1 size:208 flags:1
 ret: 0 st: 1 ts:2.671678 flags:0
-ret: 0 st: 1 dts:1.283678 pts:1.283678 pos:-1 size:209 flags:1
+ret: 0 st: 1 dts:1.518778 pts:1.518778 pos:-1 size:209 flags:1
 ret: 0 st: 1 ts:1.565844 flags:1
-ret: 0 st: 1 dts:1.283678 pts:1.283678 pos:-1 size:209 flags:1
+ret: 0 st: 1 dts:1.518778 pts:1.518778 pos:-1 size:209 flags:1
 ret: 0 st:-1 ts:0.460008 flags:0
 ret: 0 st: 0 dts:0.500000 pts:0.540000 pos:-1 size:16335 flags:0
 ret: 0 st:-1 ts:-0.645825 flags:1
@@ -3528,10 +3528,8 @@ ret: 0 st: 0 ts:0.788000 flags:0
 ret: 0 st: 0 dts:0.960000 pts:0.960000 pos:323974 size:31124 flags:1
 ret: 0 st: 0 ts:-0.317000 flags:1
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:398 size:31393 flags:1
-ret: 0 st: 1 ts:2.577000 flags:0
-ret: 0 st: 1 dts:0.975000 pts:0.975000 pos:355101 size:278 flags:1
-ret: 0 st: 1 ts:1.471000 flags:1
-ret: 0 st: 1 dts:0.975000 pts:0.975000 pos:355101 size:278 flags:1
+ret:-1 st: 1 ts:2.577000 flags:0
+ret:-1 st: 1 ts:1.471000 flags:1
 ret: 0 st:-1 ts:0.365002 flags:0
 ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:160930 size:30549 flags:1
 ret: 0 st:-1 ts:-0.740831 flags:1
@@ -3542,8 +3540,7 @@ ret: 0 st: 0 ts:1.048000 flags:1
 ret: 0 st: 0 dts:0.960000 pts:0.960000 pos:323974 size:31124 flags:1
 ret: 0 st: 1 ts:-0.058000 flags:0
 ret: 0 st: 1 dts:0.000000 pts:0.000000 pos:31794 size:278 flags:1
-ret: 0 st: 1 ts:2.836000 flags:1
-ret: 0 st: 1 dts:0.975000 pts:0.975000 pos:355101 size:278 flags:1
+ret:-1 st: 1 ts:2.836000 flags:1
 ret: 0 st:-1 ts:1.730004 flags:0
 ret: 0 st: 0 dts:0.960000 pts:0.960000 pos:323974 size:31124 flags:1
 ret: 0 st:-1 ts:0.624171 flags:1
@@ -3552,8 +3549,7 @@ ret: 0 st: 0 ts:-0.482000 flags:0
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:398 size:31393 flags:1
 ret: 0 st: 0 ts:2.413000 flags:1
 ret: 0 st: 0 dts:0.960000 pts:0.960000 pos:323974 size:31124 flags:1
-ret: 0 st: 1 ts:1.307000 flags:0
-ret: 0 st: 1 dts:0.975000 pts:0.975000 pos:355101 size:278 flags:1
+ret:-1 st: 1 ts:1.307000 flags:0
 ret: 0 st: 1 ts:0.201000 flags:1
 ret: 0 st: 1 dts:0.174000 pts:0.174000 pos:79106 size:278 flags:1
 ret: 0 st:-1 ts:-0.904994 flags:0
@@ -3564,10 +3560,8 @@ ret: 0 st: 0 ts:0.883000 flags:0
 ret: 0 st: 0 dts:0.960000 pts:0.960000 pos:323974 size:31124 flags:1
 ret: 0 st: 0 ts:-0.222000 flags:1
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:398 size:31393 flags:1
-ret: 0 st: 1 ts:2.672000 flags:0
-ret: 0 st: 1 dts:0.975000 pts:0.975000 pos:355101 size:278 flags:1
-ret: 0 st: 1 ts:1.566000 flags:1
-ret: 0 st: 1 dts:0.975000 pts:0.975000 pos:355101 size:278 flags:1
+ret:-1 st: 1 ts:2.672000 flags:0
+ret:-1 st: 1 ts:1.566000 flags:1
 ret: 0 st:-1 ts:0.460008 flags:0
 ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:160930 size:30549 flags:1
 ret: 0 st:-1 ts:-0.645825 flags:1
@@ -3609,7 +3603,7 @@ ret: 0 st: 0 dts:0.044344 pts:-102481911520608.625000 pos:29704 size:22036 flags
 ret: 0 st:-1 ts:1.894167 flags:1
 ret: 0 st: 0 dts:1.881344 pts:-102481911520608.625000 pos:29704 size:852 flags:1
 ret: 0 st: 0 ts:0.788333 flags:0
-ret: 0 st: 0 dts:0.803344 pts:-102481911520608.625000 pos:66176 size:16769 flags:0
+ret: 0 st: 0 dts:0.700000 pts:0.740000 pos:29704 size:16769 flags:0
 ret: 0 st: 0 ts:-0.317500 flags:1
 ret: 0 st: 0 dts:0.027844 pts:-102481911520608.625000 pos:48880 size:22036 flags:1
 ret: 0 st: 1 ts:2.576667 flags:0
@@ -3635,7 +3629,7 @@ ret: 0 st: 0 dts:0.616344 pts:-102481911520608.625000 pos:66176 size:6620 flags:
 ret: 0 st: 0 ts:-0.481667 flags:0
 ret: 0 st: 0 dts:0.044344 pts:-102481911520608.625000 pos:29704 size:22036 flags:1
 ret: 0 st: 0 ts:2.412500 flags:1
-ret: 0 st: 0 dts:2.403844 pts:-102481911520608.625000 pos:-1 size:13937 flags:0
+ret: 0 st: 0 dts:0.820000 pts:0.860000 pos:82720 size:13937 flags:0
 ret: 0 st: 1 ts:1.306667 flags:0
 ret: 0 st: 0 dts:1.309344 pts:-102481911520608.625000 pos:99264 size:1456 flags:1
 ret: 0 st: 1 ts:0.200844 flags:1