From patchwork Wed Aug 2 07:02:21 2023 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: 43077 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c11f:b0:130:ccc6:6c4b with SMTP id bh31csp463267pzb; Wed, 2 Aug 2023 00:02:32 -0700 (PDT) X-Google-Smtp-Source: APBJJlHn53epiY/l87ytgZshe6YqZJpEEsZeEVt5XE24ZqHnEIr3SxiaqKKKImctI4mPslY+q8ou X-Received: by 2002:a17:906:109e:b0:994:5396:e32c with SMTP id u30-20020a170906109e00b009945396e32cmr4444609eju.3.1690959751858; Wed, 02 Aug 2023 00:02:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690959751; cv=none; d=google.com; s=arc-20160816; b=UBZfvYDJufzMwGL6Eq/u86pIVHvr08g1iz4CmkLuHgijFBS0Cn2BEDUGv1W7+D5NT8 5YS61DP9IqotjnYrzDMTd9Ej/tU5g1f+t7YEGuSecZuaKP2wrp+giWbH8bLactiVx3AH ADfPku4JgDhdEE5jkO+yfPH9aW5+jP05YScqGmXCLJqZfFxS3uVcpqNzMYCH9KW2DDRJ xfQzYFQ8K/TjlwNsOjPfOFp+d06LZT4A8FXl5BPDMINe6aYE74CsuBJf2vU3YzGkHg6f uvIRsBb/5ceOAt4XRRbuIW2RwEBG8IS/jIsn97DcOrLFOR6dz25Rzu7NrscxJDRbrH4h 3PeA== 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:message-id:date:to:from :dkim-signature:delivered-to; bh=7GCBgClLI3ot5VGhf+0SOhbQzpgzxRtALqIvVtH+7fw=; fh=nsVKsSaZMdLznXlUv/EWC2FmpLC7hjoSIJBzkkMfbDw=; b=i5AmfXG+5iAJSGKgZS9G27mKEi9OoW7tfK60gQRl57JBEUHN0AjXGI4DDwtHrGbVia esVrv5LXEg4GOSSnpfqu41whu8J7Q3KE1j+qKz9lqSV7FE+Eng/+1k8ePC7xwuIxXpOp DBBYoIgkLdMEk+NTZuRSpmrBd5neShMYlrQrvHAE21pxqpLcj40pPswgdnE6YOpBDVv1 oWMWHIbTwrMerj3ub7dhFQJYO8WzQybNe4L+ZtsOBfAeVUrcEermgCqc2aVm2GAnegD/ 0Jf83yy3kSX0CrQ6HxgioAghdaT5v50/X+9zro1fYdi+ZSbnDpeiG0RU1zXMZ52Sr2iL HQCA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@martin-st.20221208.gappssmtp.com header.s=20221208 header.b=KDXuLqyP; 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 q23-20020a170906a09700b00997e71d0377si554353ejy.366.2023.08.02.00.02.31; Wed, 02 Aug 2023 00:02:31 -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=@martin-st.20221208.gappssmtp.com header.s=20221208 header.b=KDXuLqyP; 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 A2E7E68C530; Wed, 2 Aug 2023 10:02:28 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f53.google.com (mail-lf1-f53.google.com [209.85.167.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F191B68BABF for ; Wed, 2 Aug 2023 10:02:22 +0300 (EEST) Received: by mail-lf1-f53.google.com with SMTP id 2adb3069b0e04-4fe0c566788so10785336e87.0 for ; Wed, 02 Aug 2023 00:02:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=martin-st.20221208.gappssmtp.com; s=20221208; t=1690959742; x=1691564542; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=fqY39bTGQ2wCp7PNKAhp4qX91CXJ4weTwkacIgDZ8/o=; b=KDXuLqyPNcbzN+3/7IrWf9rdtDScAaBbjwaGEdcHIKilWVDm4DGMKvHOzqT+Uo5CVp kYDKB5UDhO7d0otZ/wD+iehBKkJm8rvPHuuSGlo7cMxmQtiGPTk9sIFSlXTwMz/vZVkq v2XOmbXVrQbj0eboy0VA0dJ07GdHsEkjzS9lVvOH90P4W3rCGZXdgpGJlOB3nobVu/Im x+IMEEOFNibOVMQA3dQdZTp7TQR745UO0dDRJqvL3VesvvG6HfUuemURLoOJREvi/O4X UdfuOGHtTCmo626ShyS4R4D2Y8xwlbxG9nzwPQc0wxv4P48hL+0z0Mc62fMz1Ec0pGLL tZzA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690959742; x=1691564542; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=fqY39bTGQ2wCp7PNKAhp4qX91CXJ4weTwkacIgDZ8/o=; b=ICanjlCza13JPg2gw3NzelPu4oO81u4OP/24p6cIAGel+92UjX0GeQqIiDIscPTGuK g5dI/JFBVH8Vf5WVLsd5Z60HybyAW0Vv6siqCXDFWitjHlQcgi5MMkBhfN56Bn4ZEjhb TVP7HP3iSZkYo7AhVz0uNvl6T3HkkzgHpAnwgSto6c/K4hbzGKwSskXra9pnuyTlwbVm 5rYfFp8ro45O5ceAo+My8PQrvXDW8OEhJJnHk1Fw4li1o3eRFWGbOXiXrlBq3+Uwg5/t yfL1taxJJSmeL6qG0fKo1F6Xd35M/F333pNRtE4s0roHjnVBUUfsUFRbqSj5yyfVMP7x rFIQ== X-Gm-Message-State: ABy/qLanRQnypKyhTSvW2vapy7qtB7x6LIiXCuy1y5i8fTf+Gsw5R4e3 vVhX2zXiII99Z2grcdpQvMAdUIMH3/X6fk8Qi//ITw== X-Received: by 2002:a05:6512:3ba3:b0:4fe:1d71:6076 with SMTP id g35-20020a0565123ba300b004fe1d716076mr5099066lfv.46.1690959742149; Wed, 02 Aug 2023 00:02:22 -0700 (PDT) Received: from localhost.localdomain (dsl-tkubng21-58c01c-243.dhcp.inet.fi. [88.192.28.243]) by smtp.gmail.com with ESMTPSA id o12-20020a05651238ac00b004fe0c3d8bb4sm2821578lft.84.2023.08.02.00.02.21 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Aug 2023 00:02:21 -0700 (PDT) From: =?utf-8?q?Martin_Storsj=C3=B6?= To: ffmpeg-devel@ffmpeg.org Date: Wed, 2 Aug 2023 10:02:21 +0300 Message-Id: <20230802070221.29433-1-martin@martin.st> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] tests: Correctly distinguish between SAMPLES and TARGET_SAMPLES for hls_fmp4_ac3.m3u8 X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: /Fuu16vY4eRk This fixes the test when running in a cross test setup where the samples are located at a different path between build host and temote test target. --- tests/fate/hlsenc.mak | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/fate/hlsenc.mak b/tests/fate/hlsenc.mak index 7df74f1f63..8118d5b925 100644 --- a/tests/fate/hlsenc.mak +++ b/tests/fate/hlsenc.mak @@ -100,7 +100,7 @@ fate-hls-fmp4: CMD = framecrc -auto_conversion_filters -flags +bitexact -i $(TAR tests/data/hls_fmp4_ac3.m3u8: TAG = GEN tests/data/hls_fmp4_ac3.m3u8: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data $(M)$(TARGET_EXEC) $(TARGET_PATH)/$< -nostdin \ - -stream_loop 4 -i $(SAMPLES)/ac3/monsters_inc_5.1_448_small.ac3 -c copy -map 0 \ + -stream_loop 4 -i $(TARGET_SAMPLES)/ac3/monsters_inc_5.1_448_small.ac3 -c copy -map 0 \ -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