From patchwork Thu Sep 15 20:36:18 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasi Inguva X-Patchwork-Id: 593 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.134 with SMTP id o128csp97760vsd; Thu, 15 Sep 2016 13:37:40 -0700 (PDT) X-Received: by 10.194.56.230 with SMTP id d6mr1924154wjq.208.1473971860320; Thu, 15 Sep 2016 13:37:40 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id r125si1063327wmr.63.2016.09.15.13.37.39; Thu, 15 Sep 2016 13:37:40 -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; dkim=neutral (body hash did not verify) header.i=@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 CCEDD689EC0; Thu, 15 Sep 2016 23:37:08 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf0-f177.google.com (mail-pf0-f177.google.com [209.85.192.177]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CB5A1689E5D for ; Thu, 15 Sep 2016 23:37:01 +0300 (EEST) Received: by mail-pf0-f177.google.com with SMTP id 21so9324230pfy.0 for ; Thu, 15 Sep 2016 13:37:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=cqgF+KfFu2fRBKXVj/U/nJ9AkNZEpNsxrhFnkjg6yTQ=; b=iJWxNvwxlasL37uWbVAqKV/tNesoOJt69nn2h0n18jv9cQ8ub6keRa3mz2FYpuuOAE HBC6tVarI8SeaHdyOBNxVh6wjXBLxemPj+/aL5VYUo/WLuyG3LJALm1DKd9jXKEfQNOe rq6Xzp7VFlhWGGQqwlvgY+oCdhTvYmMwUQswQrEHI36OGYrVNDZD/Drp5Z46DcqeS3L/ sbJr2EeArSmz+rZRraxmmN5rxdc2CYac+T31JoatU3qY85W27oH/jVqW1TEJQ7arD7j0 J1WR/MShAVi63d0jAGbeW148uh9ROvFN9Y9WWIJhotwyP3lnTcKejKjAMPppXF7Z0fcF vvFg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=cqgF+KfFu2fRBKXVj/U/nJ9AkNZEpNsxrhFnkjg6yTQ=; b=hKXp2wG9WqQ4uD556Nte6KV6OCRjTE3Hcr6LjmmtrLPFyW17Cf3fCZp3V0K6bBrz3z /zzKlp26C5ENxLcEIJeX0K98yFahnKmWmmqjWdtafdzjJR2sdiRfW1ashgDmyPOxu+cT jmWG512q3KZPGubfggHdYSjncqIPZKo22R76AP8MkIOWV+1F23CTxTSBRzAZHFUfOdUP Sek11a3/Wwt0rBqK8WUkdi8cM4AswSbZ9Et7uMDLJGT3N3XrMqcBbEQGHjeXWH4Cy+nF xmap0hoQfAZZdJW2AIamMOJ5r6veAMGPvEJ3Xedt9/O8uEKNGzuaxF1YNxSXPTcfJ7Js WDpA== X-Gm-Message-State: AE9vXwM+1mk35OIbgGp0tQeXvY/h/rpWc3vdwKtjg3ibdmofChIwjLkVz3iW+JO2l+mqNh8Z X-Received: by 10.98.158.218 with SMTP id f87mr3774107pfk.179.1473971833682; Thu, 15 Sep 2016 13:37:13 -0700 (PDT) Received: from isasi.mtv.corp.google.com ([172.27.82.89]) by smtp.gmail.com with ESMTPSA id b64sm47082466pfa.82.2016.09.15.13.37.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 15 Sep 2016 13:37:13 -0700 (PDT) From: Sasi Inguva To: ffmpeg-devel@ffmpeg.org Date: Thu, 15 Sep 2016 13:36:18 -0700 Message-Id: <1473971779-27524-5-git-send-email-isasi@google.com> X-Mailer: git-send-email 2.8.0.rc3.226.g39d4020 In-Reply-To: <1473971779-27524-1-git-send-email-isasi@google.com> References: <1473971779-27524-1-git-send-email-isasi@google.com> Subject: [FFmpeg-devel] [PATCH 5/6] lavf/utils: Support av_index_search_timestamp in case of AVIndexEntry with discarded packets. 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 Cc: Sasi Inguva MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Sasi Inguva --- libavformat/utils.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/libavformat/utils.c b/libavformat/utils.c index d605a96..f043bae 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -1937,6 +1937,16 @@ int ff_index_search_timestamp(const AVIndexEntry *entries, int nb_entries, while (b - a > 1) { m = (a + b) >> 1; + + // Search for the next non-discarded packet. + while ((entries[m].flags & AVINDEX_DISCARD_FRAME) && m < b) { + m++; + if (m == b && entries[m].timestamp >= wanted_timestamp) { + m = b - 1; + break; + } + } + timestamp = entries[m].timestamp; if (timestamp >= wanted_timestamp) b = m;