From patchwork Mon Feb 13 18:09:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Gaullier X-Patchwork-Id: 40386 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:5494:b0:bf:7b3a:fd32 with SMTP id i20csp3677298pzk; Mon, 13 Feb 2023 10:10:51 -0800 (PST) X-Google-Smtp-Source: AK7set/CM25Bkuu58/C8J7Vhy0rF+uRfzXFFpga/oDwQHpi/h2h6eQBd8rO9qB/fvDLO2mPsVp63 X-Received: by 2002:a17:906:2cd1:b0:888:6ae0:d12e with SMTP id r17-20020a1709062cd100b008886ae0d12emr27909808ejr.36.1676311851811; Mon, 13 Feb 2023 10:10:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676311851; cv=none; d=google.com; s=arc-20160816; b=vPq3byA1hqeiWSJpj/O13BcHCEA6Lf9JXQc0bGgM6cUIrbcgVOJYelBMGBolmEQ0Rv 8+lSvasmSOsCGyltbwxWPLx9dMb/OPQfiBI/wuH7Huje/8zKfkDV4c85aeeb+G7/d9K3 /b1i8vQjCcnpzdGUAVIy3tWymFEyh0meIjzRBlB2V63XylMTvCgImS72zOQbEEKehdPI fV1zIUCF4NeNuBV/11VECvwobdSrW7yHUnzESrT49McDWMPkSeWJltaG4w1fMPrsXRdd aHYR+VOTLYbbD+DmtWQ54ZOJAm/ii0yeJ2AKBiHr4yJzVQ1QJ6cY++yGkXf+XA03PLBd ITFQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:delivered-to; bh=FqzkcLAlhoa4aS6mdPrfX55ceiOOeRNT0GmADx4nQiI=; b=KNAyXJ1CKhviENk7ThVwuB9+VAXKn+xAEIq84KV5KoOdu0kREc1bRaMzJ4wPn0Dlto K3Y+XWA/KUurnWXVoGajsfRPBFNWZ+LnWEZhfbrssgj4nFbIZCxwhkT6qcVROrm60U5H 38HRoIs4uC761HzhcwWdJHpBLgo2t3vxRAlgISji1vfs5Oota9pOkJZufVzoezs5v5yl cOA7X8NvLTQYSh/9O+fZK12cm1Dv3MCs3HhNZ6nwz961Yy/Q74l2qscpslWnMFdt2c+u O/J5ZEKrEvQ07CmuiAS2YTL4K8HdXGNnHCHNhuvjMk1Vcx1EtLC1j/dxCI5k1TIDgqup 0Ziw== 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 vf2-20020a170907238200b0087cc469b195si13158080ejb.423.2023.02.13.10.10.51; Mon, 13 Feb 2023 10:10:51 -0800 (PST) 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 57C2968BE88; Mon, 13 Feb 2023 20:09:57 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from srv-infra-2.infra.inf.glb.tvvideoms.com (www.inf.tvvideoms.com [213.205.126.156]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3B1CC68BE7F for ; Mon, 13 Feb 2023 20:09:50 +0200 (EET) Received: from cji.paris (unknown [172.16.3.159]) by srv-infra-2.infra.inf.glb.tvvideoms.com (Postfix) with ESMTP id 5441642D65; Mon, 13 Feb 2023 18:09:45 +0000 (UTC) From: Nicolas Gaullier To: ffmpeg-devel@ffmpeg.org Date: Mon, 13 Feb 2023 19:09:36 +0100 Message-Id: <20230213180936.815-7-nicolas.gaullier@cji.paris> X-Mailer: git-send-email 2.39.1.windows.1 In-Reply-To: <20230213180936.815-1-nicolas.gaullier@cji.paris> References: <20230213180936.815-1-nicolas.gaullier@cji.paris> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 6/6] avformat/wavdec: Test s337m 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: Nicolas Gaullier Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: ci1Xf8VIgE/x Test s337m probing in wav container. Test dolby_e demuxing for 20 bits with program config '5.1+2'. --- tests/Makefile | 1 + tests/fate/audio.mak | 3 +++ tests/ref/fate/s337m-wav | 10 ++++++++++ 3 files changed, 14 insertions(+) create mode 100644 tests/ref/fate/s337m-wav diff --git a/tests/Makefile b/tests/Makefile index 1d50e1d175..d78f78d1b8 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -99,6 +99,7 @@ REMUX = $(call ALLYES, $(firstword $(1))_MUXER $(lastword $(1))_DEMUXER \ $(2) FILE_PROTOCOL PIPE_PROTOCOL FRAMECRC_MUXER) DEMDEC = $(call ALLYES, $(1)_DEMUXER $(2:%=%_DECODER) $(3) FILE_PROTOCOL) +DEMDEMDEC = $(call ALLYES, $(1)_DEMUXER $(2)_DEMUXER $(3:%=%_DECODER)) ENCMUX = $(call ALLYES, $(1:%=%_ENCODER) $(2)_MUXER $(3)) FRAMEMD5 = $(call ALLYES, $(1)_DEMUXER $(2:%=%_DECODER) $(3) \ diff --git a/tests/fate/audio.mak b/tests/fate/audio.mak index 65317c8d45..1d1c75b0b3 100644 --- a/tests/fate/audio.mak +++ b/tests/fate/audio.mak @@ -31,6 +31,9 @@ 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-s337m-wav +fate-s337m-wav: CMD = framecrc -i $(TARGET_SAMPLES)/dolby_e/512.wav -vn -c:a copy + 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 -af aresample fate-dss-sp: CMD = framecrc -i $(TARGET_SAMPLES)/dss/sp.dss -frames 30 diff --git a/tests/ref/fate/s337m-wav b/tests/ref/fate/s337m-wav new file mode 100644 index 0000000000..768a6f0161 --- /dev/null +++ b/tests/ref/fate/s337m-wav @@ -0,0 +1,10 @@ +#tb 0: 1/48000 +#media_type 0: audio +#codec_id 0: dolby_e +#sample_rate 0: 44800 +#channel_layout_name 0: 7.1 +0, 0, 0, 1920, 11496, 0x05a9c147 +0, 1920, 1920, 1920, 11496, 0x1d44d2b4 +0, 3840, 3840, 1920, 11496, 0x4e078953 +0, 5760, 5760, 1920, 11496, 0x1c73b1a1 +0, 7680, 7680, 1920, 11262, 0xfa179fc8