From patchwork Sun Aug 2 06:41:28 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Martin_Storsj=C3=B6?= X-Patchwork-Id: 21444 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id DB1784429A9 for ; Sun, 2 Aug 2020 09:48:18 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B391B68BB26; Sun, 2 Aug 2020 09:48:18 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f172.google.com (mail-lj1-f172.google.com [209.85.208.172]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7B00D68BA89 for ; Sun, 2 Aug 2020 09:48:12 +0300 (EEST) Received: by mail-lj1-f172.google.com with SMTP id 185so26214550ljj.7 for ; Sat, 01 Aug 2020 23:48:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=martin-st.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references; bh=W6BLK9psWt3+IoBrckeqonOjvq7G9u9fOQAUP+g5niw=; b=DnK8XhDYY7l1GIG/hxuRR4VGLcVaaYguhd6C50GCEsgFbgRCa3gyZHfW6IUxLSKp1Z LFeDoTpkSeLyWsYW5tUw8qTmYEtNY4Pz4CPXgjZ5jUgWSx6ky/RhgKoOe9OxfXuC82eY nQcalPhF0YL72RqApTR+WFnMc8nMUmVUNMjlxx4UC2irRfzW1q66xRDAd67M+QBRiXGT CGzbJf35S5vGyB/JNK1LDdslAUiwav06h078CPFxQ0lKVXE0ODnNTiW88qkAvyUfxwVX sANFYLHwBXsrVSb3CtN8LmwbGSLYgJA5lTDZahRVaA0kjBzQqLKzLj2NX5RZmbB/u687 fb5Q== 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; bh=W6BLK9psWt3+IoBrckeqonOjvq7G9u9fOQAUP+g5niw=; b=pWLDJgZYlOnOq4iEKHfBIxZBeMd7kdcwO8fgZOHtAxDVKPyU15oS0VYa8fICp3r1jW bEkNVsuQ5raRexXp4PnJBzi11ni4Bz5kiq19has1aV0PgJo0rAjiCDnVl2ZeDc/bNRVc +UgBO2Ch/wN3bCqloxihVZfBV+K9J54xmtOFD4OR1J7siY3sXUWufgNHLarzVhgKX+KN ZmloaXlKgHhOrxGH2hkKgxdttW0cWB5QlLHAKJrsFYHhe3kYyWFCu6NTv4GH2pBo/Iuz Wmd2x6UHtfXzcWIDsfD0B7zvcNd2X6awJthHxgCXlQgdDnVbM5qlf1fY1OjEp5uEGboQ lIpQ== X-Gm-Message-State: AOAM533dSABBkbxt3f8pv7feYlHbp2lfptmR1xMMlHQjDeZbS/RBY1Vc G+qnlrffCB9G7hY72yf6FvCRPCsT1y4= X-Google-Smtp-Source: ABdhPJzF/1G7Agg0xXoLl0hutudaA/ZFB3eFh8PN/dMK5RjZjdeEJqG+Mbi7f8fdlSrl7vAHBA3uFg== X-Received: by 2002:a2e:98d5:: with SMTP id s21mr4800969ljj.59.1596350492245; Sat, 01 Aug 2020 23:41:32 -0700 (PDT) Received: from localhost.localdomain (dsl-tkubng21-58c01c-243.dhcp.inet.fi. [88.192.28.243]) by smtp.gmail.com with ESMTPSA id c4sm1344402ljk.70.2020.08.01.23.41.31 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 Aug 2020 23:41:31 -0700 (PDT) From: =?utf-8?q?Martin_Storsj=C3=B6?= To: ffmpeg-devel@ffmpeg.org Date: Sun, 2 Aug 2020 09:41:28 +0300 Message-Id: <20200802064128.15055-3-martin@martin.st> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200802064128.15055-1-martin@martin.st> References: <20200802064128.15055-1-martin@martin.st> Subject: [FFmpeg-devel] [PATCH 3/3] test: hlsenc: Use unique init/segment file names for the fmp4_ac3 test 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Previously, the hls-fmp4 and hls-fmp4_ac3 tests used the same file names for init and segment files, which occasionally could cause corruption and failed tests, if the input files for both tests are generated in parallel, as they could overwrite each other. This happened to work some of the time, as the fmp4_ac3 test actually only checked the init segment file (which the fmp4 test case never wrote, due to using the incorrect hls_segment_type option) and the fmp4 test case always regenerated the input files due to mismatched target and file names. --- tests/fate/hlsenc.mak | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/fate/hlsenc.mak b/tests/fate/hlsenc.mak index a57450cd7c..b3e87c0542 100644 --- a/tests/fate/hlsenc.mak +++ b/tests/fate/hlsenc.mak @@ -101,13 +101,13 @@ tests/data/hls_fmp4_ac3.m3u8: TAG = GEN tests/data/hls_fmp4_ac3.m3u8: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data $(M)$(TARGET_EXEC) $(TARGET_PATH)/$< \ -stream_loop 4 -i $(SAMPLES)/ac3/monsters_inc_5.1_448_small.ac3 -c copy -map 0 \ - -hls_segment_type fmp4 -hls_fmp4_init_filename now.mp4 -hls_list_size 0 \ - -hls_time 2 -hls_segment_filename "$(TARGET_PATH)/tests/data/hls_fmp4_%d.m4s" \ + -hls_segment_type fmp4 -hls_fmp4_init_filename now_ac3.mp4 -hls_list_size 0 \ + -hls_time 2 -hls_segment_filename "$(TARGET_PATH)/tests/data/hls_fmp4_ac3_%d.m4s" \ $(TARGET_PATH)/tests/data/hls_fmp4_ac3.m3u8 2>/dev/null FATE_HLSENC-$(call ALLYES, HLS_DEMUXER EAC3_DEMUXER) += fate-hls-fmp4_ac3 fate-hls-fmp4_ac3: tests/data/hls_fmp4_ac3.m3u8 -fate-hls-fmp4_ac3: CMD = probeaudiostream $(TARGET_PATH)/tests/data/now.mp4 +fate-hls-fmp4_ac3: CMD = probeaudiostream $(TARGET_PATH)/tests/data/now_ac3.mp4 FATE_SAMPLES_FFMPEG += $(FATE_HLSENC-yes) fate-hlsenc: $(FATE_HLSENC-yes)