From patchwork Sat Sep 23 15:44:45 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Jan_Ekstr=C3=B6m?= X-Patchwork-Id: 5246 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.36.26 with SMTP id f26csp781017jaa; Sat, 23 Sep 2017 08:51:19 -0700 (PDT) X-Received: by 10.28.217.73 with SMTP id q70mr6734255wmg.9.1506181879220; Sat, 23 Sep 2017 08:51:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1506181879; cv=none; d=google.com; s=arc-20160816; b=0U5uoR8a3kVcWLA4UEPWuacxkyKkYtJitFKpvXjJ9YtftxBo+qne2mmLEStilZ2A19 X2SyVfFCmONccagxS9gH19JSx+IMtVXF20iB10LKTEVz79GTCyKhTsAaxk4G2Z/gvxDg dW+uxPKS5C+nhrTj5WkpvU4p321mFl5rQB58TGPA4284JpjCZ9WRpIKZD+LhLutcILfM e/CQprgQYXrLlmFlVYZgv5nfr1Cd3rslJSB1GYfLzEiSqPcGcRu9N8qUDFTYI8Co1ofN /fQJXDQN4eWmoIuJTRzKZVJusaHrTxK+UTMYcVLFt32nNSPoXoPfyTzwUBKnITiKhCFh zPwA== 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:dkim-signature:delivered-to:arc-authentication-results; bh=RT+Cyj6THZRAJErsXx2DIFUmStlWRtJTO5fNCCnM4jU=; b=EetnjyHQsEfCXU/Ppayd+hTST8YvGAmIRyWa0VWUv6cS5tzs8oNPwAW/atH/psNHjE 4V629txyY+7PMsKfol9YfhxKpTFDEiMON3Pukt2N0hEUo8oFgZYE5Kdp4jdcppQ78aQy 67ZJ5e0hQ9j4KZJQGQ7DzzyghKtLvKNvr0UYR1IUUtEuGyddjvhEU6ORZ2JQ83i8vJeN DWUL4l6zMWID6/uCxaXoMNSeMLjIF4BTnEz5cZucT9e7gqLZxrHU/t3PDFmAXBu7sUtR By0D6fpzSNJ/y6dSY2j9P4CrMSICs02sFjZPJKRZEnmJ5krSo8EYA2SN1rOAETedjzyK VLYA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=QAtgqNCD; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id r13si1694127wrg.462.2017.09.23.08.51.18; Sat, 23 Sep 2017 08:51:19 -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=@gmail.com header.s=20161025 header.b=QAtgqNCD; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7E2F66807A8; Sat, 23 Sep 2017 18:51:06 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f194.google.com (mail-wr0-f194.google.com [209.85.128.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5A047680533 for ; Sat, 23 Sep 2017 18:51:00 +0300 (EEST) Received: by mail-wr0-f194.google.com with SMTP id b9so2022369wra.0 for ; Sat, 23 Sep 2017 08:51:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=zqWs0gGoUF614yYOuX2G/YTLwAetVB0yNyfijNh3qZs=; b=QAtgqNCDEz4SHysXepXUcqzy716NFyaeAcfjDPHoLy2i0FtEhMzuDGneRqd3eKruoR XQu2lBf3gGhBzLhdcwIiaUhBIqBnQzLCFWVAFThuv/deIoFpuJEnjRqREp0+NeCovKez gGvegmjiwvB2jgZ/b57/a0/EOUvaD8+IbEHtW26EDlxFJoJrqZo2eDI9JSpmzq07RVCM zy9yNDwseMsiz1VO15PV1yIrjjFVJ5cNYiDykAB8/Kpm5odYs+tNsXq/Mpk3Xw+WnUmA QgEGGiXk44xDLpVYQFq+RuvTLTVMaJNjmtIbsQ+9FPaAHwrKDPLNZdvm+ycUjltqw/vN LBBg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=zqWs0gGoUF614yYOuX2G/YTLwAetVB0yNyfijNh3qZs=; b=Bb3be/C88786EKiFoOqaXL8VG5Y65cEHKE059bGL6iy3VDFEYReBK/EYQS8wPgzAxM R02QPYosXAOEb2oqwRw8mVMYeKGeI5P8rMtheVfRPT/aXdZ8a/6t5yVOEyf5lOl79+oZ 0eTq+iNMON7sp9V4ffup5c7KWNvO3SxkcEAvEGAVVQNWHICtpFv3SPJOkD7H/EBSrDKq jNF31zNjQGMQuueYRnI8AqxXFzL6sBB65z18W2pis8vSInnXBZmypjetzRhdKFy+la8V dKk3wT6uMJ0EUpcUrUgBCaL3l65lqm+I9ii0/02Sw5ZjMt5mXMhfziv0c4PYR8ZO6p22 I+rg== X-Gm-Message-State: AHPjjUjx0ZtGzicadROvwH5T2v2qywq0DmPEGfVj/ejHf8QvePUj6Xhq 4FKqhyLvBPD0hmvCfxQNuj/LUcNO X-Google-Smtp-Source: AOwi7QBR/kIvf2pqG0SXkAt02vCqslrl0onMlFunN4X9QAa6xsvoGrLGr27yw4cmh3zl3xTIj45j1A== X-Received: by 10.223.170.202 with SMTP id i10mr2188727wrc.232.1506181487509; Sat, 23 Sep 2017 08:44:47 -0700 (PDT) Received: from saten.42.fr ([62.210.32.10]) by smtp.gmail.com with ESMTPSA id q140sm2309045wmd.3.2017.09.23.08.44.46 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 23 Sep 2017 08:44:47 -0700 (PDT) From: =?UTF-8?q?Jan=20Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Sat, 23 Sep 2017 18:44:45 +0300 Message-Id: <20170923154445.9716-2-jeebjp@gmail.com> X-Mailer: git-send-email 2.13.5 In-Reply-To: <20170923154445.9716-1-jeebjp@gmail.com> References: <20170923154445.9716-1-jeebjp@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] movenc-test: Add tests for negative cts offsets 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" From: Martin Storsjö Signed-off-by: Martin Storsjö --- libavformat/tests/movenc.c | 19 +++++++++++++++++++ tests/ref/fate/movenc | 11 +++++++++++ 2 files changed, 30 insertions(+) diff --git a/libavformat/tests/movenc.c b/libavformat/tests/movenc.c index 7a66395efd..8e59b74259 100644 --- a/libavformat/tests/movenc.c +++ b/libavformat/tests/movenc.c @@ -766,6 +766,25 @@ int main(int argc, char **argv) clear_duration = 0; do_interleave = 0; + // Write a fragmented file with b-frames and audio preroll, + // with negative cts values, removing the edit list for the + // video track. + init_out("delay-moov-elst-neg-cts"); + av_dict_set(&opts, "movflags", "frag_keyframe+delay_moov+negative_cts_offsets", 0); + init(1, 1); + mux_gops(2); + finish(); + close_out(); + + // Write a fragmented file with b-frames without audio preroll, + // with negative cts values, avoiding any edit lists, allowing + // to use empty_moov instead of delay_moov. + init_out("empty-moov-neg-cts"); + av_dict_set(&opts, "movflags", "frag_keyframe+empty_moov+negative_cts_offsets", 0); + init(1, 0); + mux_gops(2); + finish(); + close_out(); av_free(md5); diff --git a/tests/ref/fate/movenc b/tests/ref/fate/movenc index 47bcf9d515..872796ebce 100644 --- a/tests/ref/fate/movenc +++ b/tests/ref/fate/movenc @@ -140,3 +140,14 @@ write_data len 668, time 1566667, type sync atom moof write_data len 440, time 2233333, type boundary atom moof write_data len 262, time nopts, type trailer atom - edd19deae2b70afcf2cd744b89b7013d 4209 vfr-noduration-interleave +write_data len 1231, time nopts, type header atom ftyp +write_data len 916, time 0, type sync atom moof +write_data len 908, time 1000000, type sync atom moof +write_data len 148, time nopts, type trailer atom - +781dbfd228f36903178e29faa727d78b 3203 delay-moov-elst-neg-cts +write_data len 36, time nopts, type header atom ftyp +write_data len 1123, time nopts, type header atom - +write_data len 1188, time 0, type sync atom moof +write_data len 908, time 1033333, type sync atom moof +write_data len 148, time nopts, type trailer atom - +7630fdf358e02c79e88f312f82a260b7 3403 empty-moov-neg-cts