1. ffmpeg
  2. Commit b10d7e4e3afd21d10bd53d3c839cf3eb151c63d7
Browse code

pad last audio frame when encoding

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

Baptiste Coudurier authored on 2009/05/23 13:07:25
Showing 5 changed files
ffmpeg.c
History View file @ b10d7e4
... ... 
@@ -1464,11 +1464,20 @@ static int output_packet(AVInputStream *ist, int ist_index,
1464 1464 
                             fifo_bytes = av_fifo_size(ost->fifo);
1465 1465 
                             ret = 0;
1466 1466 
                             /* encode any samples remaining in fifo */
1467 
-                            if(fifo_bytes > 0 && enc->codec->capabilities & CODEC_CAP_SMALL_LAST_FRAME) {
1467 
+                            if (fifo_bytes > 0) {
1468 1468 
                                 int osize = av_get_bits_per_sample_format(enc->sample_fmt) >> 3;
1469 1469 
                                 int fs_tmp = enc->frame_size;
1470 
-                                enc->frame_size = fifo_bytes / (osize * enc->channels);
1470 
+
1471 1471 
                                 av_fifo_generic_read(ost->fifo, samples, fifo_bytes, NULL);
1472 
+                                if (enc->codec->capabilities & CODEC_CAP_SMALL_LAST_FRAME) {
1473 
+                                    enc->frame_size = fifo_bytes / (osize * enc->channels);
1474 
+                                } else { /* pad */
1475 
+                                    int frame_bytes = enc->frame_size*osize*enc->channels;
1476 
+                                    if (samples_size < frame_bytes)
1477 
+                                        av_exit(1);
1478 
+                                    memset((uint8_t*)samples+fifo_bytes, 0, frame_bytes - fifo_bytes);
1479 
+                                }
1480 
+
1472 1481 
                                 ret = avcodec_encode_audio(enc, bit_buffer, bit_buffer_size, samples);
1473 1482 
                                 pkt.duration = av_rescale((int64_t)enc->frame_size*ost->st->time_base.den,
1474 1483 
                                                           ost->st->time_base.num, enc->sample_rate);
tests/ffmpeg.regression.ref
History View file @ b10d7e4
... ... 
@@ -170,49 +170,49 @@ stddev:    9.53 PSNR: 28.53 bytes:  7603200/  7603200
170 170 
 14684984 ./tests/data/a-flashsv.flv
171 171 
 012717e7c928641410eaa6abaf126fdc *./tests/data/flashsv.vsynth.out.yuv
172 172 
 stddev:    2.84 PSNR: 39.05 bytes:  7603200/  7603200
173 
-21f8ff9f1daacd9133683bb4ea0f50a4 *./tests/data/a-mp2.mp2
174 
-95712 ./tests/data/a-mp2.mp2
175 
-83f8df5d5f84480566af548bb037fceb *./tests/data/mp2.vsynth.out.wav
176 
-stddev: 9328.41 PSNR: 16.92 bytes:  1055276/  1058444
177 
-stddev: 4394.71 PSNR: 23.46 bytes:  1053352/  1058444
178 
-3bfe347421de458dbfe572b8d4047b46 *./tests/data/a-ac3.rm
179 
-98183 ./tests/data/a-ac3.rm
173 
+28fbc7485c7939f40368f79adccb3e3d *./tests/data/a-mp2.mp2
174 
+96130 ./tests/data/a-mp2.mp2
175 
+c02d5b881c424498457298739f168368 *./tests/data/mp2.vsynth.out.wav
176 
+stddev: 9315.45 PSNR: 16.94 bytes:  1059884/  1058444
177 
+stddev: 4385.18 PSNR: 23.48 bytes:  1057960/  1058444
178 
+081bfd5e683b13cccf1b07c43c1c5005 *./tests/data/a-ac3.rm
179 
+98751 ./tests/data/a-ac3.rm
180 180 
 5d8cce28f83dd33c3c7eaf43a5db5294 *./tests/data/a-g726.wav
181 181 
 24082 ./tests/data/a-g726.wav
182 182 
 4f1ba1af75dee64625a1c852e6cd01d3 *./tests/data/g726.vsynth.out.wav
183 183 
 stddev: 8506.46 PSNR: 17.72 bytes:    96148/  1058444
184 
-3b969c43e45582f713e3c35faee9e0cc *./tests/data/a-adpcm_ima.wav
185 
-266300 ./tests/data/a-adpcm_ima.wav
186 
-947196b1739a9d6fe0c29424cf61cd8c *./tests/data/adpcm_ima_wav.vsynth.out.wav
187 
-stddev:  903.80 PSNR: 37.20 bytes:  1057724/  1058444
188 
-efdae2746040dbc27be402b149556f1e *./tests/data/a-adpcm_qt.aiff
189 
-281184 ./tests/data/a-adpcm_qt.aiff
190 
-5a2084ad27674d5cf3bc2945061e7910 *./tests/data/adpcm_ima_qt.vsynth.out.wav
191 
-stddev:  914.67 PSNR: 37.09 bytes:  1058348/  1058444
192 
-88a0c48c9bc6d50a84c408151c6a3d64 *./tests/data/a-adpcm_ms.wav
193 
-267320 ./tests/data/a-adpcm_ms.wav
194 
-d5f98f5136040be42232a34df92d61f2 *./tests/data/adpcm_ms.vsynth.out.wav
195 
-stddev: 1050.92 PSNR: 35.89 bytes:  1056572/  1058444
196 
-ab11d9151644cbff27827b7e89f37aa9 *./tests/data/a-adpcm_yam.wav
197 
-264248 ./tests/data/a-adpcm_yam.wav
198 
-e92cec8c07913ffb91ad2b11f79cdc00 *./tests/data/adpcm_yam.vsynth.out.wav
199 
-stddev:18312.78 PSNR: 11.06 bytes:  1056812/  1058444
200 
-7187eb46a4987b7ca9beafecffbda55d *./tests/data/a-adpcm_swf.flv
201 
-267097 ./tests/data/a-adpcm_swf.flv
202 
-e48b800e2d9be6afcd430d4f08a34eb6 *./tests/data/adpcm_swf.vsynth.out.wav
203 
-stddev:  934.28 PSNR: 36.91 bytes:  1056812/  1058444
184 
+56b75c3a6dacedcf2ce7b0586aa33594 *./tests/data/a-adpcm_ima.wav
185 
+267324 ./tests/data/a-adpcm_ima.wav
186 
+78a2af1c895792d0c221d127bdd48ece *./tests/data/adpcm_ima_wav.vsynth.out.wav
187 
+stddev:  903.51 PSNR: 37.20 bytes:  1061792/  1058444
188 
+3c06fd2f7831e3e8735b936e23ca220c *./tests/data/a-adpcm_qt.aiff
189 
+281252 ./tests/data/a-adpcm_qt.aiff
190 
+9580492803ba1c1a3746367b24b751c8 *./tests/data/adpcm_ima_qt.vsynth.out.wav
191 
+stddev:  914.63 PSNR: 37.09 bytes:  1058604/  1058444
192 
+9f813f0cc8b2c05821a31828eadf1188 *./tests/data/a-adpcm_ms.wav
193 
+268344 ./tests/data/a-adpcm_ms.wav
194 
+7be370f937c51e8a967e6a3d08d5156a *./tests/data/adpcm_ms.vsynth.out.wav
195 
+stddev: 1050.00 PSNR: 35.90 bytes:  1060620/  1058444
196 
+14df8b8bb7c127ec70c0167df1c0dbf7 *./tests/data/a-adpcm_yam.wav
197 
+266296 ./tests/data/a-adpcm_yam.wav
198 
+2f73107dafef6db42e545f9e466d3f05 *./tests/data/adpcm_yam.vsynth.out.wav
199 
+stddev:18302.45 PSNR: 11.07 bytes:  1065004/  1058444
200 
+c0c2a66f75ea32ef6656ac7cdd08023c *./tests/data/a-adpcm_swf.flv
201 
+269166 ./tests/data/a-adpcm_swf.flv
202 
+628089745a7059ae4055c2515b6d668b *./tests/data/adpcm_swf.vsynth.out.wav
203 
+stddev:  933.65 PSNR: 36.92 bytes:  1065004/  1058444
204 204 
 7781a016edfc242a39e4d65af02d861a *./tests/data/a-flac.flac
205 205 
 353368 ./tests/data/a-flac.flac
206 206 
 95e54b261530a1bcf6de6fe3b21dc5f6 *./tests/data/flac.vsynth.out.wav
207 207 
 stddev:    0.00 PSNR:999.99 bytes:  1058444/  1058444
208 
-4435d87463cd6c5407bd88cca241ca56 *./tests/data/a-wmav1.asf
208 
+26a7f6b0f0b7181df8df3fa589f6bf81 *./tests/data/a-wmav1.asf
209 209 
 106004 ./tests/data/a-wmav1.asf
210 
-stddev:12251.38 PSNR: 14.56 bytes:  1056812/  1058444
211 
-stddev: 2105.96 PSNR: 29.85 bytes:  1048620/  1058444
212 
-24ae726aef89e5d17e315c64182f4c61 *./tests/data/a-wmav2.asf
210 
+stddev:12245.27 PSNR: 14.56 bytes:  1065004/  1058444
211 
+stddev: 2097.78 PSNR: 29.88 bytes:  1056812/  1058444
212 
+7c6c0cb692af01b312ae345723674b5f *./tests/data/a-wmav2.asf
213 213 
 106044 ./tests/data/a-wmav2.asf
214 
-stddev:12255.80 PSNR: 14.55 bytes:  1056812/  1058444
215 
-stddev: 2099.27 PSNR: 29.88 bytes:  1048620/  1058444
214 
+stddev:12249.69 PSNR: 14.56 bytes:  1065004/  1058444
215 
+stddev: 2091.12 PSNR: 29.91 bytes:  1056812/  1058444
216 216 
 89f5b8dd97e0dddbe59af0d44fd229f3 *./tests/data/a-pcm_alaw.wav
217 217 
 529256 ./tests/data/a-pcm_alaw.wav
218 218 
 0568b0b9a72e31559e150e7e09d301cd *./tests/data/pcm.vsynth.out.wav
tests/lavf.regression.ref
History View file @ b10d7e4
... ... 
@@ -1,29 +1,29 @@
1 
-8a0536ccfe36f4fff408b3327d33e1dd *./tests/data/b-lavf.avi
2 
-340344 ./tests/data/b-lavf.avi
3 
-./tests/data/b-lavf.avi CRC=0x400c29e9
4 
-bd9e0012aa39e956605387dd499365fb *./tests/data/b-lavf.asf
1 
+bc5e914594523f7c48f9e044c9a9c0b6 *./tests/data/b-lavf.avi
2 
+340578 ./tests/data/b-lavf.avi
3 
+./tests/data/b-lavf.avi CRC=0xfee88bbc
4 
+11105815213dc09c4b56f91320cfc568 *./tests/data/b-lavf.asf
5 5 
 339775 ./tests/data/b-lavf.asf
6 
-./tests/data/b-lavf.asf CRC=0x74113749
7 
-db5797d4c00c8b15e2e44216389be591 *./tests/data/b-lavf.rm
8 
-355387 ./tests/data/b-lavf.rm
9 
-bdb7484c68db722f66ba1630cf79844c *./tests/data/b-lavf.mpg
6 
+./tests/data/b-lavf.asf CRC=0x9a04991c
7 
+337a4b2fb1d6c808714b555f1139eb89 *./tests/data/b-lavf.rm
8 
+355679 ./tests/data/b-lavf.rm
9 
+bfdec98337e6a9d89dc648d1e65a41db *./tests/data/b-lavf.mpg
10 10 
 378880 ./tests/data/b-lavf.mpg
11 
-./tests/data/b-lavf.mpg CRC=0x2b71a386
11 
+./tests/data/b-lavf.mpg CRC=0xaf760568
12 12 
 259a87c8d22aab76665047ecdbfa9267 *./tests/data/b-lavf.mxf
13 13 
 535097 ./tests/data/b-lavf.mxf
14 14 
 ./tests/data/b-lavf.mxf CRC=0xd7ff387d
15 15 
 0a7cc51de3da754ce36dffeeda290c45 *./tests/data/b-lavf.mxf_d10
16 16 
 5330989 ./tests/data/b-lavf.mxf_d10
17 17 
 ./tests/data/b-lavf.mxf_d10 CRC=0xd241c8b6
18 
-88ed42ab4e1974c902b22ca17dfb3474 *./tests/data/b-lavf.ts
19 
-451764 ./tests/data/b-lavf.ts
20 
-./tests/data/b-lavf.ts CRC=0xcc4948e1
18 
+27ccd081757e4242493ee46e548ef237 *./tests/data/b-lavf.ts
19 
+451952 ./tests/data/b-lavf.ts
20 
+./tests/data/b-lavf.ts CRC=0x538daab4
21 21 
 1b28a16652bb8ac528b33f7478ca18b6 *./tests/data/b-lavf.swf
22 22 
 335771 ./tests/data/b-lavf.swf
23 23 
 ./tests/data/b-lavf.swf CRC=0xe14e8847
24 
-49d04c063b7741d3ee8f85c92baa69bf *./tests/data/b-lavf.ffm
24 
+3bce2db7383ad5588dd150c6d425e73d *./tests/data/b-lavf.ffm
25 25 
 380928 ./tests/data/b-lavf.ffm
26 
-./tests/data/b-lavf.ffm CRC=0x2b71a386
26 
+./tests/data/b-lavf.ffm CRC=0xaf760568
27 27 
 8617c30b4e862199555fd75890473e66 *./tests/data/b-lavf.flv
28 28 
 335833 ./tests/data/b-lavf.flv
29 29 
 ./tests/data/b-lavf.flv CRC=0xe14e8847
... ... 
@@ -36,12 +36,12 @@ feabd6a186403dc3006b7de6015cffea *./tests/data/b-lavf.mov
36 36 
 69d372c4061eda1e87ee63230ba4e38a *./tests/data/b-lavf.gxf
37 37 
 810268 ./tests/data/b-lavf.gxf
38 38 
 ./tests/data/b-lavf.gxf CRC=0x651e9b0f
39 
-66a6584f9e83e8ea3af822a3ba71fbbe *./tests/data/b-lavf.nut
40 
-329264 ./tests/data/b-lavf.nut
41 
-./tests/data/b-lavf.nut CRC=0x400c29e9
42 
-6f4e64d21325f6721cdbddca2626e5df *./tests/data/b-lavf.mkv
43 
-329797 ./tests/data/b-lavf.mkv
44 
-./tests/data/b-lavf.mkv CRC=0x400c29e9
39 
+d4aef795560a5ae94c7a424151603c22 *./tests/data/b-lavf.nut
40 
+329472 ./tests/data/b-lavf.nut
41 
+./tests/data/b-lavf.nut CRC=0xfee88bbc
42 
+218510c167e627824b2df5bd3f73680b *./tests/data/b-lavf.mkv
43 
+330013 ./tests/data/b-lavf.mkv
44 
+./tests/data/b-lavf.mkv CRC=0xfee88bbc
45 45 
 1008f5b7487c76314772e1346e0bd478 *./tests/data/b-pbmpipe.pbm
46 46 
 317075 ./tests/data/b-pbmpipe.pbm
47 47 
 ./tests/data/b-pbmpipe.pbm CRC=0x806e17d8
tests/rotozoom.regression.ref
History View file @ b10d7e4
... ... 
@@ -170,49 +170,49 @@ stddev:    3.23 PSNR: 37.92 bytes:  7603200/  7603200
170 170 
 12368953 ./tests/data/a-flashsv.flv
171 171 
 592b3321994e26a990deb3a0a1415de9 *./tests/data/flashsv.rotozoom.out.yuv
172 172 
 stddev:    0.65 PSNR: 51.83 bytes:  7603200/  7603200
173 
-21f8ff9f1daacd9133683bb4ea0f50a4 *./tests/data/a-mp2.mp2
174 
-95712 ./tests/data/a-mp2.mp2
175 
-83f8df5d5f84480566af548bb037fceb *./tests/data/mp2.rotozoom.out.wav
176 
-stddev: 9328.41 PSNR: 16.92 bytes:  1055276/  1058444
177 
-stddev: 4394.71 PSNR: 23.46 bytes:  1053352/  1058444
178 
-3bfe347421de458dbfe572b8d4047b46 *./tests/data/a-ac3.rm
179 
-98183 ./tests/data/a-ac3.rm
173 
+28fbc7485c7939f40368f79adccb3e3d *./tests/data/a-mp2.mp2
174 
+96130 ./tests/data/a-mp2.mp2
175 
+c02d5b881c424498457298739f168368 *./tests/data/mp2.rotozoom.out.wav
176 
+stddev: 9315.45 PSNR: 16.94 bytes:  1059884/  1058444
177 
+stddev: 4385.18 PSNR: 23.48 bytes:  1057960/  1058444
178 
+081bfd5e683b13cccf1b07c43c1c5005 *./tests/data/a-ac3.rm
179 
+98751 ./tests/data/a-ac3.rm
180 180 
 5d8cce28f83dd33c3c7eaf43a5db5294 *./tests/data/a-g726.wav
181 181 
 24082 ./tests/data/a-g726.wav
182 182 
 4f1ba1af75dee64625a1c852e6cd01d3 *./tests/data/g726.rotozoom.out.wav
183 183 
 stddev: 8506.46 PSNR: 17.72 bytes:    96148/  1058444
184 
-3b969c43e45582f713e3c35faee9e0cc *./tests/data/a-adpcm_ima.wav
185 
-266300 ./tests/data/a-adpcm_ima.wav
186 
-947196b1739a9d6fe0c29424cf61cd8c *./tests/data/adpcm_ima_wav.rotozoom.out.wav
187 
-stddev:  903.80 PSNR: 37.20 bytes:  1057724/  1058444
188 
-efdae2746040dbc27be402b149556f1e *./tests/data/a-adpcm_qt.aiff
189 
-281184 ./tests/data/a-adpcm_qt.aiff
190 
-5a2084ad27674d5cf3bc2945061e7910 *./tests/data/adpcm_ima_qt.rotozoom.out.wav
191 
-stddev:  914.67 PSNR: 37.09 bytes:  1058348/  1058444
192 
-88a0c48c9bc6d50a84c408151c6a3d64 *./tests/data/a-adpcm_ms.wav
193 
-267320 ./tests/data/a-adpcm_ms.wav
194 
-d5f98f5136040be42232a34df92d61f2 *./tests/data/adpcm_ms.rotozoom.out.wav
195 
-stddev: 1050.92 PSNR: 35.89 bytes:  1056572/  1058444
196 
-ab11d9151644cbff27827b7e89f37aa9 *./tests/data/a-adpcm_yam.wav
197 
-264248 ./tests/data/a-adpcm_yam.wav
198 
-e92cec8c07913ffb91ad2b11f79cdc00 *./tests/data/adpcm_yam.rotozoom.out.wav
199 
-stddev:18312.78 PSNR: 11.06 bytes:  1056812/  1058444
200 
-7187eb46a4987b7ca9beafecffbda55d *./tests/data/a-adpcm_swf.flv
201 
-267097 ./tests/data/a-adpcm_swf.flv
202 
-e48b800e2d9be6afcd430d4f08a34eb6 *./tests/data/adpcm_swf.rotozoom.out.wav
203 
-stddev:  934.28 PSNR: 36.91 bytes:  1056812/  1058444
184 
+56b75c3a6dacedcf2ce7b0586aa33594 *./tests/data/a-adpcm_ima.wav
185 
+267324 ./tests/data/a-adpcm_ima.wav
186 
+78a2af1c895792d0c221d127bdd48ece *./tests/data/adpcm_ima_wav.rotozoom.out.wav
187 
+stddev:  903.51 PSNR: 37.20 bytes:  1061792/  1058444
188 
+3c06fd2f7831e3e8735b936e23ca220c *./tests/data/a-adpcm_qt.aiff
189 
+281252 ./tests/data/a-adpcm_qt.aiff
190 
+9580492803ba1c1a3746367b24b751c8 *./tests/data/adpcm_ima_qt.rotozoom.out.wav
191 
+stddev:  914.63 PSNR: 37.09 bytes:  1058604/  1058444
192 
+9f813f0cc8b2c05821a31828eadf1188 *./tests/data/a-adpcm_ms.wav
193 
+268344 ./tests/data/a-adpcm_ms.wav
194 
+7be370f937c51e8a967e6a3d08d5156a *./tests/data/adpcm_ms.rotozoom.out.wav
195 
+stddev: 1050.00 PSNR: 35.90 bytes:  1060620/  1058444
196 
+14df8b8bb7c127ec70c0167df1c0dbf7 *./tests/data/a-adpcm_yam.wav
197 
+266296 ./tests/data/a-adpcm_yam.wav
198 
+2f73107dafef6db42e545f9e466d3f05 *./tests/data/adpcm_yam.rotozoom.out.wav
199 
+stddev:18302.45 PSNR: 11.07 bytes:  1065004/  1058444
200 
+c0c2a66f75ea32ef6656ac7cdd08023c *./tests/data/a-adpcm_swf.flv
201 
+269166 ./tests/data/a-adpcm_swf.flv
202 
+628089745a7059ae4055c2515b6d668b *./tests/data/adpcm_swf.rotozoom.out.wav
203 
+stddev:  933.65 PSNR: 36.92 bytes:  1065004/  1058444
204 204 
 7781a016edfc242a39e4d65af02d861a *./tests/data/a-flac.flac
205 205 
 353368 ./tests/data/a-flac.flac
206 206 
 95e54b261530a1bcf6de6fe3b21dc5f6 *./tests/data/flac.rotozoom.out.wav
207 207 
 stddev:    0.00 PSNR:999.99 bytes:  1058444/  1058444
208 
-4435d87463cd6c5407bd88cca241ca56 *./tests/data/a-wmav1.asf
208 
+26a7f6b0f0b7181df8df3fa589f6bf81 *./tests/data/a-wmav1.asf
209 209 
 106004 ./tests/data/a-wmav1.asf
210 
-stddev:12251.38 PSNR: 14.56 bytes:  1056812/  1058444
211 
-stddev: 2105.96 PSNR: 29.85 bytes:  1048620/  1058444
212 
-24ae726aef89e5d17e315c64182f4c61 *./tests/data/a-wmav2.asf
210 
+stddev:12245.27 PSNR: 14.56 bytes:  1065004/  1058444
211 
+stddev: 2097.78 PSNR: 29.88 bytes:  1056812/  1058444
212 
+7c6c0cb692af01b312ae345723674b5f *./tests/data/a-wmav2.asf
213 213 
 106044 ./tests/data/a-wmav2.asf
214 
-stddev:12255.80 PSNR: 14.55 bytes:  1056812/  1058444
215 
-stddev: 2099.27 PSNR: 29.88 bytes:  1048620/  1058444
214 
+stddev:12249.69 PSNR: 14.56 bytes:  1065004/  1058444
215 
+stddev: 2091.12 PSNR: 29.91 bytes:  1056812/  1058444
216 216 
 89f5b8dd97e0dddbe59af0d44fd229f3 *./tests/data/a-pcm_alaw.wav
217 217 
 529256 ./tests/data/a-pcm_alaw.wav
218 218 
 0568b0b9a72e31559e150e7e09d301cd *./tests/data/pcm.rotozoom.out.wav
tests/seek.regression.ref
History View file @ b10d7e4
... ... 
@@ -2747,7 +2747,7 @@ ret: 0 st: 0 dts:0.960000 pts:0.960000 pos:310948 size:27927 flags:1
2747 2747 
 ret:-1 st: 0 ts:-0.320000 flags:1
2748 2748 
 ret:-1 st: 1 ts:2.586122 flags:0
2749 2749 
 ret: 0 st: 1 ts:1.462857 flags:1
2750 
-ret: 0 st: 1 dts:0.992653 pts:0.992653 pos:339102 size:209 flags:1
2750 
+ret: 0 st: 1 dts:1.018776 pts:1.018776 pos:339320 size:209 flags:1
2751 2751 
 ret: 0 st:-1 ts:0.365002 flags:0
2752 2752 
 ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:158912 size:27442 flags:1
2753 2753 
 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
2757 2757 
 ret: 0 st: 1 ts:-0.052245 flags:0
2758 2758 
 ret: 0 st: 1 dts:0.000000 pts:0.000000 pos:38034 size:208 flags:1
2759 2759 
 ret: 0 st: 1 ts:2.847347 flags:1
2760 
-ret: 0 st: 1 dts:0.992653 pts:0.992653 pos:339102 size:209 flags:1
2760 
+ret: 0 st: 1 dts:1.018776 pts:1.018776 pos:339320 size:209 flags:1
2761 2761 
 ret:-1 st:-1 ts:1.730004 flags:0
2762 2762 
 ret: 0 st:-1 ts:0.624171 flags:1
2763 2763 
 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
2777 2777 
 ret:-1 st: 0 ts:-0.240000 flags:1
2778 2778 
 ret:-1 st: 1 ts:2.664490 flags:0
2779 2779 
 ret: 0 st: 1 ts:1.567347 flags:1
2780 
-ret: 0 st: 1 dts:0.992653 pts:0.992653 pos:339102 size:209 flags:1
2780 
+ret: 0 st: 1 dts:1.018776 pts:1.018776 pos:339320 size:209 flags:1
2781 2781 
 ret: 0 st:-1 ts:0.460008 flags:0
2782 2782 
 ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:158912 size:27442 flags:1
2783 2783 
 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
3035 3035 
 ret: 0 st: 1 ts:2.577000 flags:0
3036 3036 
 ret:-32
3037 3037 
 ret: 0 st: 1 ts:1.471000 flags:1
3038 
-ret: 0 st: 1 dts:0.993000 pts:0.993000 pos:329501 size:209 flags:1
3038 
+ret: 0 st: 1 dts:1.019000 pts:1.019000 pos:329717 size:209 flags:1
3039 3039 
 ret: 0 st:-1 ts:0.365002 flags:0
3040 3040 
 ret: 0 st: 0 dts:0.400000 pts:0.400000 pos:128828 size:9787 flags:0
3041 3041 
 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
3047 3047 
 ret: 0 st: 1 ts:-0.058000 flags:0
3048 3048 
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:505 size:28088 flags:1
3049 3049 
 ret: 0 st: 1 ts:2.836000 flags:1
3050 
-ret: 0 st: 1 dts:0.993000 pts:0.993000 pos:329501 size:209 flags:1
3050 
+ret: 0 st: 1 dts:1.019000 pts:1.019000 pos:329717 size:209 flags:1
3051 3051 
 ret: 0 st:-1 ts:1.730004 flags:0
3052 3052 
 ret:-32
3053 3053 
 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
3071 3071 
 ret: 0 st: 1 ts:2.672000 flags:0
3072 3072 
 ret:-32
3073 3073 
 ret: 0 st: 1 ts:1.566000 flags:1
3074 
-ret: 0 st: 1 dts:0.993000 pts:0.993000 pos:329501 size:209 flags:1
3074 
+ret: 0 st: 1 dts:1.019000 pts:1.019000 pos:329717 size:209 flags:1
3075 3075 
 ret: 0 st:-1 ts:0.460008 flags:0
3076 3076 
 ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:149425 size:27412 flags:1
3077 3077 
 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
3167 3167 
 ret: 0 st: 0 ts:-0.317500 flags:1
3168 3168 
 ret: 0 st: 1 dts:0.500000 pts:0.500000 pos:-1 size:208 flags:1
3169 3169 
 ret: 0 st: 1 ts:2.576667 flags:0
3170 
-ret: 0 st: 1 dts:1.283678 pts:1.283678 pos:-1 size:209 flags:1
3170 
+ret: 0 st: 1 dts:1.518778 pts:1.518778 pos:-1 size:209 flags:1
3171 3171 
 ret: 0 st: 1 ts:1.470833 flags:1
3172 3172 
 ret: 0 st: 1 dts:1.283678 pts:1.283678 pos:-1 size:209 flags:1
3173 3173 
 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
3181 3181 
 ret: 0 st: 1 ts:-0.058333 flags:0
3182 3182 
 ret: 0 st: 1 dts:0.500000 pts:0.500000 pos:-1 size:208 flags:1
3183 3183 
 ret: 0 st: 1 ts:2.835833 flags:1
3184 
-ret: 0 st: 1 dts:1.283678 pts:1.283678 pos:-1 size:209 flags:1
3184 
+ret: 0 st: 1 dts:1.518778 pts:1.518778 pos:-1 size:209 flags:1
3185 3185 
 ret: 0 st:-1 ts:1.730004 flags:0
3186 3186 
 ret: 0 st: 1 dts:1.022444 pts:1.022444 pos:-1 size:209 flags:1
3187 3187 
 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
3191 3191 
 ret: 0 st: 0 ts:2.412500 flags:1
3192 3192 
 ret: 0 st: 1 dts:1.022444 pts:1.022444 pos:-1 size:209 flags:1
3193 3193 
 ret: 0 st: 1 ts:1.306667 flags:0
3194 
-ret: 0 st: 1 dts:1.283678 pts:1.283678 pos:-1 size:209 flags:1
3194 
+ret: 0 st: 1 dts:1.518778 pts:1.518778 pos:-1 size:209 flags:1
3195 3195 
 ret: 0 st: 1 ts:0.200844 flags:1
3196 3196 
 ret: 0 st: 1 dts:0.500000 pts:0.500000 pos:-1 size:208 flags:1
3197 3197 
 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
3203 3203 
 ret: 0 st: 0 ts:-0.222489 flags:1
3204 3204 
 ret: 0 st: 1 dts:0.500000 pts:0.500000 pos:-1 size:208 flags:1
3205 3205 
 ret: 0 st: 1 ts:2.671678 flags:0
3206 
-ret: 0 st: 1 dts:1.283678 pts:1.283678 pos:-1 size:209 flags:1
3206 
+ret: 0 st: 1 dts:1.518778 pts:1.518778 pos:-1 size:209 flags:1
3207 3207 
 ret: 0 st: 1 ts:1.565844 flags:1
3208 
-ret: 0 st: 1 dts:1.283678 pts:1.283678 pos:-1 size:209 flags:1
3208 
+ret: 0 st: 1 dts:1.518778 pts:1.518778 pos:-1 size:209 flags:1
3209 3209 
 ret: 0 st:-1 ts:0.460008 flags:0
3210 3210 
 ret: 0 st: 0 dts:0.500000 pts:0.540000 pos:-1 size:16335 flags:0
3211 3211 
 ret: 0 st:-1 ts:-0.645825 flags:1
... ... 
@@ -3528,10 +3528,8 @@ ret: 0 st: 0 ts:0.788000 flags:0
3528 3528 
 ret: 0 st: 0 dts:0.960000 pts:0.960000 pos:323974 size:31124 flags:1
3529 3529 
 ret: 0 st: 0 ts:-0.317000 flags:1
3530 3530 
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:398 size:31393 flags:1
3531 
-ret: 0 st: 1 ts:2.577000 flags:0
3532 
-ret: 0 st: 1 dts:0.975000 pts:0.975000 pos:355101 size:278 flags:1
3533 
-ret: 0 st: 1 ts:1.471000 flags:1
3534 
-ret: 0 st: 1 dts:0.975000 pts:0.975000 pos:355101 size:278 flags:1
3531 
+ret:-1 st: 1 ts:2.577000 flags:0
3532 
+ret:-1 st: 1 ts:1.471000 flags:1
3535 3533 
 ret: 0 st:-1 ts:0.365002 flags:0
3536 3534 
 ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:160930 size:30549 flags:1
3537 3535 
 ret: 0 st:-1 ts:-0.740831 flags:1
... ... 
@@ -3542,8 +3540,7 @@ ret: 0 st: 0 ts:1.048000 flags:1
3542 3542 
 ret: 0 st: 0 dts:0.960000 pts:0.960000 pos:323974 size:31124 flags:1
3543 3543 
 ret: 0 st: 1 ts:-0.058000 flags:0
3544 3544 
 ret: 0 st: 1 dts:0.000000 pts:0.000000 pos:31794 size:278 flags:1
3545 
-ret: 0 st: 1 ts:2.836000 flags:1
3546 
-ret: 0 st: 1 dts:0.975000 pts:0.975000 pos:355101 size:278 flags:1
3545 
+ret:-1 st: 1 ts:2.836000 flags:1
3547 3546 
 ret: 0 st:-1 ts:1.730004 flags:0
3548 3547 
 ret: 0 st: 0 dts:0.960000 pts:0.960000 pos:323974 size:31124 flags:1
3549 3548 
 ret: 0 st:-1 ts:0.624171 flags:1
... ... 
@@ -3552,8 +3549,7 @@ ret: 0 st: 0 ts:-0.482000 flags:0
3552 3552 
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:398 size:31393 flags:1
3553 3553 
 ret: 0 st: 0 ts:2.413000 flags:1
3554 3554 
 ret: 0 st: 0 dts:0.960000 pts:0.960000 pos:323974 size:31124 flags:1
3555 
-ret: 0 st: 1 ts:1.307000 flags:0
3556 
-ret: 0 st: 1 dts:0.975000 pts:0.975000 pos:355101 size:278 flags:1
3555 
+ret:-1 st: 1 ts:1.307000 flags:0
3557 3556 
 ret: 0 st: 1 ts:0.201000 flags:1
3558 3557 
 ret: 0 st: 1 dts:0.174000 pts:0.174000 pos:79106 size:278 flags:1
3559 3558 
 ret: 0 st:-1 ts:-0.904994 flags:0
... ... 
@@ -3564,10 +3560,8 @@ ret: 0 st: 0 ts:0.883000 flags:0
3564 3564 
 ret: 0 st: 0 dts:0.960000 pts:0.960000 pos:323974 size:31124 flags:1
3565 3565 
 ret: 0 st: 0 ts:-0.222000 flags:1
3566 3566 
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:398 size:31393 flags:1
3567 
-ret: 0 st: 1 ts:2.672000 flags:0
3568 
-ret: 0 st: 1 dts:0.975000 pts:0.975000 pos:355101 size:278 flags:1
3569 
-ret: 0 st: 1 ts:1.566000 flags:1
3570 
-ret: 0 st: 1 dts:0.975000 pts:0.975000 pos:355101 size:278 flags:1
3567 
+ret:-1 st: 1 ts:2.672000 flags:0
3568 
+ret:-1 st: 1 ts:1.566000 flags:1
3571 3569 
 ret: 0 st:-1 ts:0.460008 flags:0
3572 3570 
 ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:160930 size:30549 flags:1
3573 3571 
 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
3609 3609 
 ret: 0 st:-1 ts:1.894167 flags:1
3610 3610 
 ret: 0 st: 0 dts:1.881344 pts:-102481911520608.625000 pos:29704 size:852 flags:1
3611 3611 
 ret: 0 st: 0 ts:0.788333 flags:0
3612 
-ret: 0 st: 0 dts:0.803344 pts:-102481911520608.625000 pos:66176 size:16769 flags:0
3612 
+ret: 0 st: 0 dts:0.700000 pts:0.740000 pos:29704 size:16769 flags:0
3613 3613 
 ret: 0 st: 0 ts:-0.317500 flags:1
3614 3614 
 ret: 0 st: 0 dts:0.027844 pts:-102481911520608.625000 pos:48880 size:22036 flags:1
3615 3615 
 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:
3635 3635 
 ret: 0 st: 0 ts:-0.481667 flags:0
3636 3636 
 ret: 0 st: 0 dts:0.044344 pts:-102481911520608.625000 pos:29704 size:22036 flags:1
3637 3637 
 ret: 0 st: 0 ts:2.412500 flags:1
3638 
-ret: 0 st: 0 dts:2.403844 pts:-102481911520608.625000 pos:-1 size:13937 flags:0
3638 
+ret: 0 st: 0 dts:0.820000 pts:0.860000 pos:82720 size:13937 flags:0
3639 3639 
 ret: 0 st: 1 ts:1.306667 flags:0
3640 3640 
 ret: 0 st: 0 dts:1.309344 pts:-102481911520608.625000 pos:99264 size:1456 flags:1
3641 3641 
 ret: 0 st: 1 ts:0.200844 flags:1