-threads X no longer has any effect since all threading code is now gone
without an actual threading library.
I think this is a nice minor size optimization, but if it's necessary to keep
regression tests working with frame-threaded encoding I'll have to revisit it.
---
libavcodec/mpegvideo_enc.c | 24 ++++----
tests/ffmpeg.regression.ref | 32 +++++-----
tests/rotozoom.regression.ref | 26 ++++----
tests/seek.regression.ref | 124 ++++++++++++++++++++--------------------
4 files changed, 104 insertions(+), 102 deletions(-)
diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c
index 0e8e6d8..582610f 100644
--- a/libavcodec/mpegvideo_enc.c
+++ b/libavcodec/mpegvideo_enc.c
@@ -35,6 +35,7 @@
#include "msmpeg4.h"
#include "h263.h"
#include "faandct.h"
+#include "thread.h"
#include <limits.h>
//#undef NDEBUG
@@ -1212,9 +1213,9 @@ int MPV_encode_picture(AVCodecContext *avctx,
{
MpegEncContext *s = avctx->priv_data;
AVFrame *pic_arg = data;
- int i, stuffing_count;
+ int i, stuffing_count, context_count = USE_AVCODEC_EXECUTE(avctx) ? avctx->thread_count : 1;
- for(i=0; i<avctx->thread_count; i++){
+ for(i=0; i<context_count; i++){
int start_y= s->thread_context[i]->start_mb_y;
int end_y= s->thread_context[i]-> end_mb_y;
int h= s->mb_height;
@@ -1277,7 +1278,7 @@ vbv_retry:
s->last_non_b_time= s->time - s->pp_time;
}
// av_log(NULL, AV_LOG_ERROR, "R:%d ", s->next_lambda);
- for(i=0; i<avctx->thread_count; i++){
+ for(i=0; i<context_count; i++){
PutBitContext *pb= &s->thread_context[i]->pb;
init_put_bits(pb, pb->buf, pb->buf_end - pb->buf);
}
@@ -2731,6 +2732,7 @@ static int encode_picture(MpegEncContext *s, int picture_number)
{
int i;
int bits;
+ int context_count = USE_AVCODEC_EXECUTE(s->avctx) ? s->avctx->thread_count : 1;
s->picture_number = picture_number;
@@ -2770,7 +2772,7 @@ static int encode_picture(MpegEncContext *s, int picture_number)
}
s->mb_intra=0; //for the rate distortion & bit compare functions
- for(i=1; i<s->avctx->thread_count; i++){
+ for(i=1; i<context_count; i++){
ff_update_duplicate_context(s->thread_context[i], s);
}
@@ -2782,11 +2784,11 @@ static int encode_picture(MpegEncContext *s, int picture_number)
s->lambda2= (s->lambda2* (int64_t)s->avctx->me_penalty_compensation + 128)>>8;
if(s->pict_type != FF_B_TYPE && s->avctx->me_threshold==0){
if((s->avctx->pre_me && s->last_non_b_pict_type==FF_I_TYPE) || s->avctx->pre_me==2){
- s->avctx->execute(s->avctx, pre_estimate_motion_thread, (void**)&(s->thread_context[0]), NULL, s->avctx->thread_count);
+ s->avctx->execute(s->avctx, pre_estimate_motion_thread, (void**)&(s->thread_context[0]), NULL, context_count);
}
}
- s->avctx->execute(s->avctx, estimate_motion_thread, (void**)&(s->thread_context[0]), NULL, s->avctx->thread_count);
+ s->avctx->execute(s->avctx, estimate_motion_thread, (void**)&(s->thread_context[0]), NULL, context_count);
}else /* if(s->pict_type == FF_I_TYPE) */{
/* I-Frame */
for(i=0; i<s->mb_stride*s->mb_height; i++)
@@ -2794,10 +2796,10 @@ static int encode_picture(MpegEncContext *s, int picture_number)
if(!s->fixed_qscale){
/* finding spatial complexity for I-frame rate control */
- s->avctx->execute(s->avctx, mb_var_thread, (void**)&(s->thread_context[0]), NULL, s->avctx->thread_count);
+ s->avctx->execute(s->avctx, mb_var_thread, (void**)&(s->thread_context[0]), NULL, context_count);
}
}
- for(i=1; i<s->avctx->thread_count; i++){
+ for(i=1; i<context_count; i++){
merge_context_after_me(s, s->thread_context[i]);
}
s->current_picture.mc_mb_var_sum= s->current_picture_ptr->mc_mb_var_sum= s->me.mc_mb_var_sum_temp;
@@ -2931,11 +2933,11 @@ static int encode_picture(MpegEncContext *s, int picture_number)
bits= put_bits_count(&s->pb);
s->header_bits= bits - s->last_bits;
- for(i=1; i<s->avctx->thread_count; i++){
+ for(i=1; i<context_count; i++){
update_duplicate_context_after_me(s->thread_context[i], s);
}
- s->avctx->execute(s->avctx, encode_thread, (void**)&(s->thread_context[0]), NULL, s->avctx->thread_count);
- for(i=1; i<s->avctx->thread_count; i++){
+ s->avctx->execute(s->avctx, encode_thread, (void**)&(s->thread_context[0]), NULL, context_count);
+ for(i=1; i<context_count; i++){
merge_context_after_encode(s, s->thread_context[i]);
}
emms_c();
diff --git a/tests/ffmpeg.regression.ref b/tests/ffmpeg.regression.ref
index 75f51af..d78e66a 100644
--- a/tests/ffmpeg.regression.ref
+++ b/tests/ffmpeg.regression.ref
@@ -18,18 +18,18 @@ stddev: 7.67 PSNR:30.42 bytes:7602176
749746 ./tests/data/a-mpeg2i.mpg
5189af71e6aa96cc2f6452e7f6b29287 *./tests/data/mpeg2.vsynth.out.yuv
stddev: 7.68 PSNR:30.41 bytes:7602176
-69576facff13d45171e3a6c53b8018c4 *./tests/data/a-mpeg2thread.mpg
-813459 ./tests/data/a-mpeg2thread.mpg
-c0e8cbde76ff8377494fe6843fd03e11 *./tests/data/mpeg2thread.vsynth.out.yuv
-stddev: 7.63 PSNR:30.47 bytes:7602176
-17af99d1a7fc391242a809b0782263af *./tests/data/a-mpeg2threadivlc.mpg
-803833 ./tests/data/a-mpeg2threadivlc.mpg
-c0e8cbde76ff8377494fe6843fd03e11 *./tests/data/mpeg2thread.vsynth.out.yuv
-stddev: 7.63 PSNR:30.47 bytes:7602176
-c8d8b07b5fa97e0affb4a52d4d30a2b6 *./tests/data/a-mpeg2reuse.mpg
-2102956 ./tests/data/a-mpeg2reuse.mpg
-75d3dfc8133f0122cb9e272a21bc8c5c *./tests/data/mpeg2thread.vsynth.out.yuv
-stddev: 7.67 PSNR:30.42 bytes:7602176
+b67bc9019f07a509c8b807ab4b34040d *./tests/data/a-mpeg2thread.mpg
+799496 ./tests/data/a-mpeg2thread.mpg
+7707e57c5426b2f2487a05d17b1152b4 *./tests/data/mpeg2thread.vsynth.out.yuv
+stddev: 7.62 PSNR:30.48 bytes:7602176
+7fd9449feae24e47aa4adffa712dd929 *./tests/data/a-mpeg2threadivlc.mpg
+789913 ./tests/data/a-mpeg2threadivlc.mpg
+7707e57c5426b2f2487a05d17b1152b4 *./tests/data/mpeg2thread.vsynth.out.yuv
+stddev: 7.62 PSNR:30.48 bytes:7602176
+78744b909e20259a0de6bca602ebb30d *./tests/data/a-mpeg2reuse.mpg
+2063271 ./tests/data/a-mpeg2reuse.mpg
+a5b049d246cbb5f33d865c3ef580dae0 *./tests/data/mpeg2thread.vsynth.out.yuv
+stddev: 7.66 PSNR:30.44 bytes:7602176
c83ae8d8f3e2b4506df58e6a2f7e3b2a *./tests/data/a-msmpeg4v2.avi
636512 ./tests/data/a-msmpeg4v2.avi
279c33c2f6f58b7eb3d2daaa87160cb5 *./tests/data/msmpeg4v2.vsynth.out.yuv
@@ -86,10 +86,10 @@ stddev: 14.15 PSNR:25.10 bytes:7602176
878264 ./tests/data/a-mpeg4-Q.avi
8995abbcc97ed4767fcbc0bf46accd01 *./tests/data/mpeg4adv.vsynth.out.yuv
stddev: 5.61 PSNR:33.13 bytes:7602176
-6271c9f3b8a6ec3a78315699952d9a99 *./tests/data/a-mpeg4-thread.avi
-778604 ./tests/data/a-mpeg4-thread.avi
-152d46da2a9d7fa3c22c56767c1760db *./tests/data/mpeg4thread.vsynth.out.yuv
-stddev: 10.26 PSNR:27.89 bytes:7602176
+6ffaed0d76b653d7e220976df75f1e79 *./tests/data/a-mpeg4-thread.avi
+761392 ./tests/data/a-mpeg4-thread.avi
+2ea66144afc869c2cd52ca93c00a59e5 *./tests/data/mpeg4thread.vsynth.out.yuv
+stddev: 10.21 PSNR:27.94 bytes:7602176
7315281e07830456208dff61337c982b *./tests/data/a-error-mpeg4-adv.avi
731526 ./tests/data/a-error-mpeg4-adv.avi
6ce2c82a0a9cf67a6991694473e9a306 *./tests/data/error.vsynth.out.yuv
diff --git a/tests/rotozoom.regression.ref b/tests/rotozoom.regression.ref
index 054145a..ce29aff 100644
--- a/tests/rotozoom.regression.ref
+++ b/tests/rotozoom.regression.ref
@@ -18,17 +18,17 @@ f90197a8b6e62ae25f82625337f27240 *./tests/data/a-mpeg2i.mpg
204579 ./tests/data/a-mpeg2i.mpg
ea5057b60146c06d40449cdfc686bf13 *./tests/data/mpeg2.rotozoom.out.yuv
stddev: 4.98 PSNR:34.17 bytes:7602176
-c346717be44450e41d9d6e07f59d1490 *./tests/data/a-mpeg2thread.mpg
-182959 ./tests/data/a-mpeg2thread.mpg
-02b85a7f67ced2d146a5c4e8000712b6 *./tests/data/mpeg2thread.rotozoom.out.yuv
+dd1b9ac95ebaa9b8d1d5315effb8e1d0 *./tests/data/a-mpeg2thread.mpg
+182845 ./tests/data/a-mpeg2thread.mpg
+cf5618ee9c2c92a0df34bdce67ef1038 *./tests/data/mpeg2thread.rotozoom.out.yuv
stddev: 4.75 PSNR:34.57 bytes:7602176
-ff30b3df75626398873ac4f30093a5ae *./tests/data/a-mpeg2threadivlc.mpg
-182105 ./tests/data/a-mpeg2threadivlc.mpg
-02b85a7f67ced2d146a5c4e8000712b6 *./tests/data/mpeg2thread.rotozoom.out.yuv
+20e5b688fe57c6fb8a12928d27334ef1 *./tests/data/a-mpeg2threadivlc.mpg
+181993 ./tests/data/a-mpeg2threadivlc.mpg
+cf5618ee9c2c92a0df34bdce67ef1038 *./tests/data/mpeg2thread.rotozoom.out.yuv
stddev: 4.75 PSNR:34.57 bytes:7602176
-3942f86a6aa6fe5aea586fedf210e33e *./tests/data/a-mpeg2reuse.mpg
-394265 ./tests/data/a-mpeg2reuse.mpg
-afbc483eaa769925259e6094cfda2c72 *./tests/data/mpeg2thread.rotozoom.out.yuv
+099754b9796b74be7a563c2d88f372ef *./tests/data/a-mpeg2reuse.mpg
+394013 ./tests/data/a-mpeg2reuse.mpg
+21c77dba8042142b202ece1aaa87dcbb *./tests/data/mpeg2thread.rotozoom.out.yuv
stddev: 4.76 PSNR:34.56 bytes:7602176
c09815e40a9d260628e1ebad8b2b3774 *./tests/data/a-msmpeg4v2.avi
129918 ./tests/data/a-msmpeg4v2.avi
@@ -86,10 +86,10 @@ a5150067914ee1dee50f8fc8dcaee841 *./tests/data/a-mpeg4-Q.avi
165802 ./tests/data/a-mpeg4-Q.avi
4dcc71ad79bee90777cf5299044be362 *./tests/data/mpeg4adv.rotozoom.out.yuv
stddev: 4.00 PSNR:36.08 bytes:7602176
-8496ffe953dc3398c657d99e962e4d77 *./tests/data/a-mpeg4-thread.avi
-250162 ./tests/data/a-mpeg4-thread.avi
-58165c879707aedeab460bab86dae4ef *./tests/data/mpeg4thread.rotozoom.out.yuv
-stddev: 3.73 PSNR:36.67 bytes:7602176
+916e777aef95b679139319160831eb26 *./tests/data/a-mpeg4-thread.avi
+250110 ./tests/data/a-mpeg4-thread.avi
+e7c3e08387abb1d7b3de752c0ed62aba *./tests/data/mpeg4thread.rotozoom.out.yuv
+stddev: 3.73 PSNR:36.68 bytes:7602176
90e65096aa9ebafa3fe3f44a5a47cdc4 *./tests/data/a-error-mpeg4-adv.avi
176588 ./tests/data/a-error-mpeg4-adv.avi
113defd3f8daf878e0b3fc03fafb4c09 *./tests/data/error.rotozoom.out.yuv
diff --git a/tests/seek.regression.ref b/tests/seek.regression.ref
index 749c559..c3842e9 100644
--- a/tests/seek.regression.ref
+++ b/tests/seek.regression.ref
@@ -1429,47 +1429,47 @@ ret: 0 st: 0 dts:0.000000 pts:-102481911520608.625000 pos:20480 size:20829 flags
ret: 0 st:-1 ts:-1.000000 flags:0
ret: 0 st: 0 dts:0.000000 pts:-102481911520608.625000 pos:20480 size:20829 flags:1
ret: 0 st:-1 ts:1.894167 flags:1
-ret: 0 st: 0 dts:1.840000 pts:-102481911520608.625000 pos:373661 size:26840 flags:1
+ret: 0 st: 0 dts:1.840000 pts:-102481911520608.625000 pos:373450 size:26840 flags:1
ret: 0 st: 0 ts:0.788333 flags:0
-ret: 0 st: 0 dts:0.880000 pts:-102481911520608.625000 pos:167721 size:23537 flags:1
+ret: 0 st: 0 dts:0.880000 pts:-102481911520608.625000 pos:167648 size:23537 flags:1
ret:-1 st: 0 ts:-0.317500 flags:1
ret:-1 st:-1 ts:2.576668 flags:0
ret: 0 st:-1 ts:1.470835 flags:1
-ret: 0 st: 0 dts:1.360000 pts:-102481911520608.625000 pos:264461 size:26192 flags:1
+ret: 0 st: 0 dts:1.360000 pts:-102481911520608.625000 pos:264180 size:26192 flags:1
ret: 0 st: 0 ts:0.365000 flags:0
-ret: 0 st: 0 dts:0.400000 pts:-102481911520608.625000 pos:85877 size:21295 flags:1
+ret: 0 st: 0 dts:0.400000 pts:-102481911520608.625000 pos:85859 size:21295 flags:1
ret:-1 st: 0 ts:-0.740833 flags:1
ret:-1 st:-1 ts:2.153336 flags:0
ret: 0 st:-1 ts:1.047503 flags:1
-ret: 0 st: 0 dts:0.880000 pts:-102481911520608.625000 pos:167721 size:23537 flags:1
+ret: 0 st: 0 dts:0.880000 pts:-102481911520608.625000 pos:167648 size:23537 flags:1
ret: 0 st: 0 ts:-0.058333 flags:0
ret: 0 st: 0 dts:0.000000 pts:-102481911520608.625000 pos:20480 size:20829 flags:1
ret: 0 st: 0 ts:2.835833 flags:1
-ret: 0 st: 0 dts:1.840000 pts:-102481911520608.625000 pos:373661 size:26840 flags:1
+ret: 0 st: 0 dts:1.840000 pts:-102481911520608.625000 pos:373450 size:26840 flags:1
ret: 0 st:-1 ts:1.730004 flags:0
-ret: 0 st: 0 dts:1.840000 pts:-102481911520608.625000 pos:373661 size:26840 flags:1
+ret: 0 st: 0 dts:1.840000 pts:-102481911520608.625000 pos:373450 size:26840 flags:1
ret: 0 st:-1 ts:0.624171 flags:1
-ret: 0 st: 0 dts:0.400000 pts:-102481911520608.625000 pos:85877 size:21295 flags:1
+ret: 0 st: 0 dts:0.400000 pts:-102481911520608.625000 pos:85859 size:21295 flags:1
ret: 0 st: 0 ts:-0.481667 flags:0
ret: 0 st: 0 dts:0.000000 pts:-102481911520608.625000 pos:20480 size:20829 flags:1
ret: 0 st: 0 ts:2.412500 flags:1
-ret: 0 st: 0 dts:1.840000 pts:-102481911520608.625000 pos:373661 size:26840 flags:1
+ret: 0 st: 0 dts:1.840000 pts:-102481911520608.625000 pos:373450 size:26840 flags:1
ret: 0 st:-1 ts:1.306672 flags:0
-ret: 0 st: 0 dts:1.360000 pts:-102481911520608.625000 pos:264461 size:26192 flags:1
+ret: 0 st: 0 dts:1.360000 pts:-102481911520608.625000 pos:264180 size:26192 flags:1
ret: 0 st:-1 ts:0.200839 flags:1
ret: 0 st: 0 dts:0.000000 pts:-102481911520608.625000 pos:20480 size:20829 flags:1
ret: 0 st: 0 ts:-0.904989 flags:0
ret: 0 st: 0 dts:0.000000 pts:-102481911520608.625000 pos:20480 size:20829 flags:1
ret: 0 st: 0 ts:1.989178 flags:1
-ret: 0 st: 0 dts:1.840000 pts:-102481911520608.625000 pos:373661 size:26840 flags:1
+ret: 0 st: 0 dts:1.840000 pts:-102481911520608.625000 pos:373450 size:26840 flags:1
ret: 0 st:-1 ts:0.883340 flags:0
-ret: 0 st: 0 dts:1.360000 pts:-102481911520608.625000 pos:264461 size:26192 flags:1
+ret: 0 st: 0 dts:1.360000 pts:-102481911520608.625000 pos:264180 size:26192 flags:1
ret:-1 st:-1 ts:-0.222493 flags:1
ret:-1 st: 0 ts:2.671678 flags:0
ret: 0 st: 0 ts:1.565844 flags:1
-ret: 0 st: 0 dts:1.360000 pts:-102481911520608.625000 pos:264461 size:26192 flags:1
+ret: 0 st: 0 dts:1.360000 pts:-102481911520608.625000 pos:264180 size:26192 flags:1
ret: 0 st:-1 ts:0.460008 flags:0
-ret: 0 st: 0 dts:0.880000 pts:-102481911520608.625000 pos:167721 size:23537 flags:1
+ret: 0 st: 0 dts:0.880000 pts:-102481911520608.625000 pos:167648 size:23537 flags:1
ret:-1 st:-1 ts:-0.645825 flags:1
----------------
tests/data/a-mpeg2thread.mpg
@@ -1477,47 +1477,47 @@ ret: 0 st: 0 dts:0.000000 pts:-102481911520608.625000 pos:9216 size:9961 flags:1
ret: 0 st:-1 ts:-1.000000 flags:0
ret: 0 st: 0 dts:0.000000 pts:-102481911520608.625000 pos:9216 size:9961 flags:1
ret: 0 st:-1 ts:1.894167 flags:1
-ret: 0 st: 0 dts:1.840000 pts:-102481911520608.625000 pos:172485 size:12232 flags:1
+ret: 0 st: 0 dts:1.840000 pts:-102481911520608.625000 pos:172386 size:12232 flags:1
ret: 0 st: 0 ts:0.788333 flags:0
-ret: 0 st: 0 dts:0.880000 pts:-102481911520608.625000 pos:79253 size:10965 flags:1
+ret: 0 st: 0 dts:0.880000 pts:-102481911520608.625000 pos:79224 size:10965 flags:1
ret:-1 st: 0 ts:-0.317500 flags:1
ret:-1 st:-1 ts:2.576668 flags:0
ret: 0 st:-1 ts:1.470835 flags:1
-ret: 0 st: 0 dts:1.360000 pts:-102481911520608.625000 pos:123712 size:11970 flags:1
+ret: 0 st: 0 dts:1.360000 pts:-102481911520608.625000 pos:123587 size:11970 flags:1
ret: 0 st: 0 ts:0.365000 flags:0
-ret: 0 st: 0 dts:0.400000 pts:-102481911520608.625000 pos:40457 size:10045 flags:1
+ret: 0 st: 0 dts:0.400000 pts:-102481911520608.625000 pos:40445 size:10045 flags:1
ret:-1 st: 0 ts:-0.740833 flags:1
ret:-1 st:-1 ts:2.153336 flags:0
ret: 0 st:-1 ts:1.047503 flags:1
-ret: 0 st: 0 dts:0.880000 pts:-102481911520608.625000 pos:79253 size:10965 flags:1
+ret: 0 st: 0 dts:0.880000 pts:-102481911520608.625000 pos:79224 size:10965 flags:1
ret: 0 st: 0 ts:-0.058333 flags:0
ret: 0 st: 0 dts:0.000000 pts:-102481911520608.625000 pos:9216 size:9961 flags:1
ret: 0 st: 0 ts:2.835833 flags:1
-ret: 0 st: 0 dts:1.840000 pts:-102481911520608.625000 pos:172485 size:12232 flags:1
+ret: 0 st: 0 dts:1.840000 pts:-102481911520608.625000 pos:172386 size:12232 flags:1
ret: 0 st:-1 ts:1.730004 flags:0
-ret: 0 st: 0 dts:1.840000 pts:-102481911520608.625000 pos:172485 size:12232 flags:1
+ret: 0 st: 0 dts:1.840000 pts:-102481911520608.625000 pos:172386 size:12232 flags:1
ret: 0 st:-1 ts:0.624171 flags:1
-ret: 0 st: 0 dts:0.400000 pts:-102481911520608.625000 pos:40457 size:10045 flags:1
+ret: 0 st: 0 dts:0.400000 pts:-102481911520608.625000 pos:40445 size:10045 flags:1
ret: 0 st: 0 ts:-0.481667 flags:0
ret: 0 st: 0 dts:0.000000 pts:-102481911520608.625000 pos:9216 size:9961 flags:1
ret: 0 st: 0 ts:2.412500 flags:1
-ret: 0 st: 0 dts:1.840000 pts:-102481911520608.625000 pos:172485 size:12232 flags:1
+ret: 0 st: 0 dts:1.840000 pts:-102481911520608.625000 pos:172386 size:12232 flags:1
ret: 0 st:-1 ts:1.306672 flags:0
-ret: 0 st: 0 dts:1.360000 pts:-102481911520608.625000 pos:123712 size:11970 flags:1
+ret: 0 st: 0 dts:1.360000 pts:-102481911520608.625000 pos:123587 size:11970 flags:1
ret: 0 st:-1 ts:0.200839 flags:1
ret: 0 st: 0 dts:0.000000 pts:-102481911520608.625000 pos:9216 size:9961 flags:1
ret: 0 st: 0 ts:-0.904989 flags:0
ret: 0 st: 0 dts:0.000000 pts:-102481911520608.625000 pos:9216 size:9961 flags:1
ret: 0 st: 0 ts:1.989178 flags:1
-ret: 0 st: 0 dts:1.840000 pts:-102481911520608.625000 pos:172485 size:12232 flags:1
+ret: 0 st: 0 dts:1.840000 pts:-102481911520608.625000 pos:172386 size:12232 flags:1
ret: 0 st:-1 ts:0.883340 flags:0
-ret: 0 st: 0 dts:1.360000 pts:-102481911520608.625000 pos:123712 size:11970 flags:1
+ret: 0 st: 0 dts:1.360000 pts:-102481911520608.625000 pos:123587 size:11970 flags:1
ret:-1 st:-1 ts:-0.222493 flags:1
ret:-1 st: 0 ts:2.671678 flags:0
ret: 0 st: 0 ts:1.565844 flags:1
-ret: 0 st: 0 dts:1.360000 pts:-102481911520608.625000 pos:123712 size:11970 flags:1
+ret: 0 st: 0 dts:1.360000 pts:-102481911520608.625000 pos:123587 size:11970 flags:1
ret: 0 st:-1 ts:0.460008 flags:0
-ret: 0 st: 0 dts:0.880000 pts:-102481911520608.625000 pos:79253 size:10965 flags:1
+ret: 0 st: 0 dts:0.880000 pts:-102481911520608.625000 pos:79224 size:10965 flags:1
ret:-1 st:-1 ts:-0.645825 flags:1
----------------
tests/data/a-mpeg2threadivlc.mpg
@@ -1525,47 +1525,47 @@ ret: 0 st: 0 dts:0.000000 pts:-102481911520608.625000 pos:9216 size:9954 flags:1
ret: 0 st:-1 ts:-1.000000 flags:0
ret: 0 st: 0 dts:0.000000 pts:-102481911520608.625000 pos:9216 size:9954 flags:1
ret: 0 st:-1 ts:1.894167 flags:1
-ret: 0 st: 0 dts:1.840000 pts:-102481911520608.625000 pos:171933 size:11930 flags:1
+ret: 0 st: 0 dts:1.840000 pts:-102481911520608.625000 pos:171836 size:11930 flags:1
ret: 0 st: 0 ts:0.788333 flags:0
-ret: 0 st: 0 dts:0.880000 pts:-102481911520608.625000 pos:79182 size:10791 flags:1
+ret: 0 st: 0 dts:0.880000 pts:-102481911520608.625000 pos:79155 size:10791 flags:1
ret:-1 st: 0 ts:-0.317500 flags:1
ret:-1 st:-1 ts:2.576668 flags:0
ret: 0 st:-1 ts:1.470835 flags:1
-ret: 0 st: 0 dts:1.360000 pts:-102481911520608.625000 pos:123457 size:11697 flags:1
+ret: 0 st: 0 dts:1.360000 pts:-102481911520608.625000 pos:123335 size:11697 flags:1
ret: 0 st: 0 ts:0.365000 flags:0
-ret: 0 st: 0 dts:0.400000 pts:-102481911520608.625000 pos:40451 size:9980 flags:1
+ret: 0 st: 0 dts:0.400000 pts:-102481911520608.625000 pos:40440 size:9980 flags:1
ret:-1 st: 0 ts:-0.740833 flags:1
ret:-1 st:-1 ts:2.153336 flags:0
ret: 0 st:-1 ts:1.047503 flags:1
-ret: 0 st: 0 dts:0.880000 pts:-102481911520608.625000 pos:79182 size:10791 flags:1
+ret: 0 st: 0 dts:0.880000 pts:-102481911520608.625000 pos:79155 size:10791 flags:1
ret: 0 st: 0 ts:-0.058333 flags:0
ret: 0 st: 0 dts:0.000000 pts:-102481911520608.625000 pos:9216 size:9954 flags:1
ret: 0 st: 0 ts:2.835833 flags:1
-ret: 0 st: 0 dts:1.840000 pts:-102481911520608.625000 pos:171933 size:11930 flags:1
+ret: 0 st: 0 dts:1.840000 pts:-102481911520608.625000 pos:171836 size:11930 flags:1
ret: 0 st:-1 ts:1.730004 flags:0
-ret: 0 st: 0 dts:1.840000 pts:-102481911520608.625000 pos:171933 size:11930 flags:1
+ret: 0 st: 0 dts:1.840000 pts:-102481911520608.625000 pos:171836 size:11930 flags:1
ret: 0 st:-1 ts:0.624171 flags:1
-ret: 0 st: 0 dts:0.400000 pts:-102481911520608.625000 pos:40451 size:9980 flags:1
+ret: 0 st: 0 dts:0.400000 pts:-102481911520608.625000 pos:40440 size:9980 flags:1
ret: 0 st: 0 ts:-0.481667 flags:0
ret: 0 st: 0 dts:0.000000 pts:-102481911520608.625000 pos:9216 size:9954 flags:1
ret: 0 st: 0 ts:2.412500 flags:1
-ret: 0 st: 0 dts:1.840000 pts:-102481911520608.625000 pos:171933 size:11930 flags:1
+ret: 0 st: 0 dts:1.840000 pts:-102481911520608.625000 pos:171836 size:11930 flags:1
ret: 0 st:-1 ts:1.306672 flags:0
-ret: 0 st: 0 dts:1.360000 pts:-102481911520608.625000 pos:123457 size:11697 flags:1
+ret: 0 st: 0 dts:1.360000 pts:-102481911520608.625000 pos:123335 size:11697 flags:1
ret: 0 st:-1 ts:0.200839 flags:1
ret: 0 st: 0 dts:0.000000 pts:-102481911520608.625000 pos:9216 size:9954 flags:1
ret: 0 st: 0 ts:-0.904989 flags:0
ret: 0 st: 0 dts:0.000000 pts:-102481911520608.625000 pos:9216 size:9954 flags:1
ret: 0 st: 0 ts:1.989178 flags:1
-ret: 0 st: 0 dts:1.840000 pts:-102481911520608.625000 pos:171933 size:11930 flags:1
+ret: 0 st: 0 dts:1.840000 pts:-102481911520608.625000 pos:171836 size:11930 flags:1
ret: 0 st:-1 ts:0.883340 flags:0
-ret: 0 st: 0 dts:1.360000 pts:-102481911520608.625000 pos:123457 size:11697 flags:1
+ret: 0 st: 0 dts:1.360000 pts:-102481911520608.625000 pos:123335 size:11697 flags:1
ret:-1 st:-1 ts:-0.222493 flags:1
ret:-1 st: 0 ts:2.671678 flags:0
ret: 0 st: 0 ts:1.565844 flags:1
-ret: 0 st: 0 dts:1.360000 pts:-102481911520608.625000 pos:123457 size:11697 flags:1
+ret: 0 st: 0 dts:1.360000 pts:-102481911520608.625000 pos:123335 size:11697 flags:1
ret: 0 st:-1 ts:0.460008 flags:0
-ret: 0 st: 0 dts:0.880000 pts:-102481911520608.625000 pos:79182 size:10791 flags:1
+ret: 0 st: 0 dts:0.880000 pts:-102481911520608.625000 pos:79155 size:10791 flags:1
ret:-1 st:-1 ts:-0.645825 flags:1
----------------
tests/data/a-mpeg4-Q.avi
@@ -1857,51 +1857,51 @@ ret: 0 st: 0 dts:0.880000 pts:0.880000 pos:154792 size:13382 flags:1
ret:-1 st:-1 ts:-0.645825 flags:1
----------------
tests/data/a-mpeg4-thread.avi
-ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:5660 size:14874 flags:1
+ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:5660 size:14886 flags:1
ret: 0 st:-1 ts:-1.000000 flags:0
-ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:5660 size:14874 flags:1
+ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:5660 size:14886 flags:1
ret: 0 st:-1 ts:1.894167 flags:1
-ret: 0 st: 0 dts:1.840000 pts:1.840000 pos:229568 size:14638 flags:1
+ret: 0 st: 0 dts:1.840000 pts:1.840000 pos:229504 size:14637 flags:1
ret: 0 st: 0 ts:0.800000 flags:0
-ret: 0 st: 0 dts:0.880000 pts:0.880000 pos:163772 size:16380 flags:1
+ret: 0 st: 0 dts:0.880000 pts:0.880000 pos:163736 size:16361 flags:1
ret:-1 st: 0 ts:-0.320000 flags:1
ret:-1 st:-1 ts:2.576668 flags:0
ret: 0 st:-1 ts:1.470835 flags:1
-ret: 0 st: 0 dts:1.360000 pts:1.360000 pos:196664 size:16051 flags:1
+ret: 0 st: 0 dts:1.360000 pts:1.360000 pos:196574 size:16044 flags:1
ret: 0 st: 0 ts:0.360000 flags:0
-ret: 0 st: 0 dts:0.400000 pts:0.400000 pos:98760 size:33020 flags:1
+ret: 0 st: 0 dts:0.400000 pts:0.400000 pos:98774 size:32995 flags:1
ret:-1 st: 0 ts:-0.760000 flags:1
ret:-1 st:-1 ts:2.153336 flags:0
ret: 0 st:-1 ts:1.047503 flags:1
-ret: 0 st: 0 dts:0.880000 pts:0.880000 pos:163772 size:16380 flags:1
+ret: 0 st: 0 dts:0.880000 pts:0.880000 pos:163736 size:16361 flags:1
ret: 0 st: 0 ts:-0.040000 flags:0
-ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:5660 size:14874 flags:1
+ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:5660 size:14886 flags:1
ret: 0 st: 0 ts:2.840000 flags:1
-ret: 0 st: 0 dts:1.840000 pts:1.840000 pos:229568 size:14638 flags:1
+ret: 0 st: 0 dts:1.840000 pts:1.840000 pos:229504 size:14637 flags:1
ret: 0 st:-1 ts:1.730004 flags:0
-ret: 0 st: 0 dts:1.840000 pts:1.840000 pos:229568 size:14638 flags:1
+ret: 0 st: 0 dts:1.840000 pts:1.840000 pos:229504 size:14637 flags:1
ret: 0 st:-1 ts:0.624171 flags:1
-ret: 0 st: 0 dts:0.400000 pts:0.400000 pos:98760 size:33020 flags:1
+ret: 0 st: 0 dts:0.400000 pts:0.400000 pos:98774 size:32995 flags:1
ret: 0 st: 0 ts:-0.480000 flags:0
-ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:5660 size:14874 flags:1
+ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:5660 size:14886 flags:1
ret: 0 st: 0 ts:2.400000 flags:1
-ret: 0 st: 0 dts:1.840000 pts:1.840000 pos:229568 size:14638 flags:1
+ret: 0 st: 0 dts:1.840000 pts:1.840000 pos:229504 size:14637 flags:1
ret: 0 st:-1 ts:1.306672 flags:0
-ret: 0 st: 0 dts:1.360000 pts:1.360000 pos:196664 size:16051 flags:1
+ret: 0 st: 0 dts:1.360000 pts:1.360000 pos:196574 size:16044 flags:1
ret: 0 st:-1 ts:0.200839 flags:1
-ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:5660 size:14874 flags:1
+ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:5660 size:14886 flags:1
ret: 0 st: 0 ts:-0.920000 flags:0
-ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:5660 size:14874 flags:1
+ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:5660 size:14886 flags:1
ret: 0 st: 0 ts:2.000000 flags:1
-ret: 0 st: 0 dts:1.840000 pts:1.840000 pos:229568 size:14638 flags:1
+ret: 0 st: 0 dts:1.840000 pts:1.840000 pos:229504 size:14637 flags:1
ret: 0 st:-1 ts:0.883340 flags:0
-ret: 0 st: 0 dts:0.880000 pts:0.880000 pos:163772 size:16380 flags:1
+ret: 0 st: 0 dts:0.880000 pts:0.880000 pos:163736 size:16361 flags:1
ret:-1 st:-1 ts:-0.222493 flags:1
ret:-1 st: 0 ts:2.680000 flags:0
ret: 0 st: 0 ts:1.560000 flags:1
-ret: 0 st: 0 dts:1.360000 pts:1.360000 pos:196664 size:16051 flags:1
+ret: 0 st: 0 dts:1.360000 pts:1.360000 pos:196574 size:16044 flags:1
ret: 0 st:-1 ts:0.460008 flags:0
-ret: 0 st: 0 dts:0.880000 pts:0.880000 pos:163772 size:16380 flags:1
+ret: 0 st: 0 dts:0.880000 pts:0.880000 pos:163736 size:16361 flags:1
ret:-1 st:-1 ts:-0.645825 flags:1
----------------
tests/data/a-msmpeg4.avi
_______________________________________________
FFmpeg-soc mailing list
[email protected]
https://lists.mplayerhq.hu/mailman/listinfo/ffmpeg-soc
