From patchwork Tue Aug 31 12:42:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 29911 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp4888490iov; Tue, 31 Aug 2021 05:43:29 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxib8gp6jSdb5qXD5RQ2YuRPobw9FH5jpd5+bPxSxyhn55TPP+akFQPpAlHwFZagGseLplA X-Received: by 2002:a17:906:93ef:: with SMTP id yl15mr30991737ejb.229.1630413809585; Tue, 31 Aug 2021 05:43:29 -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 r23si6433132edy.60.2021.08.31.05.43.28; Tue, 31 Aug 2021 05:43:29 -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=p7Dq9hL4; 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 A490568A134; Tue, 31 Aug 2021 15:43:20 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2065.outbound.protection.outlook.com [40.92.90.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CE866689A0D for ; Tue, 31 Aug 2021 15:43:13 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lk8EmZU62HpaGSkPUjihoLLbMb+sDy5pizO07XUYiU1y/25gqg+GeV8hBhRHaj8eq94Qqpn1IOZOY7RdyavMgUJiY6FAzzE7+M5qaXN70kTXhO3Q21VCl3GQBaCJRqyq4xoh70nry4aepyzmTMCOcg5dIpNjxJNBSZ0bdyGBi6WEPheKlROzNChsXCYouoCZPWRHXRdl1lRt7EE3glmohgciov7WJTk+G4xWIipcMj+EM54Xb2GrRYfLI+zeEdpxAj0a3WNJYkM0NOHvmvGmdk6Mcr2d7mrnvni5I/1XWWSRCvO6p9pbHJ4SD7LHqKfDFXikHwaLrrYaVXoBGbMAKQ== 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=RWf51XD89Ge02+KTPUjOjlDicnH1BMNUjCTynvzCqNQcK/uABOYZEsEDAGl7Q1YXGdP+Zj9XPoTF4szrCvmTIDHp1LWDZKslhSYxcn50LFfuua8mfkNBU42ObPVIfpCE1PuZuWDZBlV3zSxj+Z/9Oys4N57N+EFTvwgxl9qGCnmczTz1YNuBfd4k1TRNdHJ59fNiuqmA6rGuOMR8P0LSHCYmWviSNi6cpXginR9Qdd6UtatddSCsPXJ2scNCgchHnehHIxo+/Csc0J4GSpU4IN6P+C4V3VlKgpxAe6/7QrdtZH1SXgTSNaZlR0Ne0euf7Gag19IcxAMy22xaTKZ3Dg== 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=p7Dq9hL4XqtGpM++8OTWIYHXz3WI5wgx4Bj7drJ3I60BDChdBVyK2dqBmr6Uy438wIq26DrkUR9YQhQM0j5HjIb636H4Efn97/rSVOXnTzNaMKsGGuh6QjEQmvQH+p7KinpeibTKKTSaypfFgj9WbYqGxeiU2RMxUxXAGF5dkzLBp8ZOG9CKj/c15G5b/joNzntuf4KZQ0NiK4Ip71QT5D9dTOBNqgy071hypBgRIifT1hSUOYvq6QzX3YUap2iHE8P5cOEjqNh/uwIH+3NiU0smE49vl/jE/zdjw6QPNmwpaC1nBFYp+fHOctLjKsipt93D19vmg1c06KzRhHNmgw== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AS8PR03MB6824.eurprd03.prod.outlook.com (2603:10a6:20b:29c::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4436.22; Tue, 31 Aug 2021 12:43:13 +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; Tue, 31 Aug 2021 12:43:13 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 31 Aug 2021 14:42:51 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [kn8nGaFIjLuW8eg1yvqQYV/5NqyGDX/E] X-ClientProxiedBy: AM9P250CA0014.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:21c::19) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210831124258.1715917-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM9P250CA0014.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:21c::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4457.23 via Frontend Transport; Tue, 31 Aug 2021 12:43:12 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c6c98e45-e208-431a-37c6-08d96c7ce551 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVAewO3OwszBVL1NI+kAPIBvLKarEeXor/uFwBq9KfHm29aNTAuijW3wQKsNfh3epb9vRSds6G6vc9jvGLqZTnsiR9VbdNWKi/YS/VHGFZDdQBpJTv9vkrMNNW2/c9zf5xYBU7NbU/xOGUDZBuIjjDCJaxKj/lNxWfWzNLfCEOLCL2pjOKn6Dqtzg7RECmWPa8nUfom5VCg6qr+gzAsUdm4su+M5jP34VzAT73cXVTDE3OBgCKprrqbit8goHdL7E+LQrwP0GtO4hY5yXQ7qj66nDriNsOMppEMaE79olUpUFH/BnrgLxyqum9s4zulCKp2BLjXMKBTsXEvTSrwe77tro8NSiesZ7xXC2JfSLfiQ0JYiMY28b1BUUxWcuKh6JCXQkbBCJgnUUhTy1vqVinReQFLBBCpM+CXyE79pQoU/4sKgE2Cg8162J4bXXpk3B+TbcQMB+lO1kLlcX4V/RuNbaKmBwvguFTyLCieuw83oGixNgKS7z52dzqAa+GcRhxuH/uEHE22HyneHMiF+zMzmWYqM7MinKp5xubnbKe8e2X7Y4boRTMu+PFo491oOyVoAyM4ta+8r50vRrO82yeFg3RMOKyQsBmtQceQlYkOXIpfBiuWd0TcW9QUmmLNb1KHL4wAOXFQ7BrU/UbbK24G+dabCN6DQgazEOIXs4dWUBoV2lqMBhmHw4pzRIWgC0ZUAgZFgTTFPIEce7k2cEJZNv2PtzkhB98= X-MS-TrafficTypeDiagnostic: AS8PR03MB6824: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: LB/S7WQYReyYIU5zf0dAJpjtDD7/VRwf42/zV5rgJJHqCnSLiC1NqRzC43x6BJbZF6hyxM/iMgK20dd+1Hez+7SXGE7XBkXM2uG8lcLJqte+jv+3y0ESIF37ZS6fsSJZgNpunH8fTa1LQWMEhAZEO/R5/p2PMRqamr28pZ6c5ZwIx78FFO+Zi+MLmWRGWHgBczT8TO5rUTGH1gBZ1AG4SBE0yL+jAR/lj7MYqawCmV4XtIpIFQlYJVK1KZMLQEzcrACJwAazf9oHlCv/Z5cH4GUJQkNukZvOW+TR9C1zanwf8H3YcAZ2mHQSswfmLB+RrxdGgtVRQrDnHwdMJqEWMJhkfeYHEJTJTAOLCRY7Pn34QyzkRxteXdQRWCzra+YrRd8t9chCfnmQojeq5/JBH8VBLW8/rYcB8kVqnSHm8D2OKEKBSWoQSxZExyXcl195 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: rMGeTw9h+Q2cpW1e9ZPv4oaorsNctjIAdhu6vf0IK8tGFM6BfRa+33wpTpm7PrD9t3QABuGwHWsOJar0yJmz+6Rd/YwuKbQbuVviIshMDUtC703g82ZsygE/q3k+TFqpACIjBg+6bcwSA4b7hMDuXw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: c6c98e45-e208-431a-37c6-08d96c7ce551 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Aug 2021 12:43:13.0617 (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: AS8PR03MB6824 Subject: [FFmpeg-devel] [PATCH v2 03/10] 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: yFtr9igWFlVY 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(){