From patchwork Sun Apr 19 15:11:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 19087 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 32FBA44AED7 for ; Sun, 19 Apr 2020 18:12:06 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 04A4368B919; Sun, 19 Apr 2020 18:12:06 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f175.google.com (mail-qt1-f175.google.com [209.85.160.175]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id ACD4468B6B2 for ; Sun, 19 Apr 2020 18:11:59 +0300 (EEST) Received: by mail-qt1-f175.google.com with SMTP id l60so6336988qtd.8 for ; Sun, 19 Apr 2020 08:11:59 -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=mcoGYqXdjDg0mSZqpH6hPfpNDuQ+4k3Dyt3acyRMCTM=; b=c+6QiVl0VhLlmtArPi7RLUFIe0MGeykl/83fDpeWji3sn9qMWoqYSSn6BoJjB5z1Dx cSGGeKDz9Xu+5TcezdBf1nPeDwsPnYIdA1zMCfuldadfhtNx9TSqs/SVQc3IKHUmpkKI /M7I515rWKo62iEyi7QUHbncijQUrmtneNiuD5z/Dvxpp4MN/Bp9uRM3DkT8S94pYwM2 c4reXdAEEc8g09zbBxnLep7i2KWuQaG2MJwVjlhE9+DPmSu5CzJGpAhwsMk0OcwDofU4 8SMEyG2cNJFbKG4LInQYKIY2/gPsoBAnxsq/vKPo+W4d+yjGts/bFs1aaTG4hB0hnqSU PVEQ== 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=mcoGYqXdjDg0mSZqpH6hPfpNDuQ+4k3Dyt3acyRMCTM=; b=n0N1YoY9nji3YDHqSivJ2HzOCgaNf8DK6c3IJs3fS2iw0TNqmfgp37ONNVsLNRfxax vshAT1IxYhkDPpMguLi7qmWWf3ZLH4spXgy0POWXqkqirnE2Xl3RuDjbFUQUqZtU6oiX AuEHIBRfP0h0xKps6yO7ztJLo5ZFZJd3PP+zwza5U5FOEis0RcDgJmr4f8r7/MNye6Ga UzQlCX5nEeH9d3Q4QtUWonaqLCJBcLcfWxlSH0AAdN//AZ3E64eO9cknI538Dyn4peEe Dj+gdNllNBXnJkosqhnmYmOWUu7POzrVZdPTNbriK8DFnzXucoW0qn4G8g+BaTDTUx1s 6cVw== X-Gm-Message-State: AGi0PuZQMQRLN+da/MJ0yg/XTRAEwtKPkN4NO3kjrnz5a/fpqLjb/JD2 f3+koS9/Fq++U7nZr4dUZhrgBlz5yVg= X-Google-Smtp-Source: APiQypJDtvriNolv3X6Yt1C1riNXZvLv+9dVXCGBF4qxqomsYLptvquGrFw6POk7efAYmT5RaxbZLw== X-Received: by 2002:ac8:6d2c:: with SMTP id r12mr12072867qtu.355.1587309118068; Sun, 19 Apr 2020 08:11:58 -0700 (PDT) Received: from localhost.localdomain ([191.83.215.190]) by smtp.gmail.com with ESMTPSA id d188sm20028976qkg.59.2020.04.19.08.11.57 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Apr 2020 08:11:57 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sun, 19 Apr 2020 12:11:37 -0300 Message-Id: <20200419151138.11764-1-jamrial@gmail.com> X-Mailer: git-send-email 2.26.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] fate: move TrueHD tests to their own file X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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" Signed-off-by: James Almer --- tests/Makefile | 1 + tests/fate/lossless-audio.mak | 6 ------ tests/fate/truehd.mak | 12 ++++++++++++ tests/ref/fate/lossless-truehd-5.1 | 1 - tests/ref/fate/lossless-truehd-5.1-downmix-2.0 | 1 - 5 files changed, 13 insertions(+), 8 deletions(-) create mode 100644 tests/fate/truehd.mak delete mode 100644 tests/ref/fate/lossless-truehd-5.1 delete mode 100644 tests/ref/fate/lossless-truehd-5.1-downmix-2.0 diff --git a/tests/Makefile b/tests/Makefile index bf5b658926..ab3c235f25 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -187,6 +187,7 @@ include $(SRC_PATH)/tests/fate/segment.mak include $(SRC_PATH)/tests/fate/source.mak include $(SRC_PATH)/tests/fate/speedhq.mak include $(SRC_PATH)/tests/fate/subtitles.mak +include $(SRC_PATH)/tests/fate/truehd.mak include $(SRC_PATH)/tests/fate/utvideo.mak include $(SRC_PATH)/tests/fate/video.mak include $(SRC_PATH)/tests/fate/voice.mak diff --git a/tests/fate/lossless-audio.mak b/tests/fate/lossless-audio.mak index d29285328d..66ac6d8972 100644 --- a/tests/fate/lossless-audio.mak +++ b/tests/fate/lossless-audio.mak @@ -13,12 +13,6 @@ fate-lossless-shorten: CMD = md5 -i $(TARGET_SAMPLES)/lossless-audio/luckynight- FATE_SAMPLES_LOSSLESS_AUDIO-$(call DEMDEC, TAK, TAK) += fate-lossless-tak fate-lossless-tak: CMD = crc -i $(TARGET_SAMPLES)/lossless-audio/luckynight-partial.tak -FATE_TRUEHD = fate-lossless-truehd-5.1 fate-lossless-truehd-5.1-downmix-2.0 -fate-lossless-truehd-5.1: CMD = md5 -f truehd -i $(TARGET_SAMPLES)/lossless-audio/truehd_5.1.raw -f s32le -fate-lossless-truehd-5.1-downmix-2.0: CMD = md5 -f truehd -request_channel_layout 2 -i $(TARGET_SAMPLES)/lossless-audio/truehd_5.1.raw -f s32le -fate-lossless-truehd: $(FATE_TRUEHD) -FATE_SAMPLES_LOSSLESS_AUDIO-$(call DEMDEC, TRUEHD, TRUEHD) += $(FATE_TRUEHD) - FATE_SAMPLES_LOSSLESS_AUDIO-$(call DEMDEC, TTA, TTA) += fate-lossless-tta fate-lossless-tta: CMD = crc -i $(TARGET_SAMPLES)/lossless-audio/inside.tta diff --git a/tests/fate/truehd.mak b/tests/fate/truehd.mak new file mode 100644 index 0000000000..6c8b1220f1 --- /dev/null +++ b/tests/fate/truehd.mak @@ -0,0 +1,12 @@ +FATE_TRUEHD-$(call DEMDEC, TRUEHD, TRUEHD) += fate-truehd-5.1 +fate-truehd-5.1: CMD = md5pipe -f truehd -i $(TARGET_SAMPLES)/lossless-audio/truehd_5.1.raw -f s32le +fate-truehd-5.1: CMP = oneline +fate-truehd-5.1: REF = 95d8aac39dd9f0d7fb83dc7b6f88df35 + +FATE_TRUEHD-$(call DEMDEC, TRUEHD, TRUEHD) += fate-truehd-5.1-downmix-2.0 +fate-truehd-5.1-downmix-2.0: CMD = md5pipe -f truehd -request_channel_layout 2 -i $(TARGET_SAMPLES)/lossless-audio/truehd_5.1.raw -f s32le +fate-truehd-5.1-downmix-2.0: CMP = oneline +fate-truehd-5.1-downmix-2.0: REF = a269aee0051d4400c9117136f08c9767 + +FATE_SAMPLES_AUDIO += $(FATE_TRUEHD-yes) +fate-truehd: $(FATE_TRUEHD-yes) diff --git a/tests/ref/fate/lossless-truehd-5.1 b/tests/ref/fate/lossless-truehd-5.1 deleted file mode 100644 index 373b917948..0000000000 --- a/tests/ref/fate/lossless-truehd-5.1 +++ /dev/null @@ -1 +0,0 @@ -95d8aac39dd9f0d7fb83dc7b6f88df35 diff --git a/tests/ref/fate/lossless-truehd-5.1-downmix-2.0 b/tests/ref/fate/lossless-truehd-5.1-downmix-2.0 deleted file mode 100644 index f4afbc19b8..0000000000 --- a/tests/ref/fate/lossless-truehd-5.1-downmix-2.0 +++ /dev/null @@ -1 +0,0 @@ -a269aee0051d4400c9117136f08c9767 From patchwork Sun Apr 19 15:11:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 19088 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 8AADF44AFD5 for ; Sun, 19 Apr 2020 18:12:07 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6870368B92D; Sun, 19 Apr 2020 18:12:07 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f196.google.com (mail-qt1-f196.google.com [209.85.160.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 765AB68B6B2 for ; Sun, 19 Apr 2020 18:12:00 +0300 (EEST) Received: by mail-qt1-f196.google.com with SMTP id n20so114078qtp.9 for ; Sun, 19 Apr 2020 08:12:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=fhphotFtn5YrDjVi57+e7Df/X+VUIOk5XDMxQzdbgsU=; b=iI/JFUR04tqX2kTDu46kqX6BEK0raqNxEm5wZyxmBW9qNgoEiKW92sCb+CqlyZsIRH gJ/XSZGXqSaVfiSZ2W7srMWOLR2E6IJQpq3PTlhpLrGSuELua9JNPYnrdhip2lXpYAkX tY7Yqa2RRIV6JrYy7tgxjwrh8IZrZDoNe9xfBtTC3I80kZ/1+PxXnn4p8lLVz4uR0qjv ZBIsuUYf0WLFZ9sWrP5nyJrEa6dU7GNr7FpHaLlBHM31Dhq8SBdoptdSaAfyTCCU4ViL JB3WZLs7EdHYn5loMTcB0FG1VXxe2JnNCwWB2s4q4g2orsveqvKKMUnKda2sSovju2MX mjQA== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=fhphotFtn5YrDjVi57+e7Df/X+VUIOk5XDMxQzdbgsU=; b=W1Rqx7iqLrS+QXgmMQVs+672S1f0nwh4MH4jpureawdRpZXwLPtaFvVrkbstdmEP1f 2O0jyd0yqZH17P6DAPRjOi8+ozfOU9rOAmPjFB8s4FtLtpQO49Egi+hhSqZF3NqQh0ik 9MB08+4LHMvpBFEbnYHvtWFLr6uCURxEWMR4nXktC1oGpxqka/U+TsrnxV2q4VT4wv2M 5/K6vBXjyT0a4P03gUCpwY0SYERE7j+wp+eE8UYmJ9k/bTB6M4q+MAaol3KmLNziWa8K IR0jkfBY4Qmu16b7OD3WWpPTcGynW1hPi4ht7zCaI/ODLLDVVe8BFK3DNK9Mbu4Ncx9t PvNg== X-Gm-Message-State: AGi0PuYB/fbZUjPrJe4jBis+upb62BhiPiOmEGtdbkDpfNbr3nfFEYiq iziIUQccxjxNZ7u4Cau5fcG8b9HntBU= X-Google-Smtp-Source: APiQypKossXl8wYl6y335JlALYVj3iJ/4FsWMGbiDnue8O33m4ROse59uVhzsfOKj8uFfkbc2QZHHg== X-Received: by 2002:ac8:1788:: with SMTP id o8mr12078300qtj.15.1587309119116; Sun, 19 Apr 2020 08:11:59 -0700 (PDT) Received: from localhost.localdomain ([191.83.215.190]) by smtp.gmail.com with ESMTPSA id d188sm20028976qkg.59.2020.04.19.08.11.58 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Apr 2020 08:11:58 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sun, 19 Apr 2020 12:11:38 -0300 Message-Id: <20200419151138.11764-2-jamrial@gmail.com> X-Mailer: git-send-email 2.26.0 In-Reply-To: <20200419151138.11764-1-jamrial@gmail.com> References: <20200419151138.11764-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] fate/truehd: add a test for the truehd_core bitstream filter X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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" Signed-off-by: James Almer --- tests/fate/truehd.mak | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tests/fate/truehd.mak b/tests/fate/truehd.mak index 6c8b1220f1..e672716527 100644 --- a/tests/fate/truehd.mak +++ b/tests/fate/truehd.mak @@ -8,5 +8,10 @@ fate-truehd-5.1-downmix-2.0: CMD = md5pipe -f truehd -request_channel_layout 2 - fate-truehd-5.1-downmix-2.0: CMP = oneline fate-truehd-5.1-downmix-2.0: REF = a269aee0051d4400c9117136f08c9767 +FATE_TRUEHD-$(call ALLYES, TRUEHD_DEMUXER TRUEHD_MUXER TRUEHD_CORE_BSF) += fate-truehd-core-bsf +fate-truehd-core-bsf: CMD = md5pipe -i $(TARGET_SAMPLES)/truehd/atmos.thd -c:a copy -bsf:a truehd_core -fflags +bitexact -f truehd +fate-truehd-core-bsf: CMP = oneline +fate-truehd-core-bsf: REF = 3aa5d0c7825051f3657b71fd6135183b + FATE_SAMPLES_AUDIO += $(FATE_TRUEHD-yes) fate-truehd: $(FATE_TRUEHD-yes)