From patchwork Mon Nov 13 16:09:30 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stebbins X-Patchwork-Id: 6030 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp2266960jah; Mon, 13 Nov 2017 08:09:57 -0800 (PST) X-Google-Smtp-Source: AGs4zMZdXFkiR3P4dJVsZucEIAnK7Co+cLfFeThOH9wDqPyZ1RYkyLPXA/KCYW6H4zX8jGB5xl+E X-Received: by 10.28.11.138 with SMTP id 132mr6949474wml.89.1510589397867; Mon, 13 Nov 2017 08:09:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1510589397; cv=none; d=google.com; s=arc-20160816; b=Jclh3AMvKpT4AmMKnbvpPPj2vAV2UXskMUWKBoMiRNTV3mCkyPxKVnhW07PenxQ0cc apgzQ7chgnMOLAN8v/4p7aNSvApnsRemfesHsYK9cETAIs3hnIMoIBXiuoSUE92T7p9r 5P1Q83ODR1prxBmLNYO6sxPWWMAReEFQPz/TVyM3/8RcvMiymZgRzuT3LLOVirVZy1g5 vgfWfkYzhbNRBGyfcCZFfwIUZi8hVbHpP8k86p77g/NZU37LbqD4sdmQHPH5IPvnKVsB +UHPr+MPk28Bji9dm+3ZmW/XWiD9qH088dFnXACFK5CP0natmN5VdBcQAcvCXekc3U7O Kliw== 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:references:in-reply-to:message-id :date:to:from:delivered-to:arc-authentication-results; bh=e67D54qI8R5mT7AMZa+5xNUVvnsAzjn0x+YenNdDQo0=; b=OmvjgEfexd/LuFzAQe8Oz91A4M2pril+gr2SHarx7ZGLiWEdbfwAQfD0MindKgDfzo BugA28gDzXllXpR5N9KxZ8ZoQRvyaBX7JdrOqKR4bmEKDlbeR66PgWKAXkrD6zX3/T0o Tc65vIdtzSBEWgSbla+vIMw5Xfoq1G942yQptV5dUvcSr21v4OJJNkP6k0jBG6pDizwy hptXi70BmY2ZQmo5zQ+kYspFtUmGDsWpmCX6Mmo2pwvt/gGlZ1FP2WK7ncQ+zWQZq9KN 8mJmauvi23MGemDGxKxP7iFUGwNSL3PtY/xcCGzQ6VOY7OU3HsB3ntZu3cYgbv02l33k Xgog== 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 e6si12636070wrd.79.2017.11.13.08.09.57; Mon, 13 Nov 2017 08:09:57 -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; 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 42F7668A553; Mon, 13 Nov 2017 18:09:41 +0200 (EET) 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 693EB68A545 for ; Mon, 13 Nov 2017 18:09:34 +0200 (EET) 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; Mon, 13 Nov 2017 08:09:45 -0800 Received: from dionysus.jetheaddev.com (localhost [127.0.0.1]) by dionysus.jetheaddev.com (8.15.2/8.14.7) with ESMTP id vADG9kep014527 for ; Mon, 13 Nov 2017 08:09:46 -0800 Received: (from jstebbins@localhost) by dionysus.jetheaddev.com (8.15.2/8.15.2/Submit) id vADG9khT014526 for ffmpeg-devel@ffmpeg.org; Mon, 13 Nov 2017 08:09:46 -0800 From: John Stebbins To: Date: Mon, 13 Nov 2017 08:09:30 -0800 Message-ID: <20171113160930.14342-2-jstebbins@jetheaddev.com> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20171113160930.14342-1-jstebbins@jetheaddev.com> References: <20171113160930.14342-1-jstebbins@jetheaddev.com> MIME-Version: 1.0 X-Originating-IP: [10.13.12.63] Subject: [FFmpeg-devel] [PATCH] fate/mov: add test for overlapping fragments 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" --- tests/fate/mov.mak | 4 ++ tests/ref/fate/mov-frag-overlap | 105 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 109 insertions(+) create mode 100644 tests/ref/fate/mov-frag-overlap diff --git a/tests/fate/mov.mak b/tests/fate/mov.mak index 01893a0767..1d20892e2f 100644 --- a/tests/fate/mov.mak +++ b/tests/fate/mov.mak @@ -10,6 +10,7 @@ FATE_MOV = fate-mov-3elist \ fate-mov-gpmf-remux \ fate-mov-440hz-10ms \ fate-mov-ibi-elst-starts-b \ + fate-mov-frag-overlap \ FATE_MOV_FFPROBE = fate-mov-aac-2048-priming \ fate-mov-zombie \ @@ -55,6 +56,9 @@ fate-mov-invalid-elst-entry-count: CMD = framemd5 -flags +bitexact -i $(TARGET_S # i.e. Pts Order: I-B-I fate-mov-ibi-elst-starts-b: CMD = framemd5 -flags +bitexact -i $(TARGET_SAMPLES)/mov/mov_ibi_elst_starts_b.mov +# Makes sure that we handle overlapping framgments +fate-mov-frag-overlap: CMD = framemd5 -i $(TARGET_SAMPLES)/mov/frag_overlap.mp4 + fate-mov-aac-2048-priming: CMD = run ffprobe$(PROGSSUF)$(EXESUF) -show_packets -print_format compact $(TARGET_SAMPLES)/mov/aac-2048-priming.mov fate-mov-zombie: CMD = run ffprobe$(PROGSSUF)$(EXESUF) -show_streams -show_packets -show_frames -bitexact -print_format compact $(TARGET_SAMPLES)/mov/white_zombie_scrunch-part.mov diff --git a/tests/ref/fate/mov-frag-overlap b/tests/ref/fate/mov-frag-overlap new file mode 100644 index 0000000000..265a93d7e6 --- /dev/null +++ b/tests/ref/fate/mov-frag-overlap @@ -0,0 +1,105 @@ +#format: frame checksums +#version: 2 +#hash: MD5 +#tb 0: 1001/24000 +#media_type 0: video +#codec_id 0: rawvideo +#dimensions 0: 640x360 +#sar 0: 1/1 +#stream#, dts, pts, duration, size, hash +0, 0, 0, 1, 345600, bb5e1ec37e1cb5a4ef2399c7b1c0ed08 +0, 1, 1, 1, 345600, 40455fa94b1f3b1cd199f127401fe187 +0, 2, 2, 1, 345600, 9147b59915250de3508f062b45dda499 +0, 3, 3, 1, 345600, bb9b9109ea61622f491c1e2aa21c503e +0, 4, 4, 1, 345600, eaceff4d694212b2eb6abf5e090d7b4c +0, 5, 5, 1, 345600, eaceff4d694212b2eb6abf5e090d7b4c +0, 6, 6, 1, 345600, f04ca4f64e7e990874c7ac9264ebbe65 +0, 7, 7, 1, 345600, f195d115e0ad6d5c240b08226d312cef +0, 8, 8, 1, 345600, 7585f3f325cc82028701fcd2360610e0 +0, 9, 9, 1, 345600, 7585f3f325cc82028701fcd2360610e0 +0, 10, 10, 1, 345600, 4e4a2d2d47881b238c4f423917c29182 +0, 11, 11, 1, 345600, 72609b459bde5644fe5815bb88fa537e +0, 12, 12, 1, 345600, 67569df185a64ec08498d71e94ab0197 +0, 13, 13, 1, 345600, 352e1d41fd8d5fb0a92b722782591066 +0, 14, 14, 1, 345600, f50f96f0ff0ee58ef8577cb9ce218be4 +0, 15, 15, 1, 345600, 9681c998992d20055388ae6c0d4f40e6 +0, 16, 16, 1, 345600, 4cd9c3056c0d1b2d6ed666d2fbabef45 +0, 17, 17, 1, 345600, 88d0c13cff5acb1746e7bb227e7ec81a +0, 18, 18, 1, 345600, 37a15a2d1d055a9c157a82d77cf48328 +0, 19, 19, 1, 345600, f30e43818a41242ca75caec4be7f366d +0, 20, 20, 1, 345600, e0441ca5e4137910ed94ea2d67f506ad +0, 21, 21, 1, 345600, 61cae30cdb5512610ba1ffb7b372be51 +0, 22, 22, 1, 345600, 28832e6ec917fece50ab94f8d6883d4b +0, 23, 23, 1, 345600, 07cfd60c53a4ede0de4f5eba749abae0 +0, 24, 24, 1, 345600, 254b072e2fe7017933738b8d43cd3f2e +0, 25, 25, 1, 345600, aa2ceef866576011653fc9e4add8c852 +0, 26, 26, 1, 345600, d5507e992763f69ef7da06bca2e5e0e4 +0, 27, 27, 1, 345600, 3d7fd83fab12dc9ca1bb5c0d09104174 +0, 28, 28, 1, 345600, 1fdc34d30f94bfa2acd5ab4791b3b6be +0, 29, 29, 1, 345600, a993a348279f71db20e48a879c718096 +0, 30, 30, 1, 345600, b999b6a51b3bdeb99df80aa88f2c43ff +0, 31, 31, 1, 345600, 2c851f444aaf1dd6f149ee8e6e1bdfa4 +0, 32, 32, 1, 345600, a50301d48d283e9881d142cd87128d86 +0, 33, 33, 1, 345600, 0ddffa560c6310a2ad1cb534336472ac +0, 34, 34, 1, 345600, 5f5565daeb737f3543a5d07ff9115d4a +0, 35, 35, 1, 345600, 91640f9887d074221e4e08f9a97a938b +0, 36, 36, 1, 345600, bc01f13d5c73a92895ca2ad13209628a +0, 37, 37, 1, 345600, 9750f282817c6df143565e2f57f9f85f +0, 38, 38, 1, 345600, a1803a3ce342d25b45f913cc8b9fe961 +0, 39, 39, 1, 345600, 4a0ae00d4e9df52c7df5bfb08236ae96 +0, 40, 40, 1, 345600, 819b12f2f7356b296bffd39e85c9b6be +0, 41, 41, 1, 345600, 40a5af89bff4b10a10d0a51ab5eeb4e0 +0, 42, 42, 1, 345600, 454a9b71be88d3c026cb7239988f3e37 +0, 43, 43, 1, 345600, c653e9c9d64c9495b764b0a6eb3bfbc9 +0, 44, 44, 1, 345600, 6a4facbf8e14ff6177fd4b0f6f659180 +0, 45, 45, 1, 345600, 843d5b77042e347c3d21d113ba2993fb +0, 46, 46, 1, 345600, 284785e924efba8ab17e6e1f75329287 +0, 47, 47, 1, 345600, 4f2b2d0f3dc4ad165e0bc56560930d49 +0, 48, 48, 1, 345600, 71154e17c2f5c316272e8904ef61c0bc +0, 49, 49, 1, 345600, 6b10588be4540b5dbbd765db406b8723 +0, 50, 50, 1, 345600, aaf62a95b621c8de2dca22f78594b8c7 +0, 51, 51, 1, 345600, bb508b634416287baf4406f70ca3693d +0, 52, 52, 1, 345600, 0551149846fca1ae1d164a7a7c64439f +0, 53, 53, 1, 345600, c3fad13ac1643744c4ea194763ae6cf7 +0, 54, 54, 1, 345600, 4c487adf3ec204c041a50cbf82abd8e8 +0, 55, 55, 1, 345600, dc48539225f4dc05588995d4288c71d0 +0, 56, 56, 1, 345600, be005c4f81422a775fc909dcee84094d +0, 57, 57, 1, 345600, a374c2ed0e644f03cbb8cd5456877cbb +0, 58, 58, 1, 345600, 9b7d5fac577cf0d82e11551cd9b280db +0, 59, 59, 1, 345600, c1d0551bc5cd1f53133e30ed811d8032 +0, 60, 60, 1, 345600, 6ab563cf2df92a2e9e1b8b90c0e0ec07 +0, 61, 61, 1, 345600, 19dadbe3c3638578fe8a3ed3f730858e +0, 62, 62, 1, 345600, e9810a12f7c14c4b8305a418e4bc3055 +0, 63, 63, 1, 345600, d45d74535cd471949238716bdc12c16f +0, 64, 64, 1, 345600, d1c2c19d0aba4170fe1a03f9c10b6863 +0, 65, 65, 1, 345600, 047c7fbfcce41fcaec6f1e1686db0429 +0, 66, 66, 1, 345600, 4adc1aa1017880f6baf4786ecd2c8ddb +0, 67, 67, 1, 345600, 90bad80d9e6c75784423f74984e40dd2 +0, 68, 68, 1, 345600, feb378d740e1e5f9312bf68c047040c3 +0, 69, 69, 1, 345600, 28b1de125fd6f6a9d42eb42300be7a3f +0, 70, 70, 1, 345600, 495043e65515c790c1fe026c9d2c0a49 +0, 71, 71, 1, 345600, fa6d5062932e7fc11fbfe31349ecbbfd +0, 72, 72, 1, 345600, 897952d332218f2dab7d760b2d2076eb +0, 73, 73, 1, 345600, 79dfce7ac29b96ef23c7f648e87a3e0b +0, 74, 74, 1, 345600, 94d11a85dc32b4693048a39a6227919b +0, 75, 75, 1, 345600, f9c149dbdc71c60f146cf68a673102d5 +0, 76, 76, 1, 345600, febddbb90b3f37cb29b07102575d844f +0, 77, 77, 1, 345600, b9e5cdfa63c2637f2204dcb885608bb9 +0, 78, 78, 1, 345600, 051773f40a3749b54c5a802f8a97128f +0, 79, 79, 1, 345600, 5fed52a298b8eef94ebe21c03313a5d7 +0, 80, 80, 1, 345600, f8a447cd738ec587fbacde061db51be5 +0, 81, 81, 1, 345600, 474cfd0529c0a5daffdcaed5183ee583 +0, 82, 82, 1, 345600, b0dd2ddd7037e70e774a7b3baad0b094 +0, 83, 83, 1, 345600, 86622696017283d3ce98e71d10f89f75 +0, 84, 84, 1, 345600, 20d6ae8b4dcf75ab31cc1f00002298ca +0, 85, 85, 1, 345600, a882528cd387fb3a55d6e184a33fe2c9 +0, 86, 86, 1, 345600, 6bfcb539ce16f3db0d7f24dab6166913 +0, 87, 87, 1, 345600, 6bfcb539ce16f3db0d7f24dab6166913 +0, 88, 88, 1, 345600, 3bde52ee85883e4f353d4736a47b3874 +0, 89, 89, 1, 345600, 6f20835eb29f824d6a3e1be0ce772f08 +0, 90, 90, 1, 345600, 7b99b15c1b8fbe0e643b75fda7b17b04 +0, 91, 91, 1, 345600, f0139cd28a0030d611d60e9d28837af0 +0, 92, 92, 1, 345600, f0139cd28a0030d611d60e9d28837af0 +0, 93, 93, 1, 345600, adf0a37ad23c38b54c7394871c876468 +0, 94, 94, 1, 345600, f0bd37bcb8299e90efd05a0e01c84029 +0, 95, 95, 1, 345600, 8a9d76bc611731eabc29bbf231e21528