From patchwork Thu Feb 15 12:57:16 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gyan X-Patchwork-Id: 7606 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.150.1 with SMTP id c1csp2099277jai; Thu, 15 Feb 2018 05:03:55 -0800 (PST) X-Google-Smtp-Source: AH8x227bELsljHbI4FePN2Rq7ms6z54S6doKBUcMRk5Lho/k3PQhKendIfdaVkru/96inyeyv88v X-Received: by 10.223.156.145 with SMTP id d17mr2556128wre.1.1518699835416; Thu, 15 Feb 2018 05:03:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1518699835; cv=none; d=google.com; s=arc-20160816; b=oVL8qANqUE3/DPp7Vlxuclmz9V8CtvaJa4vn/OpaH2ICeD3DMlYnYO+JxU3eBALhIC xlGCkzc2AiWn5kynQsmPQyb7vo1JyLeYNYsuH0dgJfMCAR6zPJX71Qvq5h8/d8f1qYWe kBBmE/QcDtucT+R0qrM/1+Hvy9Ytc8jGq1G3ooLeAbR+HCNzLbyHtfh3iRjp89A61pH/ B9TpZWJAs5O1YR5E5IssVEEJ1U8BJGPLyp02wUILQBC5h/F9sqqjCn64ZridGAd4S5HH I98Dh1jHjiCmg9NpzIKkIn1l0+Mh+qa6mm2hXnD1zxWCo5P1ddzpulkto0jEB9AOCMBs jHYg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject :content-language:in-reply-to:mime-version:user-agent:date :message-id:from:references:to:dkim-signature:delivered-to :arc-authentication-results; bh=1ANvgD3zd1lRWr9hmUGrEP6OLokXX3sOBQ6f73RPzKE=; b=nd6Edg4e9AMZOVK0/gxacgLmsP6HIRG+S1Y8IlSK5RgHwsB1h9ldM+XGm0TbIs9MOi gJ8A7RmaNKMdLQV6qRpZ+om3/TXtbJVDWX2k/GBdMgRmIv2lb6C5VUX+Z3ZyHe/3DW7A 6eggcYYAca/EznRWL3QoMV3fViRPNOaVvV5SyfF4WkLzQeaHfPDrHpcZg2+S3gcmOZgD JQOHRw5GRCQZ+awKLaeEh4fRrd98OcfKXs+JgfTzK+mFVI+EWCag2+7Uk3jIFmqpauXp AdH8HOe3dV7HRk/3q+CacfmL5o7nHAyQHlfYAObzEHhtg8BTqKepqbuOX4PakAZltrsL I1RQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=GsO1wSCs; 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 e123si8596749wma.186.2018.02.15.05.03.54; Thu, 15 Feb 2018 05:03:55 -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; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=GsO1wSCs; 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 01860689F3A; Thu, 15 Feb 2018 15:03:41 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg0-f41.google.com (mail-pg0-f41.google.com [74.125.83.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 14356689EC6 for ; Thu, 15 Feb 2018 15:03:34 +0200 (EET) Received: by mail-pg0-f41.google.com with SMTP id l24so4156878pgc.5 for ; Thu, 15 Feb 2018 05:03:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:to:references:from:message-id:date:user-agent:mime-version :in-reply-to:content-language; bh=U9rmgv6l5UGQFAHuyaBcu3/Y8zc5qn8/9aOEW7yJs5U=; b=GsO1wSCswyy3eAeNiLv7FndIoCj+ZFefHsgmuaDYU+eobxmroQDi24CP94+Sl4dn22 0w2eitqRR416W6YaKBB1V+79ipseLhX+uk+So5RF1Rj1UiusOh/rkFRzh6xoaH2AkgVI PtZvGG+Gy0CCgcWhAAk+YBJP4cYHwX1WDeKzMXjVxhEKYrf++Vut/QAOtq2Tc4pmiulN c09uQ3W8I4uAB5r38teayrJxdvA/X3Z4v4L+sES6qKBAEkJevCKHjpe0ErcdrHrlEmHL a2DBghjOmPTY/0WUZ/wZMnpEhBcUdLGUjiPORJSCQQZP4Pj/vsuY3YTvC8Jes3DUOKBu f5dQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language; bh=U9rmgv6l5UGQFAHuyaBcu3/Y8zc5qn8/9aOEW7yJs5U=; b=oG3GUncHe4hTXfhssHo/FOSAnUgR+J45dFNaqDfImagAbJH2vX3j5EzVhZ0NbhM72D SxY21gB9fGDy6iFN1qOaWteArxLF8sm7avUIWbeRR7wDkwud8JnwtU03TQxubjKuAa2N FuIUXpa5MtwKcqor3c0Mvena9ZEfCUQf7ntwsmFX2v5l6JcJEgE/f5s0KsqwKvGKdzt1 0nJz+3gqHAuZAqguLHG0wQFNk50+mA7tRFVaZ/8W5HT+8JtK7GrzsVfZSJBMxJ4ORyPQ UWPzSeMgx8X0UDC4a2LKm4WSvpD+HPI8PiqZ6tkquKIgaGUl5HdIBuCdTA2X48LKBc3p y+Eg== X-Gm-Message-State: APf1xPCIzwKj2EPVKxziSvr2yZ/4zynWoXpCMXnaTw/DiFh/IKXlkHfL /EQaWC1ylWqmnNAQkUCsXFUlTkVW X-Received: by 10.101.76.78 with SMTP id l14mr2138123pgr.336.1518699444836; Thu, 15 Feb 2018 04:57:24 -0800 (PST) Received: from [192.168.1.64] ([103.206.133.161]) by smtp.gmail.com with ESMTPSA id q87sm43703225pfk.71.2018.02.15.04.57.21 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 Feb 2018 04:57:23 -0800 (PST) To: ffmpeg-devel@ffmpeg.org References: <294338e6-be38-88aa-7add-1b2f7ce84eab@gmail.com> <8c020b48-4ced-6f63-8752-948cf288e5fd@gmail.com> <0981c42c-946c-8796-4880-f752c2cc83dc@gmail.com> <20180202222934.GW3063@michaelspb> <20180215032837.GJ23018@michaelspb> From: Gyan Doshi Message-ID: <3edf4acc-38ce-a25a-1003-a21cfea03c3e@gmail.com> Date: Thu, 15 Feb 2018 18:27:16 +0530 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.6.0 MIME-Version: 1.0 In-Reply-To: <20180215032837.GJ23018@michaelspb> Content-Language: en-US Subject: Re: [FFmpeg-devel] [PATCH 3/4] avformat/mpegenc - accept PCM_DVD streams 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" On 2/15/2018 8:58 AM, Michael Niedermayer wrote: > On Tue, Feb 13, 2018 at 12:36:15AM +0530, Gyan Doshi wrote: >> FATE patch and sample file attached. Sample file should go into (new) mpegps >> directory in suite. > > have you checked that none of the existing fate samples can be used ? Yes. There's only MPEG-PS with PCM audio in it in the suite at present but the stream is 24-bit, which can't be muxed. New FATE test attached. Removed the md5 test and added a framecrc test on a remuxed file since any bit flips due to other parts of the muxer should be disregarded. Regards, Gyan From 15e27259aa05988751eb0456b457b11ce5019ae8 Mon Sep 17 00:00:00 2001 From: Gyan Doshi Date: Thu, 15 Feb 2018 17:48:47 +0530 Subject: [PATCH v2] fate/mpegps: add tests for PCM_DVD stream remux --- tests/Makefile | 1 + tests/fate-run.sh | 16 +++++++++++ tests/fate/mpegps.mak | 7 +++++ tests/ref/fate/mpegps-remuxed-pcm-demux | 50 +++++++++++++++++++++++++++++++++ 4 files changed, 74 insertions(+) create mode 100644 tests/fate/mpegps.mak create mode 100644 tests/ref/fate/mpegps-remuxed-pcm-demux diff --git a/tests/Makefile b/tests/Makefile index 327e3f4420..f1ac610454 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -149,6 +149,7 @@ include $(SRC_PATH)/tests/fate/mov.mak include $(SRC_PATH)/tests/fate/mp3.mak include $(SRC_PATH)/tests/fate/mpc.mak include $(SRC_PATH)/tests/fate/mpeg4.mak +include $(SRC_PATH)/tests/fate/mpegps.mak include $(SRC_PATH)/tests/fate/mpegts.mak include $(SRC_PATH)/tests/fate/mxf.mak include $(SRC_PATH)/tests/fate/opus.mak diff --git a/tests/fate-run.sh b/tests/fate-run.sh index 82862b7ef4..457761c152 100755 --- a/tests/fate-run.sh +++ b/tests/fate-run.sh @@ -226,6 +226,22 @@ transcode(){ -f framecrc - || return } +stream_remux(){ + src_fmt=$1 + srcfile=$2 + enc_fmt=$3 + stream_maps=$4 + final_decode=$5 + encfile="${outdir}/${test}.${enc_fmt}" + test "$7" = -keep || cleanfiles="$cleanfiles $encfile" + tsrcfile=$(target_path $srcfile) + tencfile=$(target_path $encfile) + ffmpeg -f $src_fmt -i $tsrcfile $stream_maps -codec copy $FLAGS \ + -f $enc_fmt -y $tencfile || return + ffmpeg $DEC_OPTS -i $encfile $ENC_OPTS $FLAGS $final_decode \ + -f framecrc - || return +} + lavffatetest(){ t="${test#lavf-fate-}" ref=${base}/ref/lavf-fate/$t diff --git a/tests/fate/mpegps.mak b/tests/fate/mpegps.mak new file mode 100644 index 0000000000..cec1ea77fa --- /dev/null +++ b/tests/fate/mpegps.mak @@ -0,0 +1,7 @@ +# This tests that a 16-bit pcm_dvd stream is correctly remuxed in mpegps +FATE_MPEGPS-$(call DEMMUX, MPEGPS, MPEG1SYSTEM) += fate-mpegps-remuxed-pcm-demux +fate-mpegps-remuxed-pcm-demux: $(TARGET_SAMPLES)/mpegps/pcm_aud.mpg +fate-mpegps-remuxed-pcm-demux: CMD = stream_remux "mpeg" "$(TARGET_SAMPLES)/mpegps/pcm_aud.mpg" "mpeg" "-map 0:a:0" "-codec copy" + +FATE_SAMPLES_FFMPEG += $(FATE_MPEGPS-yes) +fate-mpegps: $(FATE_MPEGPS-yes) diff --git a/tests/ref/fate/mpegps-remuxed-pcm-demux b/tests/ref/fate/mpegps-remuxed-pcm-demux new file mode 100644 index 0000000000..b5b277868f --- /dev/null +++ b/tests/ref/fate/mpegps-remuxed-pcm-demux @@ -0,0 +1,50 @@ +#tb 0: 1/90000 +#media_type 0: audio +#codec_id 0: pcm_dvd +#sample_rate 0: 44100 +#channel_layout 0: 4 +#channel_layout_name 0: mono +0, 0, 0, 2040, 2005, 0x8e98e563 +0, 2090, 2090, 2069, 2033, 0xd6f2f455 +0, 4180, 4180, 2057, 2021, 0x77a6e6c9 +0, 6269, 6269, 2057, 2021, 0x8dbcf6be +0, 8359, 8359, 2057, 2021, 0xc629eaa0 +0, 10449, 10449, 2057, 2021, 0xa951ebe5 +0, 12539, 12539, 2057, 2021, 0x1324f29b +0, 14629, 14629, 2057, 2021, 0x55f1e968 +0, 16718, 16718, 2057, 2021, 0x98a7f994 +0, 18808, 18808, 2057, 2021, 0xba42f42f +0, 20898, 20898, 2057, 2021, 0xcf5cefe6 +0, 22988, 22988, 2057, 2021, 0xeef8f2b5 +0, 25078, 25078, 2057, 2021, 0x71faf42f +0, 27167, 27167, 2057, 2021, 0x0346f019 +0, 29257, 29257, 2057, 2021, 0xbca0f4a3 +0, 31347, 31347, 2057, 2021, 0x3b6ced4f +0, 33437, 33437, 2057, 2021, 0xc8b9ea0a +0, 35527, 35527, 2057, 2021, 0x18e5f385 +0, 37616, 37616, 2057, 2021, 0x74f6e9d6 +0, 39706, 39706, 2057, 2021, 0x35d8f2b5 +0, 41796, 41796, 2057, 2021, 0x9d2aec53 +0, 43886, 43886, 2057, 2021, 0xf0acf1a0 +0, 45976, 45976, 2057, 2021, 0xa724ebe9 +0, 48065, 48065, 2057, 2021, 0xd4f8f534 +0, 50155, 50155, 2057, 2021, 0xdf62efc6 +0, 52245, 52245, 2057, 2021, 0x9865f504 +0, 54335, 54335, 2057, 2021, 0x8670efb7 +0, 56424, 56424, 2057, 2021, 0xe51af219 +0, 58514, 58514, 2057, 2021, 0x0210f27f +0, 60604, 60604, 2057, 2021, 0x4b08f406 +0, 62694, 62694, 2057, 2021, 0x2b02eed4 +0, 64784, 64784, 2057, 2021, 0x0445ed00 +0, 66873, 66873, 2057, 2021, 0xfae9f21f +0, 68963, 68963, 2057, 2021, 0x3d6beabc +0, 71053, 71053, 2057, 2021, 0xc50af39c +0, 73143, 73143, 2057, 2021, 0xf9eceb82 +0, 75233, 75233, 2057, 2021, 0x7b89eb9b +0, 77322, 77322, 2057, 2021, 0x7c07ef4b +0, 79412, 79412, 2057, 2021, 0xbfacf1eb +0, 81502, 81502, 2057, 2021, 0xccb2f27b +0, 83592, 83592, 2057, 2021, 0xc035f557 +0, 85682, 85682, 2057, 2021, 0xbdf1edea +0, 87771, 87771, 2057, 2021, 0x3644f424 +0, 89861, 89861, 1457, 1433, 0xdd17d51f