From patchwork Sat Nov 12 06:02:28 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasi Inguva X-Patchwork-Id: 1396 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.90.1 with SMTP id o1csp122945vsb; Fri, 11 Nov 2016 22:10:21 -0800 (PST) X-Received: by 10.28.146.203 with SMTP id u194mr1232629wmd.79.1478931021670; Fri, 11 Nov 2016 22:10:21 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id wn4si14333530wjb.27.2016.11.11.22.10.20; Fri, 11 Nov 2016 22:10:21 -0800 (PST) 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 51B73689D00; Sat, 12 Nov 2016 08:10:18 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg0-f41.google.com (mail-pg0-f41.google.com [74.125.83.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3A3BF689C03 for ; Sat, 12 Nov 2016 08:10:11 +0200 (EET) Received: by mail-pg0-f41.google.com with SMTP id x23so19582982pgx.1 for ; Fri, 11 Nov 2016 22:10:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=cIuMuAWEFhC3lYIQ1/ZhNk2bsyEfVig6nVMdAIqc+XE=; b=LJpcjpFjZJSWHW1Sst9T8kbTA8DEjGt4nnkcJ35rIua6HALmuufq2cDClc0XwnCtIX VZP3GEpV/bwzTOoCzpB+ZrV/UEDthBCfhvKmsP95Rb/RiIGjDNpBfCO6X1L2VM3wO6H6 o9Anu4GoNXxONFjWitOunxXtKw7UBZZ9ngXf8kiMXP0Tj0Pijp6ML6p2yIYYsYrCOEZw DHA3o+FGhqQmVrlqs00aFWWy1nofpTi7XOgDfgurlm4wZg3W1UU+7/tNOM6SQfDc3vFG iaMkHeTpXi1feNEJ4HUGrJ8Ib4K3MUB03UHAABkl6yFDG/tNJPrrsMRs3fSqhr3Bf+eP EESg== 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; bh=cIuMuAWEFhC3lYIQ1/ZhNk2bsyEfVig6nVMdAIqc+XE=; b=VntwpSs8uleSJp2yxVufv8qC/hT2AjINZdtAP/mwAStmILKa1Rg+9+VFqT/Y2G0FTg SznUyJTD92SNnbXF429Am/U36DI/qPu60ClWPZWRYeSWC/wAPKIcA3mUNUqr76/AJZFm bGSx7ClUuADDdk/1Jui63/yNiJ2+Lb2VyqEQ8Kpp+FF4voTpQYXjLhKEc24crUFX2xDm YbtHX6F4vrS0QDAAtSXNVctGJQm6MNff1MmL1fTKgf7PIcTcie55jt7jUxEeo7LHJDHv wsD0Y9JqeGOgoro6b8H5hpoi5MCNw3ozHjNEEm4KktUAAp/KhdJ0ePTPweV2jGCldO8X DtKw== X-Gm-Message-State: ABUngvdpYoJrhsb4+mv5v9TIWyPczI9F2dIa7PT4u7AFj7mqgR9xa7CR+lQFuadGx0SFf2dn X-Received: by 10.98.196.89 with SMTP id y86mr14265910pff.172.1478930613641; Fri, 11 Nov 2016 22:03:33 -0800 (PST) Received: from isasi.mtv.corp.google.com ([172.27.82.89]) by smtp.gmail.com with ESMTPSA id p64sm19136759pfi.88.2016.11.11.22.03.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 11 Nov 2016 22:03:33 -0800 (PST) From: Sasi Inguva To: ffmpeg-devel@ffmpeg.org Date: Fri, 11 Nov 2016 22:02:28 -0800 Message-Id: <1478930548-17982-1-git-send-email-isasi@google.com> X-Mailer: git-send-email 2.8.0.rc3.226.g39d4020 Subject: [FFmpeg-devel] [PATCH] lavf/mov.c: Set skip_samples according to first edit list, when -ignore_editlist is set. 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/isom.h | 2 ++ libavformat/mov.c | 22 +++++++++++++++++++++- 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/libavformat/isom.h b/libavformat/isom.h index d684502..6a8a4e3 100644 --- a/libavformat/isom.h +++ b/libavformat/isom.h @@ -164,6 +164,8 @@ typedef struct MOVStreamContext { uint32_t tmcd_flags; ///< tmcd track flags int64_t track_end; ///< used for dts generation in fragmented movie files int start_pad; ///< amount of samples to skip due to enc-dec delay + int first_elist_start_time; ///< first edit list start time. + int num_non_empty_elst; ///< number of non empty edit lists. unsigned int rap_group_count; MOVSbgp *rap_group; diff --git a/libavformat/mov.c b/libavformat/mov.c index 9ec7d03..676694e 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -3245,6 +3245,12 @@ static void mov_build_index(MOVContext *mov, AVStream *st) } } + /* Adjust skip_samples correctly when ignore_editlist is set, to support gapless playback */ + if (mov->ignore_editlist && sc->num_non_empty_elst <= 1 && + st->codecpar->codec_id == AV_CODEC_ID_AAC && sc->first_elist_start_time > 0) { + sc->start_pad = sc->first_elist_start_time; + } + /* only use old uncompressed audio chunk demuxing when stts specifies it */ if (!(st->codecpar->codec_type == AVMEDIA_TYPE_AUDIO && sc->stts_count == 1 && sc->stts_data[0].duration == 1)) { @@ -4424,9 +4430,11 @@ static int mov_read_elst(MOVContext *c, AVIOContext *pb, MOVAtom atom) MOVStreamContext *sc; int i, edit_count, version; - if (c->fc->nb_streams < 1 || c->ignore_editlist) + if (c->fc->nb_streams < 1) return 0; sc = c->fc->streams[c->fc->nb_streams-1]->priv_data; + sc->first_elist_start_time = 0; + sc->num_non_empty_elst = 0; version = avio_r8(pb); /* version */ avio_rb24(pb); /* flags */ @@ -4463,9 +4471,21 @@ static int mov_read_elst(MOVContext *c, AVIOContext *pb, MOVAtom atom) c->fc->nb_streams-1, i, e->time); return AVERROR_INVALIDDATA; } + + if (!sc->first_elist_start_time && e->time > 0) { + sc->first_elist_start_time = e->time; + } + + if (e->time >= 0) { + sc->num_non_empty_elst++; + } } sc->elst_count = i; + if (c->ignore_editlist) { + av_freep(&sc->elst_data); + sc->elst_count = 0; + } return 0; }