From patchwork Wed Jan 22 13:45:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Guo, Yejun" X-Patchwork-Id: 17468 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 DE81644856C for ; Wed, 22 Jan 2020 15:53:59 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BBF0E68AFDD; Wed, 22 Jan 2020 15:53:59 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6DB1B68A259 for ; Wed, 22 Jan 2020 15:53:53 +0200 (EET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 22 Jan 2020 05:53:50 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.70,350,1574150400"; d="scan'208";a="400014951" Received: from yguo18-skl-u1604.sh.intel.com ([10.239.13.25]) by orsmga005.jf.intel.com with ESMTP; 22 Jan 2020 05:53:49 -0800 From: "Guo, Yejun" To: ffmpeg-devel@ffmpeg.org Date: Wed, 22 Jan 2020 21:45:23 +0800 Message-Id: <1579700723-14885-1-git-send-email-yejun.guo@intel.com> X-Mailer: git-send-email 2.7.4 Subject: [FFmpeg-devel] [PATCH V2] fate/filter-video.mak: do not use bit-exact check for dnn_processing 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: yejun.guo@intel.com MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" The reason is that the tested models are in float format. And also remove fate-filter-dnn_processing-halve_gray_float to make reference files smaller. Signed-off-by: Guo, Yejun --- tests/fate/filter-video.mak | 7 +-- ...filter-dnn_processing-halve_first_channel_float | 55 ---------------------- .../fate/filter-dnn_processing-halve_gray_float | 55 ---------------------- 3 files changed, 4 insertions(+), 113 deletions(-) delete mode 100644 tests/ref/fate/filter-dnn_processing-halve_first_channel_float delete mode 100644 tests/ref/fate/filter-dnn_processing-halve_gray_float diff --git a/tests/fate/filter-video.mak b/tests/fate/filter-video.mak index 02986b5..6e744b5 100644 --- a/tests/fate/filter-video.mak +++ b/tests/fate/filter-video.mak @@ -259,9 +259,10 @@ FATE_FILTER_SAMPLES-$(call ALLYES, PNG_DECODER APNG_DEMUXER FORMAT_FILTER COLOR_ FATE_FILTER_VSYNTH-$(CONFIG_PHASE_FILTER) += fate-filter-phase fate-filter-phase: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf phase -FATE_FILTER_VSYNTH-$(CONFIG_DNN_PROCESSING_FILTER) += fate-filter-dnn_processing-halve_first_channel_float fate-filter-dnn_processing-halve_gray_float -fate-filter-dnn_processing-halve_first_channel_float: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf format=rgb24,dnn_processing=model=$(TARGET_SAMPLES)/dnn_processing/halve_first_channel_float.model:input=dnn_in:output=dnn_out:dnn_backend=native -fate-filter-dnn_processing-halve_gray_float: CMD = framecrc -c:v pgmyuv -i $(SRC) -vf format=grayf32,dnn_processing=model=$(TARGET_SAMPLES)/dnn_processing/halve_gray_float.model:input=dnn_in:output=dnn_out:dnn_backend=native +FATE_FILTER_VSYNTH-$(CONFIG_DNN_PROCESSING_FILTER) += fate-filter-dnn_processing-halve_first_channel_float +fate-filter-dnn_processing-halve_first_channel_float: CMD = ffmpeg -i $(SRC) -frames:v 1 -vf format=rgb24,dnn_processing=model=$(TARGET_SAMPLES)/dnn_processing/halve_first_channel_float.model:input=dnn_in:output=dnn_out:dnn_backend=native -f rawvideo - +fate-filter-dnn_processing-halve_first_channel_float: REF = $(SAMPLES)/filter-reference/dnn_processing-halve_first_channel_float.raw +fate-filter-dnn_processing-halve_first_channel_float: CMP = oneoff FATE_REMOVEGRAIN += fate-filter-removegrain-mode-00 fate-filter-removegrain-mode-00: CMD = framecrc -c:v pgmyuv -i $(SRC) -frames:v 1 -vf removegrain=0:0:0 diff --git a/tests/ref/fate/filter-dnn_processing-halve_first_channel_float b/tests/ref/fate/filter-dnn_processing-halve_first_channel_float deleted file mode 100644 index ad7deda..0000000 --- a/tests/ref/fate/filter-dnn_processing-halve_first_channel_float +++ /dev/null @@ -1,55 +0,0 @@ -#tb 0: 1/25 -#media_type 0: video -#codec_id 0: rawvideo -#dimensions 0: 352x288 -#sar 0: 0/1 -0, 0, 0, 1, 304128, 0xdecb04c8 -0, 1, 1, 1, 304128, 0x55d9a543 -0, 2, 2, 1, 304128, 0x11ae175c -0, 3, 3, 1, 304128, 0x2cbc8734 -0, 4, 4, 1, 304128, 0xa8e5cb1f -0, 5, 5, 1, 304128, 0xb6d9ce81 -0, 6, 6, 1, 304128, 0x51613881 -0, 7, 7, 1, 304128, 0x09b9614f -0, 8, 8, 1, 304128, 0x172a6901 -0, 9, 9, 1, 304128, 0x30237bf4 -0, 10, 10, 1, 304128, 0xb8646354 -0, 11, 11, 1, 304128, 0xe2dd8145 -0, 12, 12, 1, 304128, 0x6f0b3cea -0, 13, 13, 1, 304128, 0xb1a04427 -0, 14, 14, 1, 304128, 0xe0ab42cf -0, 15, 15, 1, 304128, 0xd4dc3224 -0, 16, 16, 1, 304128, 0xdb3462a1 -0, 17, 17, 1, 304128, 0x1d9931a1 -0, 18, 18, 1, 304128, 0x17c80e7a -0, 19, 19, 1, 304128, 0x800d587b -0, 20, 20, 1, 304128, 0x97d67832 -0, 21, 21, 1, 304128, 0xffc116db -0, 22, 22, 1, 304128, 0x80510bc1 -0, 23, 23, 1, 304128, 0xbf838895 -0, 24, 24, 1, 304128, 0x3c8ce931 -0, 25, 25, 1, 304128, 0x8640e1cd -0, 26, 26, 1, 304128, 0xa944fcac -0, 27, 27, 1, 304128, 0x7cef3f83 -0, 28, 28, 1, 304128, 0x3c8d60d2 -0, 29, 29, 1, 304128, 0x83fad1ef -0, 30, 30, 1, 304128, 0xbd6031ac -0, 31, 31, 1, 304128, 0x9e63188a -0, 32, 32, 1, 304128, 0x0e45cb70 -0, 33, 33, 1, 304128, 0x02a9ec32 -0, 34, 34, 1, 304128, 0x6ff674cc -0, 35, 35, 1, 304128, 0x7d1143e6 -0, 36, 36, 1, 304128, 0x52c6b9b7 -0, 37, 37, 1, 304128, 0x16696d9c -0, 38, 38, 1, 304128, 0x0612973f -0, 39, 39, 1, 304128, 0xed130f6a -0, 40, 40, 1, 304128, 0xe0051904 -0, 41, 41, 1, 304128, 0x6930d331 -0, 42, 42, 1, 304128, 0x35f722f7 -0, 43, 43, 1, 304128, 0x0adb7e81 -0, 44, 44, 1, 304128, 0x1eb10598 -0, 45, 45, 1, 304128, 0x73ec2115 -0, 46, 46, 1, 304128, 0xf9d24a8c -0, 47, 47, 1, 304128, 0x94a3748d -0, 48, 48, 1, 304128, 0xbaeac1d5 -0, 49, 49, 1, 304128, 0x5493efd3 diff --git a/tests/ref/fate/filter-dnn_processing-halve_gray_float b/tests/ref/fate/filter-dnn_processing-halve_gray_float deleted file mode 100644 index b33a951..0000000 --- a/tests/ref/fate/filter-dnn_processing-halve_gray_float +++ /dev/null @@ -1,55 +0,0 @@ -#tb 0: 1/25 -#media_type 0: video -#codec_id 0: rawvideo -#dimensions 0: 352x288 -#sar 0: 0/1 -0, 0, 0, 1, 405504, 0xb3a2caab -0, 1, 1, 1, 405504, 0x878b2fb8 -0, 2, 2, 1, 405504, 0xf39dac33 -0, 3, 3, 1, 405504, 0x94ef53b1 -0, 4, 4, 1, 405504, 0x6ed80f30 -0, 5, 5, 1, 405504, 0x82def1f8 -0, 6, 6, 1, 405504, 0xdafab027 -0, 7, 7, 1, 405504, 0xddef2774 -0, 8, 8, 1, 405504, 0x877771bd -0, 9, 9, 1, 405504, 0xfaf7da12 -0, 10, 10, 1, 405504, 0x484be589 -0, 11, 11, 1, 405504, 0x15d660e2 -0, 12, 12, 1, 405504, 0xa01849c8 -0, 13, 13, 1, 405504, 0x823c33da -0, 14, 14, 1, 405504, 0x3aef6445 -0, 15, 15, 1, 405504, 0x75f2961b -0, 16, 16, 1, 405504, 0x7615ddac -0, 17, 17, 1, 405504, 0xbcf92755 -0, 18, 18, 1, 405504, 0xc84ee75f -0, 19, 19, 1, 405504, 0xf9d11220 -0, 20, 20, 1, 405504, 0x6e1afa4a -0, 21, 21, 1, 405504, 0x47fcc8b2 -0, 22, 22, 1, 405504, 0xa5f618bc -0, 23, 23, 1, 405504, 0x2528509b -0, 24, 24, 1, 405504, 0x0b77ec0b -0, 25, 25, 1, 405504, 0x8d5ea91d -0, 26, 26, 1, 405504, 0xd8a04b22 -0, 27, 27, 1, 405504, 0xbde327bd -0, 28, 28, 1, 405504, 0x9713aeb4 -0, 29, 29, 1, 405504, 0xc168c52e -0, 30, 30, 1, 405504, 0xa3da9f70 -0, 31, 31, 1, 405504, 0xe58350d0 -0, 32, 32, 1, 405504, 0x6c656178 -0, 33, 33, 1, 405504, 0xe9563056 -0, 34, 34, 1, 405504, 0xf1f2c14d -0, 35, 35, 1, 405504, 0x5d59fe20 -0, 36, 36, 1, 405504, 0x5ddb514e -0, 37, 37, 1, 405504, 0x6251dbf8 -0, 38, 38, 1, 405504, 0x94c7d2d6 -0, 39, 39, 1, 405504, 0x1e44022a -0, 40, 40, 1, 405504, 0x51c157a1 -0, 41, 41, 1, 405504, 0xc8991bd1 -0, 42, 42, 1, 405504, 0x046be642 -0, 43, 43, 1, 405504, 0x330da15f -0, 44, 44, 1, 405504, 0xf6428e42 -0, 45, 45, 1, 405504, 0x8d303561 -0, 46, 46, 1, 405504, 0x135ed7d0 -0, 47, 47, 1, 405504, 0x0382f361 -0, 48, 48, 1, 405504, 0xddea2009 -0, 49, 49, 1, 405504, 0xd9b0262b