From patchwork Sun Aug 2 06:41:26 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: 21446 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 5FF2844B2F5 for ; Sun, 2 Aug 2020 10:06:55 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 236F468BB3A; Sun, 2 Aug 2020 10:06:55 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f45.google.com (mail-ed1-f45.google.com [209.85.208.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CA4AC68BB01 for ; Sun, 2 Aug 2020 10:06:48 +0300 (EEST) Received: by mail-ed1-f45.google.com with SMTP id o10so15392504edh.6 for ; Sun, 02 Aug 2020 00:06:48 -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; bh=uIY2o7HcUq7aaowUEDbHuLEwHzWOgskBqvhoDU1r6IY=; b=f48YExu2pS7+LAd+6eJ1skRBEhDweyM6nCZl6Tjapg8mD5z+0rgo2LaMmANGBS2n19 oODpG6Y56Bj9+FKgyxa3SXo7eGSSbxexPdYiJHjFnH8LCMnzCiFjYc/gmNLCMTC5ineV Y3eAh0BOB8YNmGQ91EPOmLbifTUskKdPiIeTxgYfIvB0rnyDR+19EOqOjERg/BDM+saC OsdiK6OicSvT/szD1qJ8EgI9V0wa7cOoORVf0bH3lldoEJRxaOAltg09DelmIG5F/52Z 9pC0Iere4XYBvfMefm0Bl0JRwG5hNOWPty0NUpfzYVd9kM2slrcLjBjd43Y/Y3gdlA4z xgCA== 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; bh=uIY2o7HcUq7aaowUEDbHuLEwHzWOgskBqvhoDU1r6IY=; b=nrYVRfgVM+mEBJB8fUr16R7wPnhdfHZqzE/Ruo7K2VrWnmDvs1OQNLFaToS3ffBxju JDSw446Z/crXwJTVliJSgup6h0sUsj+P00VRTTWD3X5AAfuXLQlo+0XuwQ1MPdJcevH9 hLRwKNKJidxERCMiZn3FDyKqnenu440kI1z2feY2AiXS/l9WFb56ZztSwtoX+WPRVdnO BpCTg5k1PU6xXmTpdoPbaIQTCgl8ok8E9a8qfSFj8edST0pIZz1cpvEyyxUlIeWkf4GF ZCwDAPydu48NIvsYXerv/GD6HKgivb6K1lJ6OPiQEnz494PTnFRhQV7TUWYObKOpS1Xo gYwA== X-Gm-Message-State: AOAM530lN7cyujORxLV60vS8eniCwdvd1d1sgjQbVzM8WGRHu1J9/SXK vEhs4ruyKPCB9T2il6JWn4mUi8K+oeE= X-Google-Smtp-Source: ABdhPJxMa+C7Yn8P9/SdllCQCYHpdK7ek7YNQ/ihm6By1Zso2Pm0Alj4at+A0U5ic6Y1JWh3vnt0Xg== X-Received: by 2002:a19:7d04:: with SMTP id y4mr5719846lfc.51.1596350490530; Sat, 01 Aug 2020 23:41:30 -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.29 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 Aug 2020 23:41:29 -0700 (PDT) From: =?utf-8?q?Martin_Storsj=C3=B6?= To: ffmpeg-devel@ffmpeg.org Date: Sun, 2 Aug 2020 09:41:26 +0300 Message-Id: <20200802064128.15055-1-martin@martin.st> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH 1/3] test: hlsenc: Make the hls_fmp4 sample file name match the target 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, with the file name not matching the target, the files were regenerated every time fate is rerun - contrary to the other test targets in the same file. (While regenerating it every time might be desireable, as that's what the test is about, the file at least has a dependency on the ffmpeg executable, making them regenerated every time the executable is updated - and this change at least makes it consistent with the rest.) --- 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 c56a541f43..d4ce26457d 100644 --- a/tests/fate/hlsenc.mak +++ b/tests/fate/hlsenc.mak @@ -85,8 +85,8 @@ FATE_HLSENC-$(call ALLYES, HLS_DEMUXER MPEGTS_MUXER MPEGTS_DEMUXER AEVALSRC_FILT fate-hls-list-size: tests/data/hls_list_size.m3u8 fate-hls-list-size: CMD = framecrc -flags +bitexact -i $(TARGET_PATH)/tests/data/hls_list_size.m3u8 -vf setpts=N*23 -tests/data/hls_segment_type_fmp4.m3u8: TAG = GEN -tests/data/hls_segment_type_fmp4.m3u8: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data +tests/data/hls_fmp4.m3u8: TAG = GEN +tests/data/hls_fmp4.m3u8: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data $(M)$(TARGET_EXEC) $(TARGET_PATH)/$< \ -f lavfi -re -i "aevalsrc=cos(2*PI*t)*sin(2*PI*(440+4*t)*t):d=5" -map 0 -codec:a mp2fixed \ -hls_segment_type mpegts -hls_fmp4_init_filename now.mp4 -hls_list_size 0 \ @@ -94,7 +94,7 @@ tests/data/hls_segment_type_fmp4.m3u8: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data $(TARGET_PATH)/tests/data/hls_fmp4.m3u8 2>/dev/null FATE_HLSENC-$(call ALLYES, HLS_DEMUXER MPEGTS_MUXER MPEGTS_DEMUXER AEVALSRC_FILTER LAVFI_INDEV MP2FIXED_ENCODER) += fate-hls-fmp4 -fate-hls-fmp4: tests/data/hls_segment_type_fmp4.m3u8 +fate-hls-fmp4: tests/data/hls_fmp4.m3u8 fate-hls-fmp4: CMD = framecrc -flags +bitexact -i $(TARGET_PATH)/tests/data/hls_fmp4.m3u8 -vf setpts=N*23 tests/data/hls_fmp4_ac3.m3u8: TAG = GEN