From patchwork Wed Jul 11 00:17:56 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 9671 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:104:0:0:0:0:0 with SMTP id c4-v6csp4244820jad; Tue, 10 Jul 2018 17:18:15 -0700 (PDT) X-Google-Smtp-Source: AAOMgpeP/fRVg+kQLq0S/dC6TODbItPl9sIvQIDMMbHeRUvh/qsMXfuFNRrzjM6Zl8AGGp75/keO X-Received: by 2002:adf:ea0a:: with SMTP id q10-v6mr19474734wrm.224.1531268295151; Tue, 10 Jul 2018 17:18:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531268295; cv=none; d=google.com; s=arc-20160816; b=y5E/Yq80dXND/cqqI/ZSonnaLqzFCC4bVqg+vPpyidEKK8vzQysEDUjs6oZuQOeb3r eSs9CKYFTLAJeAz6o+3A+Bzkuf6DaKE6irzM3srNekzHLZsJ0qx6hAPf9xach9QCGrZg Cxv8EguPBAgeveToTBxIJitVHKqpmi2If7OBgK0HIm1QRZsT1X9yFNl1+FfVa5K5b1TJ /A+XIN/wKkQu/oTc/mk+/i4uBLTv3w1lykF8IRyMLo7wZp+DL4yBkBlembWS8CM2zyca w/gtxLp6cBK0puFqGyOvAjc0yjWVVwvXhqL1RjtFo8vvEW7+jHWOA+OpbXGgHEz5gzwd dk9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:delivered-to:arc-authentication-results; bh=nzdENN+kYW+xrQIzs+gLqAksahiwYzqZ26BjnQAXVa4=; b=naqjEgwdAC3onPnWeSXZZSFWLtpHxQIz857d9ZWBTX9DgtKCYt//eQU/YgsEo2VgSw 3mOVVbMRmmu3qomn0kGfoNehbzic4CFx37mkIkgtOaN8yjNgfVkinvOKTMYMuoBsuKMe 14gsudkb/k11tFNZCbUVfg8nho61i0IF19GpRbBHz+c5mI6MVDIQ2uClaijtskMCqiEN lwSHoSNbbobsc+NSUOoyfSeW6yveCY3cTiNoilxdb3ze/OXvQz/Z6Q8EOKNwQmam3Bz5 BITgXK+y9Luvtgxu+8+uFYUCJJla2iZ4qxhGhdaQCX6/bVBavztLESCJiNSh0ss1Sxd4 vRTQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id k1-v6si17051575wre.422.2018.07.10.17.18.14; Tue, 10 Jul 2018 17:18:15 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8FFD868A412; Wed, 11 Jul 2018 03:18:05 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe07-3.mx.upcmail.net (vie01a-dmta-pe07-3.mx.upcmail.net [84.116.36.19]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 17DD968A281 for ; Wed, 11 Jul 2018 03:17:59 +0300 (EEST) Received: from [172.31.216.43] (helo=vie01a-pemc-psmtp-pe01) by vie01a-dmta-pe07.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1fd2pa-0002iv-4g for ffmpeg-devel@ffmpeg.org; Wed, 11 Jul 2018 02:18:06 +0200 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id 9CJ21y0050S5wYM01CJ32z; Wed, 11 Jul 2018 02:18:03 +0200 X-SourceIP: 213.47.41.20 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Wed, 11 Jul 2018 02:17:56 +0200 Message-Id: <20180711001758.27132-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180711001758.27132-1-michael@niedermayer.cc> References: <20180711001758.27132-1-michael@niedermayer.cc> Subject: [FFmpeg-devel] [PATCH 2/4] bavformat/mov: Eliminate variable buf_size from mov_estimate_video_delay() X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Michael Niedermayer --- libavformat/mov.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index aabf06de12..67b3e11eb9 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -3301,25 +3301,22 @@ static void mov_estimate_video_delay(MOVContext *c, AVStream* st) { int ctts_sample = 0; int64_t pts_buf[MAX_REORDER_DELAY + 1]; // Circular buffer to sort pts. int buf_start = 0; - int buf_size = 0; int j, r, num_swaps; + for (j = 0; j < MAX_REORDER_DELAY + 1; j++) + pts_buf[j] = INT64_MIN; + if (st->codecpar->video_delay <= 0 && msc->ctts_data && st->codecpar->codec_id == AV_CODEC_ID_H264) { st->codecpar->video_delay = 0; for(ind = 0; ind < st->nb_index_entries && ctts_ind < msc->ctts_count; ++ind) { - if (buf_size == (MAX_REORDER_DELAY + 1)) { - // If circular buffer is full, then move the first element forward. - buf_start = (buf_start + 1); - if (buf_start == MAX_REORDER_DELAY + 1) - buf_start = 0; - } else { - ++buf_size; - } + buf_start = (buf_start + 1); + if (buf_start == MAX_REORDER_DELAY + 1) + buf_start = 0; // Point j to the last elem of the buffer and insert the current pts there. j = buf_start - 1; - if (j < 0) j = buf_size - 1; + if (j < 0) j = MAX_REORDER_DELAY; pts_buf[j] = st->index_entries[ind].timestamp + msc->ctts_data[ctts_ind].duration; // The timestamps that are already in the sorted buffer, and are greater than the @@ -3331,7 +3328,7 @@ static void mov_estimate_video_delay(MOVContext *c, AVStream* st) { num_swaps = 0; while (j != buf_start) { r = j - 1; - if (r < 0) r = buf_size - 1; + if (r < 0) r = MAX_REORDER_DELAY; if (pts_buf[j] < pts_buf[r]) { FFSWAP(int64_t, pts_buf[j], pts_buf[r]); ++num_swaps;