From patchwork Sun Aug 29 21:27:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 29855 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp3402205iov; Sun, 29 Aug 2021 14:28:16 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxPmb0RqGjpOXA3rcGn/K97GQMslX3A0/TTggnZCDTZI/ntRMqxFF85UwyhTEToIsT/0sgU X-Received: by 2002:a17:907:b06:: with SMTP id h6mr20294278ejl.130.1630272496763; Sun, 29 Aug 2021 14:28:16 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id t20si12241100eds.230.2021.08.29.14.28.16; Sun, 29 Aug 2021 14:28:16 -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=@outlook.com header.s=selector1 header.b=iQQORtpH; arc=fail (body hash mismatch); 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=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5B04468A24C; Mon, 30 Aug 2021 00:28:12 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-oln040092075055.outbound.protection.outlook.com [40.92.75.55]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D44E4680610 for ; Mon, 30 Aug 2021 00:28:03 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=g4zCdSjHDQ3PATnTJrCjzSVSlJJF5x14v6fd/W8mcar/zushW+SQ2AnVwCxxOtKqh2hh3Lffoz7DMpKcekrOfZxeLfS3nm6w+L82NkwB7UAB076jdJLgk/bGFjVh/nNvXXBEtbJ/CFk/Ye5G73E129kOXKj2SiVR4qlkUi6G82gBRTEJ5Wk0nm1lCwICcbQeG+MahETQ2KW39fUHWmV2t6QryBuJtO7JliTJngk/EEEAQrGDlcdgKS7WjEPWLtTu4biTbWyB5kzofCVcaJGmTM7l9D/N6ct2DqjMVlWnnqiegrNuBzi5jvc+m0GGVI8QBrVd1RYVbT15aRDXnZ5Cww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=4Cxw/MW1QprSE6gi6kIGMAphrUhbptRjSCrprnSratQ=; b=ieqtT4GEWIkwMRH/XxYNPllwkle5tB+83TxO7F7/r0hxyfXRBpgZj53LYJq/Fh1jYUpZns5EMtWrzbhy5yJjhYgWH+UzMzESuiLfqN3G8lyoHiQdjYD6mfXc3Xr7OXq4wyyaehRNd/IQ+/bloxN6+yFRH9jvi6tu9DnoGrsvE2eJG7xiBNhLMskxVy+WzAI6stuE9N0yks/q5zPgsxFugFg5tmgYF5Pimvydh5GHJCLHD1zdiClabRBmYHJAkpHnIGa1MHAPTRMz5v0nSLDkYTHZiud9c95J5BganZYAGqLP/ed5eaRJimjZfMFg+dAJnvX3vf49TrV4Y1JKLBkJyQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=4Cxw/MW1QprSE6gi6kIGMAphrUhbptRjSCrprnSratQ=; b=iQQORtpHDz5arSqDklirDVKfwivhgSLxXLjZAFEATn6XiRQoz11ONbrml18/Llyxyc9r7Enxs3r/ZZm1Fk9HtUdiHKOKRVJpJV0B8b3ivDR1RdZe07tUmNLins66tC9KqOC/iEMkkEO/AVXGDb1j9iW1uoGw4HodAUZRvGQXJJ5Ccj2pZdqmTqwTejfIrwVlCCLkHDwJNIgPH+Qdo/8s1Pl/nJvDQhyjAS/uPwBbJKwz0C1lKASgPJ5McGoyB/YmLtHii413NnPG+cYo6n+gydOA6L8/MFYSQax87psGuGcTgP9b/LAM1QDp/U3mP0YOd3W0OovgZnjZMGabJS2P0g== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB5927.eurprd03.prod.outlook.com (2603:10a6:20b:e3::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4457.23; Sun, 29 Aug 2021 21:28:02 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f8b5:1ef2:89b2:f8c5]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f8b5:1ef2:89b2:f8c5%7]) with mapi id 15.20.4457.024; Sun, 29 Aug 2021 21:28:02 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 29 Aug 2021 23:27:37 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [Gj3+n6ZRTxSocXQXgWZGhTJx6kQ1fk6q] X-ClientProxiedBy: PR0P264CA0178.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:1c::22) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210829212744.1505779-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by PR0P264CA0178.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:1c::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4457.19 via Frontend Transport; Sun, 29 Aug 2021 21:28:01 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0000a664-b76a-410c-99f1-08d96b33e192 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNXOVIHST31EzKLNwg5cTLbyylOPiHNpp8um1vq+6WLygU5xkGrvgOzWoFtS8VbF7t3KE8AmVkbNVAwcY28dBtVFkWFRxb9+hUFjsnCLh8vmpjhZyC2UbJPVIYH6O7daSU8/p+Q5HXhPX2goeozJPeKKLDZS6OjRT2bhgtUpN1KZ43SMGjawVrKUEHYf0IVSnZIIehLihKFSJRKJMG85fqnvHmM5Qj3qJAtkr/lKCSv+sioQnsFxp03Z+tEpnc8zyljohtdLXhW+86dsZTnPzCdaVMUefYI5ue3te7LOifJMtLUTTsvqXYyhaf5oxouw4akTO8dtirv8Qem9i8/ukkmQ8iKCtQlcogQJneMh05RHAQ8Hg1Gs7nL7M4+DFf9sXf1v3mQbAkC8jikK0eSG55rPzFVsw+PwxPziHcQDARv1hZeDwI7wHtU+FqvWoOX0G02UK+YkjzVdwhjRpW5np2AuWGu5q5v3vh4t01pQP2tHcjpwgsW6ezSspOtzUvmdI/spRuWwHC5PFCFBvhqOtWXF5FYcBiSFu9UiHvVkCKgGj6gycGaSUlfuQShsvY0PULMEBImyn6jhw07nQEktUpMnYeMK5CbQe0TQJ5gCypZfuQxdiqE6bf1fh31ip674Kh9sBh2kDK/RguRwQPS4+VqcmfESRnoFIlNd38PzCirANtbCDcJ7zXEHO9IHnMwrlgkBXp7JCAVs9gN2L/FpVLU+yRoC/LXrb/A= X-MS-TrafficTypeDiagnostic: AM6PR03MB5927: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: pa5NkhpMvf7c3q6QN54hZS1fhmaRBZPBabybIaqZPswoPwsJAGArEiTV8VsUmVBfISgqAgPbkC54yGPfn3zEXERG0RuOzIVezeTU9jPtwNhJrSN+rrTcactVo+AKF2RLCHB9UJVePfpFn8V8UlvOyXnnbuydMP757HmcK6JV6bWFMxbZSyQRuJbXmEnAQLNUQzVJ7Zjfwu35/tsAp9nzqWA5LMBzaffB5YO22juar/TX06uf25jDMqc0LH8+6YXtxVwLQoH/3iAnRQj64brNZrlHAnqNrPna1+K1cB+UymU9KpUWeJDenVWRM5Csc44xumVAEgsl9gFMxveLICdRPPg2uAxbABFWPi1HgATRGLTTb/wlCDlZY/nJtDpHxKXTT/M2AynuqTw9Qz5QXefeTb7VVVtrueSU1IyvwxApf9uZNic3j1SmuNAqLE08zSMH X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: NCtdxjzYWjNGR2yIULHPPjx1LsBMUCmbzbl7TVxwTGS/K7rDpU/eex83Eyll8xz1b5oRX8IkBXjvkxDdyBE0DiBwWEVN/faOUuhkbIWBsUGKo0zb4PPkpy53emGSjvIW2t+rcOZn6bfd/i2Z+wU9zw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0000a664-b76a-410c-99f1-08d96b33e192 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Aug 2021 21:28:02.3214 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR03MB5927 Subject: [FFmpeg-devel] [PATCH 04/11] tests/fate-run: Allow to set demuxer for generated file in transcode 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: yKuYy1zWruBR Up until now, the transcode() function allowed (and required) to specify the input format as well as the format of the output format (i.e. the muxer) of the generated file. But for reading the generated file it relied on autodetection/probing. This does not always work, e.g. not for aptx_hd, and so this commit adds an option to specify this. (Notice that one can not just use the name of the muxer, because the corresponding demuxer might have a different name (e.g. mp4-mov).) Signed-off-by: Andreas Rheinhardt --- tests/fate-run.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/fate-run.sh b/tests/fate-run.sh index 4b21bab591..b486c780ab 100755 --- a/tests/fate-run.sh +++ b/tests/fate-run.sh @@ -233,6 +233,8 @@ transcode(){ final_decode=$5 ffprobe_opts=$7 additional_inputs=$8 + demuxer_opts=$9 + test -z "$demuxer_opts" || demuxer_opts="-f $demuxer_opts" encfile="${outdir}/${test}.${enc_fmt}" test "$6" = -keep || cleanfiles="$cleanfiles $encfile" tsrcfile=$(target_path $srcfile) @@ -241,10 +243,10 @@ transcode(){ $ENC_OPTS $enc_opt $FLAGS -f $enc_fmt -y $tencfile || return do_md5sum $encfile echo $(wc -c $encfile) - ffmpeg $DEC_OPTS -i $tencfile $ENC_OPTS $FLAGS $final_decode \ + ffmpeg $demuxer_opts $DEC_OPTS -i $tencfile $ENC_OPTS $FLAGS $final_decode \ -f framecrc - || return test -z $ffprobe_opts || \ - run ffprobe${PROGSUF}${EXECSUF} $ffprobe_opts $tencfile || return + run ffprobe${PROGSUF}${EXECSUF} $demuxer_opts $ffprobe_opts $tencfile || return } stream_remux(){