From patchwork Wed Nov 1 21:26:45 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasi Inguva X-Patchwork-Id: 5824 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.90 with SMTP id m26csp1258803jah; Wed, 1 Nov 2017 14:27:13 -0700 (PDT) X-Google-Smtp-Source: ABhQp+QAvzUekMxdtC0tgWeRu1LIpNDTjJmy7gfzuU95FPqBJz424SWY71jYhfhY9FGy/kDisS3N X-Received: by 10.28.125.206 with SMTP id y197mr1295886wmc.85.1509571633777; Wed, 01 Nov 2017 14:27:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1509571633; cv=none; d=google.com; s=arc-20160816; b=hDbNO8QtAZSaNIh/Z2VST3eCi32pKf1U99hZOFYbpyelf0u6LNJeX8xpLUMMRaAlgG ZIK0XjXGhaOTJ8yiJGeXK9IsiU5N+B1ZKRevFe8HQuNqmxkPxVYKDe4ZClurUVM8rJz9 OgqVqAZeeSY5TTw2oDrmq27gtxghV6JWFZt+8BLcJoyrdd+bSm4jkdJtOiFRf0fVxh+S VX2YqBzd3ad5RAeAuHg3dlUUECfu2kAsO8UZ9mgV7oi9nQh3mpQ5Vc5WK+QQZuXiEcKi fdvtLCAhWXrvnXHORN1j0hzCEaxFfkgpV8AHdGkOVYOcanAI8o2eassoCRIft3P3sTcM 5P6w== 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:cc: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:dkim-signature:delivered-to:arc-authentication-results; bh=fQETfH3doxyDDZRTGS83cbf5ec5NcEKAWOJHHJXwo3k=; b=tETWkxoVY4ph7M85Y5Jnmhh2x+b4RRzbD5tE7WiyFa2Ghw9Hi07dX7MgPDc9X/JP1H 4ZW5pCEj58s7uQ/PgjnGaVVvEOR4/UQU4vRLklHQayxvsimqJzXBVntk1rVDK4uo4o4R TjzQm9hUafSZA0eAqt7ZiTuupHO6+/gSyNgj9NLb42S22/j1KfLiY3bzLLc4XUF5g4T0 L99DqkRGsu5KKF/7u0lmRHQmWrLfOhlUCTHG1RwuZO1AK2nkI8GxUGn9XFj2Leck/afY E4GUml76VzuYlnpPkXKIl6y93u1EnZKWDQvl6+sFRgZVIeje/iW7QkG1MaDgR4SEp6Aj YnrA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@google.com header.s=20161025 header.b=tCTp2IhE; 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 x63si1510208wma.79.2017.11.01.14.27.13; Wed, 01 Nov 2017 14:27:13 -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 header.s=20161025 header.b=tCTp2IhE; 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 773BC68A263; Wed, 1 Nov 2017 23:27:02 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-io0-f195.google.com (mail-io0-f195.google.com [209.85.223.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D914468A248 for ; Wed, 1 Nov 2017 23:26:55 +0200 (EET) Received: by mail-io0-f195.google.com with SMTP id p186so9200772ioe.12 for ; Wed, 01 Nov 2017 14:27:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=BLg5xCveYIVPwSu1k1Lt7wgRUcs7tIs8zdnoZO2xUEA=; b=tCTp2IhEotQ9VDsw6r+HX4grmNcIq2uymkApGLCO5OKGDR0aqu8uMUmCDQi0OEfKM2 HULcODkqJ6+h6izwVa0q6O1bE1ACsN3fG8ZGtFFmHkvOB1EIMVzBTFREHyFaGvLCppw7 wQZTanZIqK3Lef/NChQAuEERr6IdnlmXEX/WSyiokj49CUOtKf9KJGs2GNO4YCkdg/hK 92qvYPYqg9xh0lKtHxeYKToXqPQjgfQ2n+dMsYGrrQvhmB8QK92rJjoFSHjyj0lQB9p0 gQ6qGdziSR+5Z3+3QmF6YwiCDqd47nsvf78rGFsAGnhqiLomeHuP4BSAG+V0lPn5MhMZ 5e0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=BLg5xCveYIVPwSu1k1Lt7wgRUcs7tIs8zdnoZO2xUEA=; b=ZHNpw6NDWyoxSOdGuUXxp8uABr6kUn83/uBmLTZQhvfKa9wV4XWcnOQTRdIQgv1e8Z srnQukuHcoR0+6/cFuKNC95rOdI+ZZ7ri6kYQIk/ai1h59yjbVONWr4eaETPjyggIBPQ 55putlcuWiZ2KeZR+j2FMJE1jsZC7IDWn2u2hOVa7nWpjrSiVdmBgU83VmUh5i5CvK7l SuxJzDpSdcFkAg1dPy05zzpsF/THV6ZMsnOUWV6/7o6yfA48sVUvykeE/UDqtQiBeEeH SG8Dg+DxYIR+V369kVY0pyt8NHddm5IxSTe+ah06K0WyfB/TR+Df3BO8tYwwS83bG6jz Ua+A== X-Gm-Message-State: AJaThX7WjFiG7MN8P4z2/M7ZcfdlaLqIkiInw9C3tAFw/mCWWakhoUSV DcnTWOvuII5M1whS8PtvH0ioo16xL0g= X-Received: by 10.107.155.17 with SMTP id d17mr1637634ioe.220.1509571624293; Wed, 01 Nov 2017 14:27:04 -0700 (PDT) Received: from isasi.mtv.corp.google.com ([172.27.82.28]) by smtp.gmail.com with ESMTPSA id e77sm860551itc.25.2017.11.01.14.27.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 01 Nov 2017 14:27:03 -0700 (PDT) From: Sasi Inguva To: ffmpeg-devel@ffmpeg.org Date: Wed, 1 Nov 2017 14:26:45 -0700 Message-Id: <20171101212645.12284-1-isasi@google.com> X-Mailer: git-send-email 2.15.0.403.gc27cc4dac6-goog In-Reply-To: References: Subject: [FFmpeg-devel] [PATCH] lavf/mov.c: Parse upto 2 keyframes after the edit list end in mov_fix_index. 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" Partially fixes t/6699. --- libavformat/mov.c | 32 ++++++++++++++++++++----------- tests/fate/mov.mak | 4 ++++ tests/ref/fate/mov-elst-ends-betn-b-and-i | 31 ++++++++++++++++++++++++++++++ 3 files changed, 56 insertions(+), 11 deletions(-) create mode 100644 tests/ref/fate/mov-elst-ends-betn-b-and-i diff --git a/libavformat/mov.c b/libavformat/mov.c index 60f0228e2d..e716e5ba9e 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -3232,6 +3232,7 @@ static void mov_fix_index(MOVContext *mov, AVStream *st) int packet_skip_samples = 0; MOVIndexRange *current_index_range; int i; + int found_keyframe_after_edit = 0; if (!msc->elst_data || msc->elst_count <= 0 || nb_old <= 0) { return; @@ -3347,6 +3348,7 @@ static void mov_fix_index(MOVContext *mov, AVStream *st) // Iterate over index and arrange it according to edit list edit_list_start_encountered = 0; + found_keyframe_after_edit = 0; for (; current < e_old_end; current++, index++) { // check if frame outside edit list mark it for discard frame_duration = (current + 1 < e_old_end) ? @@ -3459,18 +3461,26 @@ static void mov_fix_index(MOVContext *mov, AVStream *st) } // Break when found first key frame after edit entry completion - if (((curr_cts + frame_duration) >= (edit_list_duration + edit_list_media_time)) && + if ((curr_cts + frame_duration >= (edit_list_duration + edit_list_media_time)) && ((flags & AVINDEX_KEYFRAME) || ((st->codecpar->codec_type == AVMEDIA_TYPE_AUDIO)))) { - - if (ctts_data_old && ctts_sample_old != 0) { - if (add_ctts_entry(&msc->ctts_data, &msc->ctts_count, - &msc->ctts_allocated_size, - ctts_sample_old - edit_list_start_ctts_sample, - ctts_data_old[ctts_index_old].duration) == -1) { - av_log(mov->fc, AV_LOG_ERROR, "Cannot add CTTS entry %"PRId64" - {%"PRId64", %d}\n", - ctts_index_old, ctts_sample_old - edit_list_start_ctts_sample, - ctts_data_old[ctts_index_old].duration); - break; + if (ctts_data_old) { + // If we have CTTS and this is the the first keyframe after edit elist, + // wait for one more, because there might be trailing B-frames after this I-frame + // that do belong to the edit. + if (st->codecpar->codec_type != AVMEDIA_TYPE_AUDIO && found_keyframe_after_edit == 0) { + found_keyframe_after_edit = 1; + continue; + } + if (ctts_sample_old != 0) { + if (add_ctts_entry(&msc->ctts_data, &msc->ctts_count, + &msc->ctts_allocated_size, + ctts_sample_old - edit_list_start_ctts_sample, + ctts_data_old[ctts_index_old].duration) == -1) { + av_log(mov->fc, AV_LOG_ERROR, "Cannot add CTTS entry %"PRId64" - {%"PRId64", %d}\n", + ctts_index_old, ctts_sample_old - edit_list_start_ctts_sample, + ctts_data_old[ctts_index_old].duration); + break; + } } } break; diff --git a/tests/fate/mov.mak b/tests/fate/mov.mak index 6815e4feca..e444b1459d 100644 --- a/tests/fate/mov.mak +++ b/tests/fate/mov.mak @@ -9,6 +9,7 @@ FATE_MOV = fate-mov-3elist \ fate-mov-invalid-elst-entry-count \ fate-mov-gpmf-remux \ fate-mov-440hz-10ms \ + fate-mov-elst-ends-betn-b-and-i \ FATE_MOV_FFPROBE = fate-mov-aac-2048-priming \ fate-mov-zombie \ @@ -41,6 +42,9 @@ fate-mov-1elist-ends-last-bframe: CMD = framemd5 -i $(TARGET_SAMPLES)/mov/mov-1e # Makes sure that we handle timestamps of packets in case of multiple edit lists with one of them ending on a B-frame correctly. fate-mov-2elist-elist1-ends-bframe: CMD = framemd5 -i $(TARGET_SAMPLES)/mov/mov-2elist-elist1-ends-bframe.mov +# Makes sure that if edit list ends on a B-frame but before the I-frame, then we output the B-frame but discard the I-frame. +fate-mov-elst-ends-betn-b-and-i: CMD = framemd5 -i $(TARGET_SAMPLES)/mov/elst_ends_betn_b_and_i.mp4 + # Makes sure that we handle edit lists and start padding correctly. fate-mov-440hz-10ms: CMD = framemd5 -i $(TARGET_SAMPLES)/mov/440hz-10ms.m4a diff --git a/tests/ref/fate/mov-elst-ends-betn-b-and-i b/tests/ref/fate/mov-elst-ends-betn-b-and-i new file mode 100644 index 0000000000..ee7c6389ad --- /dev/null +++ b/tests/ref/fate/mov-elst-ends-betn-b-and-i @@ -0,0 +1,31 @@ +#format: frame checksums +#version: 2 +#hash: MD5 +#tb 0: 1/25 +#media_type 0: video +#codec_id 0: rawvideo +#dimensions 0: 320x240 +#sar 0: 1/1 +#stream#, dts, pts, duration, size, hash +0, 0, 0, 1, 115200, 4e5dc2b806e394cd666c968f736fecd0 +0, 1, 1, 1, 115200, 7a3c7473d44c5f60c07655f6fc0c2ac3 +0, 2, 2, 1, 115200, 038254422a603a3270c09cdcd149707b +0, 3, 3, 1, 115200, 7553b6b4547cb23ef8f0392ed5a5d4b0 +0, 4, 4, 1, 115200, 6d017ede7f446124af7308667cb0dc41 +0, 5, 5, 1, 115200, 77752f0288ae64f857732b8e62e47457 +0, 6, 6, 1, 115200, d656833951af99330625f7c6de7685c4 +0, 7, 7, 1, 115200, 14338b833e431e566ac98da841600bfe +0, 8, 8, 1, 115200, 07ea95d1659f3c4424a470a546d0df6e +0, 9, 9, 1, 115200, fd05b8cc83072f813e89d394d1f6efc6 +0, 10, 10, 1, 115200, 750b82ca5c7e901545e7b1aa69692426 +0, 11, 11, 1, 115200, 7347679ab09bc936047368b8caebcaff +0, 12, 12, 1, 115200, 63a23fdd57ac8462b9ffbcb12ab717b3 +0, 13, 13, 1, 115200, 705257a1c99693db233e2a3ee027adcf +0, 14, 14, 1, 115200, df861a2ec7a4ef70e82b1c28025e5a48 +0, 15, 15, 1, 115200, 2a8b403c077b6b43aa71eaf7d1537713 +0, 16, 16, 1, 115200, 973b5cd3ce473e3970dfa96045553172 +0, 17, 17, 1, 115200, fc612c0afeae3b6576b5ee2f3f119832 +0, 18, 18, 1, 115200, 97074fe5a0b6e7e8470729654092e56c +0, 19, 19, 1, 115200, 8cf9337201065335b3aa4da21dc9b37a +0, 20, 20, 1, 115200, 93ff3589294cc0673af3daee1e7fe42a +0, 21, 21, 1, 115200, c0b6fd870a022f374f9d6c697e8e293d