From patchwork Thu Aug 25 01:42:16 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasi Inguva X-Patchwork-Id: 283 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.134 with SMTP id o128csp665219vsd; Wed, 24 Aug 2016 18:50:18 -0700 (PDT) X-Received: by 10.194.101.134 with SMTP id fg6mr5009552wjb.84.1472089816807; Wed, 24 Aug 2016 18:50:16 -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 yj6si11428699wjb.9.2016.08.24.18.50.15; Wed, 24 Aug 2016 18:50:16 -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 25416689A4A; Thu, 25 Aug 2016 04:50:03 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ua0-f171.google.com (mail-ua0-f171.google.com [209.85.217.171]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2C7AE689A4A for ; Thu, 25 Aug 2016 04:49:48 +0300 (EEST) Received: by mail-ua0-f171.google.com with SMTP id m60so20134101uam.3 for ; Wed, 24 Aug 2016 18:49:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=mime-version:in-reply-to:references:from:date:message-id:subject:to; bh=qXlC9saDplMNyXcq0XkoIFnzof9LcQDD9f7Yn/r5sKE=; b=kNFO+33A5FMhqneWCeNDIFckJUY0JyYzZ5SKArtTCzzKZ+EfxHN+0PVs2ppxSy7H9b AWggGn4EOmWbQACKTRDq9p26JboaWlhPsfq5R6gFq1VM25lVTEZl3Fk0oRwVLnOgSnCQ FaU2UkNM/PJvBSFLFBth5y7UVa4YZ3tw4Od4Zv8iNwTRNTkiLlFyGVlyhvoRWtoMGeep 48RiGhSo6PZLNFmNlo90ahlTWwgH2e2WODj0VdcG1anaay8arJfFoqYSrDUX5F/SrDKE eW3MmW4O/mJelUQpFm6lH2R7HPsZkgDCHhPRmcKpd7nvLkkQqI4D+W2ZU8pUOC6ZAeY8 bvGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to; bh=qXlC9saDplMNyXcq0XkoIFnzof9LcQDD9f7Yn/r5sKE=; b=BnUUgPwGF1S2SqIsqtX1aK5Jcy3H2Naqy4v1h+fa7JVgsDg/m5Qt9fg6YayrM+EijL GnKv3t0Q4fwPPN4RCFsdO1R3K+XL3cT50SOUkYiL2wAmownniJgZm+n6vZRnc4uWiG0t SugVo9LPcnPiQcyeFbMZ1qAPWDGseqF4V6CMNjk/DOmsXXfUTYouM1ZG0wNv+rlqvDIJ ZCRJ5TdWcX80gZgIznlAWYHxUFyW2jDI9Ym+YT2AEioqis5U0cjIa/IulQP78TZxe5FK 2I3ufr3fPX0R28X/kDdMm+YNaBdUYLLvNL9ZZwo5obB4bD9vyBvMkv2nx4KEMexI66oz vAdQ== X-Gm-Message-State: AE9vXwNAkvV0sGfeSBG7ot2auz9LyhBgElCSqCxKTaEgQ/J6Y3inipUc7zTmeEeYN34kBjLNrwjDGPVJ3UgPXMVs X-Received: by 10.176.82.71 with SMTP id j7mr3492731uaa.66.1472089337838; Wed, 24 Aug 2016 18:42:17 -0700 (PDT) MIME-Version: 1.0 Received: by 10.31.153.207 with HTTP; Wed, 24 Aug 2016 18:42:16 -0700 (PDT) In-Reply-To: <20160824230109.GP5460@nb4> References: <20160814132424.GB26860@leki> <1471313097-26998-1-git-send-email-isasi@google.com> <1471313097-26998-2-git-send-email-isasi@google.com> <20160824230109.GP5460@nb4> From: Sasi Inguva Date: Wed, 24 Aug 2016 18:42:16 -0700 Message-ID: To: FFmpeg development discussions and patches X-Content-Filtered-By: Mailman/MimeDel 2.1.20 Subject: Re: [FFmpeg-devel] [PATCH 4/4] lavf/mov: Add support for edit list parsing. 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" hmm. strange. I just rebased my branch on top of head, and reran the test, and it succeeds along with all other fate tests. I am attaching the 4 patches again here. On Wed, Aug 24, 2016 at 4:01 PM, Michael Niedermayer wrote: > On Mon, Aug 15, 2016 at 07:04:57PM -0700, Sasi Inguva wrote: > > Signed-off-by: Sasi Inguva > > --- > > libavformat/mov.c | 334 +++++++- > > tests/Makefile | 1 + > > tests/fate/mov.mak | 28 + > > tests/ref/fate/filter-fps-cfr | 1 - > > tests/ref/fate/gaplessenc-itunes-to-ipod-aac | 12 +- > > tests/ref/fate/gaplessenc-pcm-to-mov-aac | 12 +- > > tests/ref/fate/gsm-toast | 1000 > ++++++++++++------------ > > tests/ref/fate/h264-invalid-ref-mod | 20 +- > > tests/ref/fate/mov-1elist-1ctts | 57 ++ > > tests/ref/fate/mov-1elist-ends-last-bframe | 56 ++ > > tests/ref/fate/mov-1elist-noctts | 57 ++ > > tests/ref/fate/mov-2elist-elist1-ends-bframe | 51 ++ > > tests/ref/fate/mov-3elist | 57 ++ > > tests/ref/fate/mov-3elist-1ctts | 57 ++ > > tests/ref/fate/mov-elist-starts-ctts-2ndsample | 57 ++ > > tests/ref/fate/pcm_s16be-stereo | 2 +- > > tests/ref/fate/quickdraw | 12 +- > > tests/ref/fate/tscc2-mov | 20 +- > > tests/ref/lavf-fate/mov_qtrle_mace6 | 2 +- > > 19 files changed, 1287 insertions(+), 549 deletions(-) > > create mode 100644 tests/fate/mov.mak > > create mode 100644 tests/ref/fate/mov-1elist-1ctts > > create mode 100644 tests/ref/fate/mov-1elist-ends-last-bframe > > create mode 100644 tests/ref/fate/mov-1elist-noctts > > create mode 100644 tests/ref/fate/mov-2elist-elist1-ends-bframe > > create mode 100644 tests/ref/fate/mov-3elist > > create mode 100644 tests/ref/fate/mov-3elist-1ctts > > create mode 100644 tests/ref/fate/mov-elist-starts-ctts-2ndsample > > it seems one fate test fails with this patchset > make: *** [fate-mov-2elist-elist1-ends-bframe] Error 134 > Assertion !index || ie[-1].timestamp <= timestamp failed at > libavformat/mov.c:2850 > Aborted > > I think this didnt happen when i tested a previous revission > > [...] > -- > Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB > > Those who are too smart to engage in politics are punished by being > governed by those who are dumber. -- Plato > > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > http://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > From 4f91db6f34070f0e02ce224badaffa8c4d69d900 Mon Sep 17 00:00:00 2001 From: Sasi Inguva Date: Wed, 24 Aug 2016 18:30:01 -0700 Subject: [PATCH 2/4] avformat/avframe.h: Add a flag in AVIndexEntry to discard frame after decoding. Signed-off-by: Sasi Inguva --- libavformat/avformat.h | 3 +++ libavformat/version.h | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 3ee7051..d943ae1 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -814,6 +814,9 @@ typedef struct AVIndexEntry { * is known */ #define AVINDEX_KEYFRAME 0x0001 +#define AVINDEX_DISCARD_FRAME 0x0002 /** + * Flag is used to indicate which frame should be discarded after decoding. + */ int flags:2; int size:30; //Yeah, trying to keep the size of this small to reduce memory requirements (it is 24 vs. 32 bytes due to possible 8-byte alignment). int min_distance; /**< Minimum distance between this and the previous keyframe, used to avoid unneeded searching. */ diff --git a/libavformat/version.h b/libavformat/version.h index 88fd4cc..34226ca 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -32,7 +32,7 @@ // Major bumping may affect Ticket5467, 5421, 5451(compatibility with Chromium) // Also please add any ticket numbers that you believe might be affected here #define LIBAVFORMAT_VERSION_MAJOR 57 -#define LIBAVFORMAT_VERSION_MINOR 48 +#define LIBAVFORMAT_VERSION_MINOR 49 #define LIBAVFORMAT_VERSION_MICRO 100 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ -- 2.8.0.rc3.226.g39d4020