From patchwork Sun Oct 1 16:46:47 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stebbins X-Patchwork-Id: 5360 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.61.8 with SMTP id n8csp644322jan; Sun, 1 Oct 2017 09:46:59 -0700 (PDT) X-Google-Smtp-Source: AOwi7QBqlqUFXE7W2+d9Nr6PpdX6+fTDzTXYYiwm89Khh/yg7BMh0fyhVdVugp8IKiyEhISOA771 X-Received: by 10.223.196.228 with SMTP id o33mr12278428wrf.253.1506876419181; Sun, 01 Oct 2017 09:46:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1506876419; cv=none; d=google.com; s=arc-20160816; b=PnL9UWwyQuLv1AeOs9YRh0r1Bb74yKDsbShs3joT2anzzyWHHD6PHXJQxe2IIcAbkX BgxSjuzjWtCcom23e8QBL/5AfSNO/U8iM+WlpWl8qie6arp8d5l1u3IuRMKQQjK1UzHK iInOjQL555o7uqI6ZJDmoqjg5dxF6tmW+WRjKRGm+LxbdrQELP3oFYJX6Tf2mPGj/9Zr SDyY4/D4LwDBGTBYrbpvMpohFD/xAD57w1TM5Il+hDi1a6Eo3+X/x6LfVD46e8jlWFQG d9jHxj//5+4bLBQocXNXTLF+H8/HgFe/hbxWf9TEbqJxSHzzpMXdP+ul7wXoVSg1cPpb /DmA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :delivered-to:arc-authentication-results; bh=rI2bTcqqF50n49VDKns6gck5RjxqRAoEQkOX4X3w8HU=; b=JzO4sZfB7qYWgJCqksIELKJzYetfQs812dhRMGfSWV8KJTH6RQ3kIy1gaP2xAL+zJ8 rHDWAXOzn4N7Tcx5EEn/4dPNdhptnc1UpavVYoUqWWkT/xbcoGaNh7qvJWyWJIP/qxFW TEUyFHwZt24O4SWFea6Bv+PLVpBn2DKtfwDCdtrDM8sNxZRlpeOlkf5YH4Qk+77WO+bf wEkeokMCR+H0gwKI3QyAy7d4k09tK2LD2D5+oxBl9lycv4YUQVPkiGa9w6D9sHUw/RfR M7ZLE8gntRBy/oMjPPuc9Cw7dQSRIcbKfVguvhcuWB0SrFeq/3tjzw3IRQqPjxAbDPnu P6rw== 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 v5si1642018wrd.498.2017.10.01.09.46.58; Sun, 01 Oct 2017 09:46:59 -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 3FC4A689C48; Sun, 1 Oct 2017 19:46:43 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail.jetheaddev.com (mail.jetheaddev.com [70.164.99.34]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 99000689BB7 for ; Sun, 1 Oct 2017 19:46:36 +0300 (EEST) Received: from dionysus.jetheaddev.com (10.13.12.63) by cas.jetheaddev.com (192.168.13.27) with Microsoft SMTP Server (TLS) id 14.3.351.0; Sun, 1 Oct 2017 09:46:48 -0700 Received: from dionysus.jetheaddev.com (localhost [127.0.0.1]) by dionysus.jetheaddev.com (8.15.2/8.14.7) with ESMTP id v91GklOe004603 for ; Sun, 1 Oct 2017 09:46:47 -0700 Received: (from jstebbins@localhost) by dionysus.jetheaddev.com (8.15.2/8.15.2/Submit) id v91GklKV004602 for ffmpeg-devel@ffmpeg.org; Sun, 1 Oct 2017 09:46:47 -0700 From: John Stebbins To: Date: Sun, 1 Oct 2017 09:46:47 -0700 Message-ID: <20171001164647.4558-1-jstebbins@jetheaddev.com> X-Mailer: git-send-email 2.13.5 MIME-Version: 1.0 X-Originating-IP: [10.13.12.63] Subject: [FFmpeg-devel] [PATCH 2/2] mov: fix non-monotonous DTS when fragments overlap in time 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" --- libavformat/mov.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index c7422cd9ed..bc3c9cb35b 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -4267,6 +4267,7 @@ static int mov_read_trun(MOVContext *c, AVIOContext *pb, MOVAtom atom) int data_offset = 0; unsigned entries, first_sample_flags = frag->flags; int flags, distance, i; + int64_t last_dts = AV_NOPTS_VALUE; for (i = 0; i < c->fc->nb_streams; i++) { if (c->fc->streams[i]->id == frag->track_id) { @@ -4294,6 +4295,10 @@ static int mov_read_trun(MOVContext *c, AVIOContext *pb, MOVAtom atom) offset = frag->base_data_offset + data_offset; distance = 0; av_log(c->fc, AV_LOG_TRACE, "first sample flags 0x%x\n", first_sample_flags); + + if (st->nb_index_entries) + last_dts = st->index_entries[st->nb_index_entries-1].timestamp; + for (i = 0; i < entries && !pb->eof_reached; i++) { unsigned sample_size = frag->size; int sample_flags = i ? frag->flags : first_sample_flags; @@ -4302,6 +4307,7 @@ static int mov_read_trun(MOVContext *c, AVIOContext *pb, MOVAtom atom) int keyframe = 0; int ctts_index = 0; int old_nb_index_entries = st->nb_index_entries; + int index_entry_flags = 0; if (flags & MOV_TRUN_SAMPLE_DURATION) sample_duration = avio_rb32(pb); if (flags & MOV_TRUN_SAMPLE_SIZE) sample_size = avio_rb32(pb); @@ -4338,10 +4344,16 @@ static int mov_read_trun(MOVContext *c, AVIOContext *pb, MOVAtom atom) keyframe = !(sample_flags & (MOV_FRAG_SAMPLE_FLAG_IS_NON_SYNC | MOV_FRAG_SAMPLE_FLAG_DEPENDS_YES)); - if (keyframe) + if (keyframe) { distance = 0; + index_entry_flags |= AVINDEX_KEYFRAME; + } + // Fragments can overlap in time. Discard overlapping frames after + // decoding. + if (last_dts >= dts) + index_entry_flags |= AVINDEX_DISCARD_FRAME; ctts_index = add_index_entry(st, offset, dts, sample_size, distance, - keyframe ? AVINDEX_KEYFRAME : 0); + index_entry_flags); if (ctts_index >= 0 && old_nb_index_entries < st->nb_index_entries) { unsigned int size_needed = st->nb_index_entries * sizeof(*sc->ctts_data); unsigned int request_size = size_needed > sc->ctts_allocated_size ?