From patchwork Sun Jun 6 13:10:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 28111 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp2695984iof; Sun, 6 Jun 2021 06:11:43 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzpMYql795v7TF+rbkmtvPl00as2jwTnh3JqGE3fwT7HRH0LdnDA/Or/OM3XTNi0/v1yHsf X-Received: by 2002:a17:906:14d1:: with SMTP id y17mr13596760ejc.365.1622985103708; Sun, 06 Jun 2021 06:11:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1622985103; cv=none; d=google.com; s=arc-20160816; b=d3pW4clfiSgEaYMuCqr8yrMmelK/mQzFVBmaaMBl5GrSNrKbHveq43vyhteeCQ4ByL C2uXB9M7yKby22cHf8vHg7FVnw0v0zOJKmeNO7wcGJyhdfEwplqhdslY0YpIcL8Cssmo S6cU82Vbq/FcaBeupXnvAtp7WkOYB2efE4wLpEyX0z/xJVaPE9RUl7h1stnqePwgt/YE RZAay3Cj+UiEYEU05baRLIfW0xTcakYTUqHuY4Hm50do7sopHV02UsxIh+j0QGnqwU6V HUn5iv1Zs01CeCy8UnFOcR2xjWwmIzP/HnLmKGZHTRS966ZS74rdJ7QFKsZEEiqrF2FU 0WsA== 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=ZGhDr7aW0akaLAZIp2JOTmSPoAgALSVNnIDwnKPxUYM=; b=qtK+6sL7p0tu2U8LFlRBy8gmhpZqCMlBosCiMnBfOlzWlKIi3pUzgfjIRc6zkq2Gj5 iXKBUEKgEKBzPTgUxNbBt6J18HPCYDHkWkrWU40kh2sB7Rh4HB0wRELoGW06WP8zpUEe RFVABLp3ruNAvNwe6nA4mKhfZf7nSEbKtcppa0QrHmFnsdyO6WtwT2PsGVv0dLdwQDqh 6W8JMbgufXiCqL5SHsaIauoo5Meg0jhyhaAWrkzqhfaA6n1LMFCfRGn9eOXtrmouHQyi 8Ik9MnG9/MEaxECuAqgEyGz534V0zO4qt4AD8PRV/9b6b8joT540v+zc7tXJRwuHOIIf dHcA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=B6kPD4Dm; 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=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a92si11464062edf.232.2021.06.06.06.11.42; Sun, 06 Jun 2021 06:11:43 -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=@gmail.com header.s=20161025 header.b=B6kPD4Dm; 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=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A00D168A6F1; Sun, 6 Jun 2021 16:11:39 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f170.google.com (mail-qt1-f170.google.com [209.85.160.170]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BD8D068A4CB for ; Sun, 6 Jun 2021 16:11:32 +0300 (EEST) Received: by mail-qt1-f170.google.com with SMTP id k19so10683048qta.2 for ; Sun, 06 Jun 2021 06:11:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=m3v152PFt4EMzajScReuLFTtmrUyVnyQpscb9F1ZdwM=; b=B6kPD4DmSovMfv00jAP4YIsg83yCur8qUGMItP0TTmb9ajhV5cH+21T49Dp1iWoyGM 6Ym5+wysl7Cc/Xha77v2xYzTL7BeBcbTFXjkfA6BTih0udewIpz5/ymWH6mm7/8sOvty gOEZy9HrZ+XxhTb9NOJXMaWHgPe1a3MhMCA9SBxI4eUv4HLEylHOT0SYGRGiuaMAn3fc eD6KEJSd2t8gsYfa993Z8ko3rvCERTlbk8gOvy7ZSymgWDHMHMZ09lfA7Q00+srH0Nyd 7WmWA3s0Gcw8j+6nt0epUtnYh3+ma3Oa+4i7tXc9oUh5l849hKwxAyMESRj/Cl1X3eTp VXIQ== 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:mime-version :content-transfer-encoding; bh=m3v152PFt4EMzajScReuLFTtmrUyVnyQpscb9F1ZdwM=; b=rufYGWca9UXNFTNvQ2+uAMz5Ww4rzpGbpBN11gdiK6FUNLyjavheOEYRZFG68QpAzV UYaJlQPnIDehfVRLIay/eDHaVEJ//5HoHCARxQd2vSj9fxqpWIwn2QsPuGQQjtjekTh1 DQHvrGiFzNtaE90PYrw0bUYT7l58OBQMlSVA6jdPMhcWn5BpRWektE4T0NJuGq433c7A rK5vCgx2xUiQc205uDa0UbBJdo5f4ztai0eey6oMvLhD4u9a6GZEpRjDHqUDnxg5Zzpd mBtpwPWygEtjBuNbJPmcHNKcQZcVQvFb2H9VMnhzZbxIDx9X5UJRKAowqWbwAGqtlCU2 QTvA== X-Gm-Message-State: AOAM533Kwx6PlbM7nMBygJBDmjR/TXizSRjJ9PKtMnD0MAGlAjU4UG93 Wtfl/bz2tIVmKujAKD/c1OfOKa2ksOs= X-Received: by 2002:a05:622a:10f:: with SMTP id u15mr12984815qtw.138.1622985090918; Sun, 06 Jun 2021 06:11:30 -0700 (PDT) Received: from localhost.localdomain ([191.83.217.13]) by smtp.gmail.com with ESMTPSA id d2sm7743562qkn.95.2021.06.06.06.11.29 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 06 Jun 2021 06:11:30 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sun, 6 Jun 2021 10:10:45 -0300 Message-Id: <20210606131045.1771-1-jamrial@gmail.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] fate: fix input arguments for fate-unknown_layout-ac3 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: fkrAwfTsqetz The input stream is a raw 16 bit audio one, so trying to read it as a 32 bit one is incorrect. The test can and will autoinsert a resampler as needed. Use the oneline comparison for the final result as well, while at it. Signed-off-by: James Almer --- tests/fate/ffmpeg.mak | 4 +++- tests/ref/fate/unknown_layout-ac3 | 1 - 2 files changed, 3 insertions(+), 2 deletions(-) delete mode 100644 tests/ref/fate/unknown_layout-ac3 diff --git a/tests/fate/ffmpeg.mak b/tests/fate/ffmpeg.mak index 4dfb77d250..42152aca64 100644 --- a/tests/fate/ffmpeg.mak +++ b/tests/fate/ffmpeg.mak @@ -82,8 +82,10 @@ fate-unknown_layout-pcm: CMD = md5 \ FATE_FFMPEG-$(call ALLYES, PCM_S16LE_DEMUXER AC3_MUXER PCM_S16LE_DECODER AC3_FIXED_ENCODER) += fate-unknown_layout-ac3 fate-unknown_layout-ac3: $(AREF) +fate-unknown_layout-ac3: CMP = oneline +fate-unknown_layout-ac3: REF = 9455adf10ae2a09850c57f2993fb4316 fate-unknown_layout-ac3: CMD = md5 -auto_conversion_filters \ - -guess_layout_max 0 -f s32le -ac 1 -ar 44100 -i $(TARGET_PATH)/$(AREF) \ + -guess_layout_max 0 -f s16le -ac 1 -ar 44100 -i $(TARGET_PATH)/$(AREF) \ -f ac3 -flags +bitexact -c ac3_fixed diff --git a/tests/ref/fate/unknown_layout-ac3 b/tests/ref/fate/unknown_layout-ac3 deleted file mode 100644 index 719a44aacf..0000000000 --- a/tests/ref/fate/unknown_layout-ac3 +++ /dev/null @@ -1 +0,0 @@ -febdb165cfd6cba375aa086195e61213