From patchwork Fri Jan 3 15:56:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Gaullier X-Patchwork-Id: 17180 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 B736144A938 for ; Fri, 3 Jan 2020 17:56:53 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A2C4F68ABE7; Fri, 3 Jan 2020 17:56:53 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from smtp-2.arkena.net (smtp-2.arkena.net [95.81.173.75]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B80E968ABC5 for ; Fri, 3 Jan 2020 17:56:45 +0200 (EET) Received: from secu2 (unknown [10.180.103.10]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp-2.arkena.net (Postfix) with ESMTPSA id 47q8fK3MV8zHh9d; Fri, 3 Jan 2020 15:56:41 +0000 (UTC) Received: from arkena.com (unknown [172.16.3.159]) by secu2 (Postfix) with ESMTP id 70B613FA74; Fri, 3 Jan 2020 16:56:42 +0100 (CET) From: Nicolas Gaullier To: ffmpeg-devel@ffmpeg.org Date: Fri, 3 Jan 2020 16:56:36 +0100 Message-Id: <20200103155636.7476-10-nicolas.gaullier@cji.paris> X-Mailer: git-send-email 2.14.1.windows.1 In-Reply-To: <20200103155636.7476-1-nicolas.gaullier@cji.paris> References: <20200103155636.7476-1-nicolas.gaullier@cji.paris> Subject: [FFmpeg-devel] [PATCH 9/9] avformat/wavdec: Test s337m 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 Cc: Nicolas Gaullier MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Test the new 'dolbyeprobe' AVOption. Test dolby_e decoding for 24 bits with program config '5.1+2' --- tests/Makefile | 1 + tests/fate-run.sh | 4 ++++ tests/fate/audio.mak | 5 +++++ 3 files changed, 10 insertions(+) diff --git a/tests/Makefile b/tests/Makefile index e5f41008d4..65cccac312 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -75,6 +75,7 @@ ENCDEC2 = $(call ALLYES, $(firstword $(1))_ENCODER $(lastword $(1))_DECODER \ $(firstword $(3))_MUXER $(lastword $(3))_DEMUXER) DEMDEC = $(call ALLYES, $(1)_DEMUXER $(2:%=%_DECODER)) +DEMDEMDEC = $(call ALLYES, $(1)_DEMUXER $(2)_DEMUXER $(3:%=%_DECODER)) ENCMUX = $(call ALLYES, $(1:%=%_ENCODER) $(2)_MUXER) DEMMUX = $(call ALLYES, $(1)_DEMUXER $(2)_MUXER) diff --git a/tests/fate-run.sh b/tests/fate-run.sh index 83cad8cabe..f06b2fd029 100755 --- a/tests/fate-run.sh +++ b/tests/fate-run.sh @@ -162,6 +162,10 @@ pcm(){ ffmpeg "$@" -vn -f s16le - } +dolbye2pcm16(){ + ffmpeg -dolbyeprobe 1 "$@" -vn -f s16le - +} + fmtstdout(){ fmt=$1 shift 1 diff --git a/tests/fate/audio.mak b/tests/fate/audio.mak index c41958ea2d..0e56d401ea 100644 --- a/tests/fate/audio.mak +++ b/tests/fate/audio.mak @@ -24,6 +24,11 @@ fate-dolby-e: CMD = pcm -i $(TARGET_SAMPLES)/dolby_e/16-11 fate-dolby-e: CMP = oneoff fate-dolby-e: REF = $(SAMPLES)/dolby_e/16-11.pcm +FATE_SAMPLES_AUDIO-$(call DEMDEMDEC, WAV, S337M, DOLBY_E) += fate-dolby-e-wav +fate-dolby-e-wav: CMD = dolbye2pcm16 -i $(TARGET_SAMPLES)/dolby_e/512.wav +fate-dolby-e-wav: CMP = oneoff +fate-dolby-e-wav: REF = $(SAMPLES)/dolby_e/512.wav.pcm + FATE_SAMPLES_AUDIO-$(call DEMDEC, DSS, DSS_SP) += fate-dss-lp fate-dss-sp fate-dss-lp: CMD = framecrc -i $(TARGET_SAMPLES)/dss/lp.dss -frames 30 fate-dss-sp: CMD = framecrc -i $(TARGET_SAMPLES)/dss/sp.dss -frames 30