From 0945eddec09d1c2b69643afc70377d86febc0591 Mon Sep 17 00:00:00 2001 From: Janne Grunau Date: Thu, 10 Nov 2011 17:30:33 +0100 Subject: pthread: do not touch has_b_frames Adding the thread count in frame level multithreading to has_b_frames as an additional delay causes more problems than it solves. For example inconsistent behaviour during timestamp calculation in libavformat. Thread count and frame level multithreading are both set by the user. If the additional delay caused by frame level multithreading needs to be considered in the calling code it has all information to take it into account. Should it become necessary to calculate a maximum delay inside libavcodec it should be exported as its own field and not reusing an existing field. Based on a patch by Michael Niedermayer. Signed-off-by: Janne Grunau --- libavformat/utils.c | 5 ----- 1 file changed, 5 deletions(-) (limited to 'libavformat') diff --git a/libavformat/utils.c b/libavformat/utils.c index b8262ecaf1..2b378ab712 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -964,11 +964,6 @@ static void compute_pkt_fields(AVFormatContext *s, AVStream *st, delay= st->codec->has_b_frames; presentation_delayed = 0; - // ignore delay caused by frame threading so that the mpeg2-without-dts - // warning will not trigger - if (delay && st->codec->active_thread_type&FF_THREAD_FRAME) - delay -= st->codec->thread_count-1; - /* XXX: need has_b_frame, but cannot get it if the codec is not initialized */ if (delay && -- cgit v1.2.3