From patchwork Sun Aug 27 05:45:14 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paras X-Patchwork-Id: 4855 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.15.201 with SMTP id 70csp1393434jao; Sat, 26 Aug 2017 22:51:43 -0700 (PDT) X-Received: by 10.28.238.143 with SMTP id j15mr1924471wmi.180.1503813103828; Sat, 26 Aug 2017 22:51:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1503813103; cv=none; d=google.com; s=arc-20160816; b=piQGr1Xj8JyUhkzpO357KL3Sb9Qnz7fCHRx7bQhwA/LECcHNjPus51QD7lk265e6oM bAoiXvnF13NdqtFvi6yHSHEVsyVlbl2Sx0kJZbcI3wq4OHSZ/jABX8vRkzXm7FvaQJyl BARnneAwNV246s4dTTGjUdUGxtKPHP/tXCdYuI6BHscDeSQimWt2U1sQZq7/P/1U67Z+ FDSI2olKh6te3VDgfg+xLxJRG5N3MqFyYeVK8aoyxYnBigKNSRGk4xQjcZnpiOZ/WLl/ 3GglpLugwpS5F9+w3WBSPpD1ZyTOebAXL1Klhbwm1Qn8e9VLHP+uIup8KblHLYyEtb9D i/eQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=PO7Y+eHUTCylSIPzvyFA2VsIs7dFwa+vWvBsm5ysYU4=; b=tjL1nC99llcae2t8DcBNS71O0Vo7BhRjp673WDH/xGSAQpDOeMX8x37fgA/FT6VQ1q tB0rUir0yBWJ0tKL7cWETFFSJ1aIuTJ2PQzFtyis2RvB+ET1TWp4HcUtmCAW3dgXpt2r RFBuO/pKGc6SyqV7xhy+YUriXZitcgC8tblorY5LdQLfCHO9V7qfVgh2gkcxHLuhuKss U2McPtegIWz+GErIC+bk11FNhxyj3vIXqVMw29c/zKxRK6KBMDFlaxMQjS9NdrlRNkwK FesnIjzJOWbG28IP9KLgI253mSHaCmTq92CSj+12FxOdOGfPi4mm/51H+SRSXtk6QY0f +Yhw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=Zfk/VQNY; 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=NONE 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 z38si3841336wrb.48.2017.08.26.22.51.42; Sat, 26 Aug 2017 22:51:43 -0700 (PDT) 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=Zfk/VQNY; 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=NONE 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 6D32D689822; Sun, 27 Aug 2017 08:51:30 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg0-f68.google.com (mail-pg0-f68.google.com [74.125.83.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5FBEC689721 for ; Sun, 27 Aug 2017 08:51:23 +0300 (EEST) Received: by mail-pg0-f68.google.com with SMTP id q16so3903807pgc.0 for ; Sat, 26 Aug 2017 22:51:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=eLl4rz6XPOCQB4T9sJRuDgy/Udh+Dl6/fMC3q5R0yW0=; b=Zfk/VQNYY6dCDfiahKVjn0kLhFTtPSZnhO2SwelF1bD2aXqxnpw3Qj3hCV9EpqGMGq HNUE9iWjvXffspWsyIU3LlYQyxtynopjAdSG6t7O3jtf+c3bypJh6KOfsM6jsBM1ylUx G1UlSahC4GqXzzXS+De1wSwtfWAUEqt7kvm2kFi0B0IfbjAoehnUNoDC0tGQAeCr2aeM OT2viX4e81j8I43sAObhj/JSx6qt78sZPRoy1p1zXGYRGBGZblbx2CoP1YERrwyPXzNA bsfht8nAbAFktR33sOG58ZoDOi7cjXYlWyC6vTKWLHUoX28AW+msu7uapbWRL0YN/0q4 7Zkg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=eLl4rz6XPOCQB4T9sJRuDgy/Udh+Dl6/fMC3q5R0yW0=; b=KeWqsZDT/XyaUJyx0f7VlhO9Fwq80s/K0MSnaMUYw/clQdyJPc36IvlLwRuC092asE bOTSgHqZNfsDJpQvmFgMs9invm6h0U++KQdjmZiyu65UZvCy1M+INnrQeqg3OX88dtpF fuFkc7iqC98dASQLoJGPyGTSwhuhPr+dbIAN2q+j2DPEyX5y+zT9bkqt+jZfOB6K3Tiw b7xCLMdyNUj0KRj7DlNDh6a8DhACmeLTzcGIuymH0agFsGD9HSUMc/4WRcqbNj1KBJKD JPrj6DGG9fBOjeyBD3UAQPLbu7ENH/iLzWtW+qQ2iQUorPqlrKPhqALEiFarIXPX+bH3 /OIg== X-Gm-Message-State: AHYfb5is5DKkyrNO9GAWkPRs8a7x3iKk6qk7eazXBJnwq7M0zy43JO7O da/QViGUIktDO6xs X-Received: by 10.99.125.9 with SMTP id y9mr3430207pgc.173.1503812721805; Sat, 26 Aug 2017 22:45:21 -0700 (PDT) Received: from dhcppc9.localdomain ([210.56.105.234]) by smtp.gmail.com with ESMTPSA id f15sm15721085pga.5.2017.08.26.22.45.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 26 Aug 2017 22:45:21 -0700 (PDT) From: Paras Chadha To: ffmpeg-devel@ffmpeg.org Date: Sun, 27 Aug 2017 11:15:14 +0530 Message-Id: <1503812714-15433-1-git-send-email-paraschadha18@gmail.com> X-Mailer: git-send-email 2.4.11 Subject: [FFmpeg-devel] [PATCH] fate/fits: add new test & gen few samples automatically 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: Paras Chadha MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Paras Chadha --- All other FITS patches need to be applied before this one. tests/fate/demux.mak | 3 +- tests/fate/fits.mak | 57 ++++++++++++++++++++++++++------- tests/ref/fate/fitsdec-bitpix-32 | 6 ++++ tests/ref/fate/fitsdec-bitpix-64 | 6 ++++ tests/ref/fate/fitsdec-blank_bitpix32 | 6 ++++ tests/ref/fate/fitsdec-ext_data_min_max | 6 ++++ 6 files changed, 72 insertions(+), 12 deletions(-) create mode 100644 tests/ref/fate/fitsdec-bitpix-32 create mode 100644 tests/ref/fate/fitsdec-bitpix-64 create mode 100644 tests/ref/fate/fitsdec-blank_bitpix32 create mode 100644 tests/ref/fate/fitsdec-ext_data_min_max -- 2.4.11 diff --git a/tests/fate/demux.mak b/tests/fate/demux.mak index 66e26ed..261b004 100644 --- a/tests/fate/demux.mak +++ b/tests/fate/demux.mak @@ -37,7 +37,8 @@ FATE_SAMPLES_DEMUX-$(CONFIG_EA_DEMUXER) += fate-d-eavp6-demux fate-d-eavp6-demux: CMD = framecrc -i $(TARGET_SAMPLES)/ea-vp6/SmallRing.vp6 -map 0 -vcodec copy FATE_SAMPLES_DEMUX-$(CONFIG_FITS_DEMUXER) += fate-fits-demux -fate-fits-demux: CMD = framecrc -i $(TARGET_SAMPLES)/fits/fits-multi.fits -vcodec copy +fate-fits-demux: tests/data/fits-multi.fits +fate-fits-demux: CMD = framecrc -i $(TARGET_PATH)/tests/data/fits-multi.fits -vcodec copy FATE_SAMPLES_DEMUX-$(CONFIG_FLV_DEMUXER) += fate-flv-demux fate-flv-demux: CMD = framecrc -i $(TARGET_SAMPLES)/flv/Enigma_Principles_of_Lust-part.flv -codec copy diff --git a/tests/fate/fits.mak b/tests/fate/fits.mak index 8202870..983946d 100644 --- a/tests/fate/fits.mak +++ b/tests/fate/fits.mak @@ -1,25 +1,60 @@ -FATE_FITS += fate-fitsdec-multi -fate-fitsdec-multi: CMD = framecrc -i $(TARGET_SAMPLES)/fits/fits-multi.fits -pix_fmt gbrap +tests/data/fits-multi.fits: TAG = GEN +tests/data/fits-multi.fits: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data + $(M)$(TARGET_EXEC) $(TARGET_PATH)/$< \ + -i $(TARGET_SAMPLES)/gif/m4nb.gif \ + -y $(TARGET_PATH)/$(@) 2>/dev/null + +#mapping of fits file formats to png filenames +map.tests/data/lena-gray.fits := gray8 +map.tests/data/lena-gray16.fits := gray16 +map.tests/data/lena-gbrp.fits := rgb24 +map.tests/data/lena-gbrp16.fits := rgb48 +map.tests/data/lena-gbrap16.fits := rgba64 + +tests/data/lena%.fits: TAG = GEN +tests/data/lena%.fits: NAME = $(map.$(@)) +tests/data/lena%.fits: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data + $(M)$(TARGET_EXEC) $(TARGET_PATH)/$< \ + -i $(TARGET_SAMPLES)/png1/lena-$(map.$(@)).png \ + -y $(TARGET_PATH)/$(@) 2>/dev/null + +FATE_FITS_DEC-$(call DEMDEC, FITS, FITS) += fate-fitsdec-ext_data_min_max +fate-fitsdec-ext_data_min_max: CMD = framecrc -i $(TARGET_SAMPLES)/fits/x0cj010ct_d0h.fit -pix_fmt gray16 + +FATE_FITS_DEC-$(call DEMDEC, FITS, FITS) += fate-fitsdec-blank_bitpix32 +fate-fitsdec-blank_bitpix32: CMD = framecrc -blank_value 65535 -i $(TARGET_SAMPLES)/fits/file008.fits -pix_fmt gray16 + +FATE_FITS_DEC-$(call DEMDEC, FITS, FITS) += fate-fitsdec-bitpix-32 +fate-fitsdec-bitpix-32: CMD = framecrc -i $(TARGET_SAMPLES)/fits/tst0005.fits -pix_fmt gray16 + +FATE_FITS_DEC-$(call DEMDEC, FITS, FITS) += fate-fitsdec-bitpix-64 +fate-fitsdec-bitpix-64: CMD = framecrc -i $(TARGET_SAMPLES)/fits/tst0006.fits -pix_fmt gray16 + +FATE_FITS_DEC-$(call DEMDEC, FITS, FITS) += fate-fitsdec-multi +fate-fitsdec-multi: tests/data/fits-multi.fits +fate-fitsdec-multi: CMD = framecrc -i $(TARGET_PATH)/tests/data/fits-multi.fits -pix_fmt gbrap fate-fitsdec%: PIXFMT = $(word 3, $(subst -, ,$(@))) -fate-fitsdec%: SRC = $(TARGET_SAMPLES)/fits/lena-$(PIXFMT).fits +fate-fitsdec%: SRC = $(TARGET_PATH)/tests/data/lena-$(PIXFMT).fits fate-fitsdec%: CMD = framecrc -i $(SRC) -pix_fmt $(PIXFMT) FATE_FITS_DEC_PIXFMT = gray gray16 gbrp gbrp16 gbrap16 -FATE_FITS += $(FATE_FITS_DEC_PIXFMT:%=fate-fitsdec-%) +$(FATE_FITS_DEC_PIXFMT:%=fate-fitsdec-%): fate-fitsdec-%: tests/data/lena-%.fits +FATE_FITS_DEC-$(call DEMDEC, FITS, FITS) += $(FATE_FITS_DEC_PIXFMT:%=fate-fitsdec-%) + +FATE_FITS += $(FATE_FITS_DEC-yes) +fate-fitsdec: $(FATE_FITS_DEC-yes) -fate-fitsenc%: fate-fitsdec-multi fate-fitsenc%: PIXFMT = $(word 3, $(subst -, ,$(@))) -fate-fitsenc%: SRC = $(TARGET_SAMPLES)/fits/fits-multi.fits +fate-fitsenc%: SRC = $(TARGET_PATH)/tests/data/fits-multi.fits fate-fitsenc%: CMD = framecrc -i $(SRC) -c:v fits -pix_fmt $(PIXFMT) FATE_FITS_ENC_PIXFMT = gray gray16be gbrp gbrap gbrp16be gbrap16be -FATE_FITS_ENC-$(call ENCDEC, FITS, FITS) = $(FATE_FITS_ENC_PIXFMT:%=fate-fitsenc-%) +$(FATE_FITS_ENC_PIXFMT:%=fate-fitsenc-%): tests/data/fits-multi.fits +FATE_FITS_ENC-$(call ENCDEC, FITS, FITS) += $(FATE_FITS_ENC_PIXFMT:%=fate-fitsenc-%) FATE_FITS += $(FATE_FITS_ENC-yes) fate-fitsenc: $(FATE_FITS_ENC-yes) -FATE_FITS-$(call DEMDEC, FITS, FITS) += $(FATE_FITS) - -FATE_SAMPLES_FFMPEG += $(FATE_FITS-yes) -fate-fits: $(FATE_FITS-yes) +FATE_SAMPLES_FFMPEG += $(FATE_FITS) +fate-fits: $(FATE_FITS) diff --git a/tests/ref/fate/fitsdec-bitpix-32 b/tests/ref/fate/fitsdec-bitpix-32 new file mode 100644 index 0000000..9bce361 --- /dev/null +++ b/tests/ref/fate/fitsdec-bitpix-32 @@ -0,0 +1,6 @@ +#tb 0: 1/1 +#media_type 0: video +#codec_id 0: rawvideo +#dimensions 0: 102x109 +#sar 0: 0/1 +0, 0, 0, 1, 22236, 0x34490902 diff --git a/tests/ref/fate/fitsdec-bitpix-64 b/tests/ref/fate/fitsdec-bitpix-64 new file mode 100644 index 0000000..9febdd6 --- /dev/null +++ b/tests/ref/fate/fitsdec-bitpix-64 @@ -0,0 +1,6 @@ +#tb 0: 1/1 +#media_type 0: video +#codec_id 0: rawvideo +#dimensions 0: 77x173 +#sar 0: 0/1 +0, 0, 0, 1, 26642, 0x0ad2a46a diff --git a/tests/ref/fate/fitsdec-blank_bitpix32 b/tests/ref/fate/fitsdec-blank_bitpix32 new file mode 100644 index 0000000..184fd41 --- /dev/null +++ b/tests/ref/fate/fitsdec-blank_bitpix32 @@ -0,0 +1,6 @@ +#tb 0: 1/1 +#media_type 0: video +#codec_id 0: rawvideo +#dimensions 0: 256x256 +#sar 0: 0/1 +0, 0, 0, 1, 131072, 0x7fb22427 diff --git a/tests/ref/fate/fitsdec-ext_data_min_max b/tests/ref/fate/fitsdec-ext_data_min_max new file mode 100644 index 0000000..9009a4e --- /dev/null +++ b/tests/ref/fate/fitsdec-ext_data_min_max @@ -0,0 +1,6 @@ +#tb 0: 1/1 +#media_type 0: video +#codec_id 0: rawvideo +#dimensions 0: 512x512 +#sar 0: 0/1 +0, 0, 0, 1, 524288, 0xc327ed23