From patchwork Tue Jun 20 18:53:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 42261 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:be15:b0:121:b37c:e101 with SMTP id ge21csp1599325pzb; Tue, 20 Jun 2023 11:53:19 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5HQcRRGZGeHQkSrIWqy5P0kTAfP7fJCDXbg9SAX/PSgPvEocHlp/HU+fzGDeOnqSorf4iE X-Received: by 2002:a17:907:948e:b0:989:5845:82c8 with SMTP id dm14-20020a170907948e00b00989584582c8mr952327ejc.44.1687287199653; Tue, 20 Jun 2023 11:53:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687287199; cv=none; d=google.com; s=arc-20160816; b=uwRCJet0Q7EUnunTKUXMGxKE2c1KaqXvUjhmEY1kdrLle8gQ5ojyG0tLGwQKOVhN+j hs+IDdTfAYaFV8v3ba4hZLHCWRw39Aa0Sg0aGNPbX7bEK1DqQ2k9JZqUrFKeuY9W7IuO 9opQN3Udt+DtT5/2ltjKBrhkSk+l+bVM+BXTRil/EMmfeaJWKvRIIWCXKsZGr1mo+y8o O1Y89jdlm2VX3cKYPsovzzZt6eEKEPko1jJESj21UxkydtOelrX6Dm6eDLpeNBPdwgOr waAyBv901M5o10M9iU1fNoj6B4/QUJ5LtxQgiJRJ2BrqGFiJVkb05Z3vL3XJc1/gcYtn BWvQ== 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 :delivered-to; bh=nFsELMUkay0KhWjU/ON3JCHIFbXfsSU3Oc4pasMyTL4=; b=hlqxnCBGkIzo1egp7dgRIOmWIbTEc2fV35JsFvwrk1updOs1newHD6JjuAcfmX+5gE dF6Syw++R8s9ysOG2+NIrKNcd5EnVVTLLar8irLNyWKJ/OTdulOD96krGDcn29k5Knin 5GMEOkhcxAT3jvV7zVv1eeLFd1XPJTVJN/+PZhSugA6KEX79s4E/uIdbL+RgEJeZPhWt c9PwFOu1xnV1i+RjmXCX0QGb5VHXqdwP2Zqr6gZB6SQAddpqaZIsME0STxg8Jl/lzx8d 11DF4Lbd2yeddqOaDsjqe6Wo6s0xsP1cyU77IV6hzJIapLw5q3ZJdN4HezocttPuFKRz S4tg== ARC-Authentication-Results: i=1; mx.google.com; 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 lv2-20020a170906bc8200b009889d859161si1553302ejb.327.2023.06.20.11.53.18; Tue, 20 Jun 2023 11:53:19 -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; 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 E407E68C12A; Tue, 20 Jun 2023 21:53:14 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4E6C9689E65 for ; Tue, 20 Jun 2023 21:53:08 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id B809D2404EC for ; Tue, 20 Jun 2023 20:53:07 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id Y2NQrlEqhXXO for ; Tue, 20 Jun 2023 20:53:06 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id 716E72404EA for ; Tue, 20 Jun 2023 20:53:06 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id E98D83A02F8 for ; Tue, 20 Jun 2023 20:53:05 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Tue, 20 Jun 2023 20:53:04 +0200 Message-Id: <20230620185304.10056-1-anton@khirnov.net> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] tests/fate/ffmpeg: silence the audio for fate-ffmpeg-streamloop-transcode-av 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: wicGdeh+qUj7 Fixed-point AAC decoder currently does not produce the same output on all platforms. Until that is fixed, silence the audio stream using the volume filter. Also, actually use the aac_fixed decoder as was the original intent. --- tests/fate/ffmpeg.mak | 7 +- tests/ref/fate/ffmpeg-streamloop-transcode-av | 144 +++++++++--------- 2 files changed, 77 insertions(+), 74 deletions(-) diff --git a/tests/fate/ffmpeg.mak b/tests/fate/ffmpeg.mak index 87cd0b46d0..763ed381ee 100644 --- a/tests/fate/ffmpeg.mak +++ b/tests/fate/ffmpeg.mak @@ -132,9 +132,12 @@ fate-ffmpeg-fix_sub_duration_heartbeat: CMD = fmtstdout srt -fix_sub_duration \ -c:s srt \ -f null - -FATE_SAMPLES_FFMPEG-$(call FRAMECRC, MATROSKA, H264 AAC_FIXED, PCM_S32LE_ENCODER) += fate-ffmpeg-streamloop-transcode-av +# FIXME: the integer AAC decoder does not produce the same output on all platforms +# so until that is fixed we use the volume filter to silence the data +FATE_SAMPLES_FFMPEG-$(call FRAMECRC, MATROSKA, H264 AAC_FIXED, PCM_S32LE_ENCODER VOLUME_FILTER) += fate-ffmpeg-streamloop-transcode-av fate-ffmpeg-streamloop-transcode-av: CMD = \ - framecrc -auto_conversion_filters -stream_loop 3 -i $(TARGET_SAMPLES)/mkv/1242-small.mkv -c:a pcm_s32le + framecrc -auto_conversion_filters -stream_loop 3 -c:a aac_fixed -i $(TARGET_SAMPLES)/mkv/1242-small.mkv \ + -af volume=0 -c:a pcm_s32le FATE_STREAMCOPY-$(call REMUX, MP4 MOV, EAC3_DEMUXER) += fate-copy-trac3074 fate-copy-trac3074: CMD = transcode eac3 $(TARGET_SAMPLES)/eac3/csi_miami_stereo_128_spx.eac3\ diff --git a/tests/ref/fate/ffmpeg-streamloop-transcode-av b/tests/ref/fate/ffmpeg-streamloop-transcode-av index 50a626b281..6934e39d41 100644 --- a/tests/ref/fate/ffmpeg-streamloop-transcode-av +++ b/tests/ref/fate/ffmpeg-streamloop-transcode-av @@ -18,31 +18,31 @@ 1, 4072, 4072, 1024, 8192, 0x00000000 1, 5096, 5096, 1024, 8192, 0x00000000 0, 3, 3, 1, 1378560, 0xca1deba8 -1, 6120, 6120, 1024, 8192, 0x687330d2 -1, 7128, 7128, 1024, 8192, 0x9131462c +1, 6120, 6120, 1024, 8192, 0x00000000 +1, 7128, 7128, 1024, 8192, 0x00000000 0, 4, 4, 1, 1378560, 0xd4eed467 -1, 8208, 8208, 1024, 8192, 0x48c01c32 -1, 9232, 9232, 1024, 8192, 0x0ccd8d5f +1, 8208, 8208, 1024, 8192, 0x00000000 +1, 9232, 9232, 1024, 8192, 0x00000000 0, 5, 5, 1, 1378560, 0xd6e1d5b7 -1, 10248, 10248, 1024, 8192, 0xd50cbe9f -1, 11256, 11256, 1024, 8192, 0xbe069303 +1, 10248, 10248, 1024, 8192, 0x00000000 +1, 11256, 11256, 1024, 8192, 0x00000000 0, 6, 6, 1, 1378560, 0x0b574d39 -1, 12280, 12280, 1024, 8192, 0x85fccf5b -1, 13304, 13304, 1024, 8192, 0x4180de71 +1, 12280, 12280, 1024, 8192, 0x00000000 +1, 13304, 13304, 1024, 8192, 0x00000000 0, 7, 7, 1, 1378560, 0x1bdd4d61 -1, 14328, 14328, 1024, 8192, 0x0e9b6ac3 -1, 15336, 15336, 1024, 8192, 0x5c33f724 +1, 14328, 14328, 1024, 8192, 0x00000000 +1, 15336, 15336, 1024, 8192, 0x00000000 0, 8, 8, 1, 1378560, 0x3b28f549 -1, 16360, 16360, 1024, 8192, 0x668aaaec -1, 17384, 17384, 1024, 8192, 0xd137d412 +1, 16360, 16360, 1024, 8192, 0x00000000 +1, 17384, 17384, 1024, 8192, 0x00000000 0, 9, 9, 1, 1378560, 0x45b2f57b -1, 18408, 18408, 1024, 8192, 0x08e1fbf6 -1, 19416, 19416, 1024, 8192, 0xbf3fb4f6 +1, 18408, 18408, 1024, 8192, 0x00000000 +1, 19416, 19416, 1024, 8192, 0x00000000 0, 10, 10, 1, 1378560, 0x8955570e -1, 20440, 20440, 1024, 8192, 0x69cd08a4 -1, 21464, 21464, 1024, 8192, 0xe0fe6297 -1, 22488, 22488, 1024, 8192, 0x172867ad -1, 23496, 23496, 1024, 8192, 0xcbcc1461 +1, 20440, 20440, 1024, 8192, 0x00000000 +1, 21464, 21464, 1024, 8192, 0x00000000 +1, 22488, 22488, 1024, 8192, 0x00000000 +1, 23496, 23496, 1024, 8192, 0x00000000 0, 12, 12, 1, 1378560, 0x9c598000 1, 25488, 25488, 1024, 8192, 0x00000000 0, 13, 13, 1, 1378560, 0xbaf121ba @@ -52,32 +52,32 @@ 1, 28552, 28552, 1024, 8192, 0x00000000 1, 29576, 29576, 1024, 8192, 0x00000000 0, 15, 15, 1, 1378560, 0x6579d31a -1, 30600, 30600, 1024, 8192, 0x687330d2 -1, 31608, 31608, 1024, 8192, 0x9131462c +1, 30600, 30600, 1024, 8192, 0x00000000 +1, 31608, 31608, 1024, 8192, 0x00000000 0, 16, 16, 1, 1378560, 0xca1deba8 -1, 32688, 32688, 1024, 8192, 0x48c01c32 -1, 33712, 33712, 1024, 8192, 0x0ccd8d5f +1, 32688, 32688, 1024, 8192, 0x00000000 +1, 33712, 33712, 1024, 8192, 0x00000000 0, 17, 17, 1, 1378560, 0xd4eed467 -1, 34728, 34728, 1024, 8192, 0xd50cbe9f -1, 35736, 35736, 1024, 8192, 0xbe069303 +1, 34728, 34728, 1024, 8192, 0x00000000 +1, 35736, 35736, 1024, 8192, 0x00000000 0, 18, 18, 1, 1378560, 0xd6e1d5b7 -1, 36760, 36760, 1024, 8192, 0x85fccf5b -1, 37784, 37784, 1024, 8192, 0x4180de71 +1, 36760, 36760, 1024, 8192, 0x00000000 +1, 37784, 37784, 1024, 8192, 0x00000000 0, 19, 19, 1, 1378560, 0x0b574d39 -1, 38808, 38808, 1024, 8192, 0x0e9b6ac3 -1, 39816, 39816, 1024, 8192, 0x5c33f724 +1, 38808, 38808, 1024, 8192, 0x00000000 +1, 39816, 39816, 1024, 8192, 0x00000000 0, 20, 20, 1, 1378560, 0x1bdd4d61 -1, 40840, 40840, 1024, 8192, 0x668aaaec -1, 41864, 41864, 1024, 8192, 0xd137d412 +1, 40840, 40840, 1024, 8192, 0x00000000 +1, 41864, 41864, 1024, 8192, 0x00000000 0, 21, 21, 1, 1378560, 0x3b28f549 -1, 42888, 42888, 1024, 8192, 0x08e1fbf6 -1, 43896, 43896, 1024, 8192, 0xbf3fb4f6 +1, 42888, 42888, 1024, 8192, 0x00000000 +1, 43896, 43896, 1024, 8192, 0x00000000 0, 22, 22, 1, 1378560, 0x45b2f57b -1, 44920, 44920, 1024, 8192, 0x69cd08a4 -1, 45944, 45944, 1024, 8192, 0xe0fe6297 +1, 44920, 44920, 1024, 8192, 0x00000000 +1, 45944, 45944, 1024, 8192, 0x00000000 0, 23, 23, 1, 1378560, 0x8955570e -1, 46968, 46968, 1024, 8192, 0x172867ad -1, 47976, 47976, 1024, 8192, 0xcbcc1461 +1, 46968, 46968, 1024, 8192, 0x00000000 +1, 47976, 47976, 1024, 8192, 0x00000000 0, 24, 24, 1, 1378560, 0x9c598000 1, 49968, 49968, 1024, 8192, 0x00000000 0, 25, 25, 1, 1378560, 0xbaf121ba @@ -87,33 +87,33 @@ 1, 53032, 53032, 1024, 8192, 0x00000000 0, 27, 27, 1, 1378560, 0x6579d31a 1, 54056, 54056, 1024, 8192, 0x00000000 -1, 55080, 55080, 1024, 8192, 0x687330d2 +1, 55080, 55080, 1024, 8192, 0x00000000 0, 28, 28, 1, 1378560, 0xca1deba8 -1, 56088, 56088, 1024, 8192, 0x9131462c -1, 57168, 57168, 1024, 8192, 0x48c01c32 +1, 56088, 56088, 1024, 8192, 0x00000000 +1, 57168, 57168, 1024, 8192, 0x00000000 0, 29, 29, 1, 1378560, 0xd4eed467 -1, 58192, 58192, 1024, 8192, 0x0ccd8d5f -1, 59208, 59208, 1024, 8192, 0xd50cbe9f +1, 58192, 58192, 1024, 8192, 0x00000000 +1, 59208, 59208, 1024, 8192, 0x00000000 0, 30, 30, 1, 1378560, 0xd6e1d5b7 -1, 60216, 60216, 1024, 8192, 0xbe069303 -1, 61240, 61240, 1024, 8192, 0x85fccf5b +1, 60216, 60216, 1024, 8192, 0x00000000 +1, 61240, 61240, 1024, 8192, 0x00000000 0, 31, 31, 1, 1378560, 0x0b574d39 -1, 62264, 62264, 1024, 8192, 0x4180de71 -1, 63288, 63288, 1024, 8192, 0x0e9b6ac3 +1, 62264, 62264, 1024, 8192, 0x00000000 +1, 63288, 63288, 1024, 8192, 0x00000000 0, 32, 32, 1, 1378560, 0x1bdd4d61 -1, 64296, 64296, 1024, 8192, 0x5c33f724 -1, 65320, 65320, 1024, 8192, 0x668aaaec +1, 64296, 64296, 1024, 8192, 0x00000000 +1, 65320, 65320, 1024, 8192, 0x00000000 0, 33, 33, 1, 1378560, 0x3b28f549 -1, 66344, 66344, 1024, 8192, 0xd137d412 -1, 67368, 67368, 1024, 8192, 0x08e1fbf6 +1, 66344, 66344, 1024, 8192, 0x00000000 +1, 67368, 67368, 1024, 8192, 0x00000000 0, 34, 34, 1, 1378560, 0x45b2f57b -1, 68376, 68376, 1024, 8192, 0xbf3fb4f6 -1, 69400, 69400, 1024, 8192, 0x69cd08a4 +1, 68376, 68376, 1024, 8192, 0x00000000 +1, 69400, 69400, 1024, 8192, 0x00000000 0, 35, 35, 1, 1378560, 0x8955570e -1, 70424, 70424, 1024, 8192, 0xe0fe6297 -1, 71448, 71448, 1024, 8192, 0x172867ad +1, 70424, 70424, 1024, 8192, 0x00000000 +1, 71448, 71448, 1024, 8192, 0x00000000 0, 36, 36, 1, 1378560, 0x9c598000 -1, 72456, 72456, 1024, 8192, 0xcbcc1461 +1, 72456, 72456, 1024, 8192, 0x00000000 0, 37, 37, 1, 1378560, 0xbaf121ba 1, 74448, 74448, 1024, 8192, 0x00000000 1, 75472, 75472, 1024, 8192, 0x00000000 @@ -122,30 +122,30 @@ 1, 77512, 77512, 1024, 8192, 0x00000000 0, 39, 39, 1, 1378560, 0x6579d31a 1, 78536, 78536, 1024, 8192, 0x00000000 -1, 79560, 79560, 1024, 8192, 0x687330d2 +1, 79560, 79560, 1024, 8192, 0x00000000 0, 40, 40, 1, 1378560, 0xca1deba8 -1, 80568, 80568, 1024, 8192, 0x9131462c -1, 81648, 81648, 1024, 8192, 0x48c01c32 +1, 80568, 80568, 1024, 8192, 0x00000000 +1, 81648, 81648, 1024, 8192, 0x00000000 0, 41, 41, 1, 1378560, 0xd4eed467 -1, 82672, 82672, 1024, 8192, 0x0ccd8d5f -1, 83688, 83688, 1024, 8192, 0xd50cbe9f +1, 82672, 82672, 1024, 8192, 0x00000000 +1, 83688, 83688, 1024, 8192, 0x00000000 0, 42, 42, 1, 1378560, 0xd6e1d5b7 -1, 84696, 84696, 1024, 8192, 0xbe069303 -1, 85720, 85720, 1024, 8192, 0x85fccf5b +1, 84696, 84696, 1024, 8192, 0x00000000 +1, 85720, 85720, 1024, 8192, 0x00000000 0, 43, 43, 1, 1378560, 0x0b574d39 -1, 86744, 86744, 1024, 8192, 0x4180de71 -1, 87768, 87768, 1024, 8192, 0x0e9b6ac3 +1, 86744, 86744, 1024, 8192, 0x00000000 +1, 87768, 87768, 1024, 8192, 0x00000000 0, 44, 44, 1, 1378560, 0x1bdd4d61 -1, 88776, 88776, 1024, 8192, 0x5c33f724 -1, 89800, 89800, 1024, 8192, 0x668aaaec +1, 88776, 88776, 1024, 8192, 0x00000000 +1, 89800, 89800, 1024, 8192, 0x00000000 0, 45, 45, 1, 1378560, 0x3b28f549 -1, 90824, 90824, 1024, 8192, 0xd137d412 -1, 91848, 91848, 1024, 8192, 0x08e1fbf6 +1, 90824, 90824, 1024, 8192, 0x00000000 +1, 91848, 91848, 1024, 8192, 0x00000000 0, 46, 46, 1, 1378560, 0x45b2f57b -1, 92856, 92856, 1024, 8192, 0xbf3fb4f6 -1, 93880, 93880, 1024, 8192, 0x69cd08a4 +1, 92856, 92856, 1024, 8192, 0x00000000 +1, 93880, 93880, 1024, 8192, 0x00000000 0, 47, 47, 1, 1378560, 0x8955570e -1, 94904, 94904, 1024, 8192, 0xe0fe6297 -1, 95928, 95928, 1024, 8192, 0x172867ad -1, 96936, 96936, 1024, 8192, 0xcbcc1461 +1, 94904, 94904, 1024, 8192, 0x00000000 +1, 95928, 95928, 1024, 8192, 0x00000000 +1, 96936, 96936, 1024, 8192, 0x00000000 0, 49, 49, 1, 1378560, 0x9c598000