From patchwork Thu Jun 8 17:04:15 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paras X-Patchwork-Id: 3871 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.10.2 with SMTP id 2csp2953777vsk; Thu, 8 Jun 2017 10:11:02 -0700 (PDT) X-Received: by 10.28.234.70 with SMTP id i67mr4310806wmh.91.1496941862505; Thu, 08 Jun 2017 10:11:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1496941862; cv=none; d=google.com; s=arc-20160816; b=u07FIMoLx6ahaGhRRkq/8tmmR/pY+9+6MUgoBNPnTgBE0obB1TWn+BT0ne0LWN8DB8 Y4T0aPeF9yLFKBWXQtTQsXJb+K7kwjRHwMlZt1pfbKos9TcaFbSRKWWx5jVDR7UuaPlb aVfA35H6Hxs8iL/HdaMCL9g1XTBkffAiFCKZTw3EaNNQ/liulXJR0FaMVu/ZVblxCufx vSppEEELWO1b0gAY9cA3ps04Xk1BPEFQe/8arpHysyZwGFRWree979xbVzAyW03kVGNL M5wcw77823Ja3dLI5CqB/7ssQzR5f2TfD/YcdkMDpCVZHN2uFA0/eBlvyCzYe8iK0VID FuXg== 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=Y/1E44Z68tsapT4fu7t12wS0FfVuyNrxTWeY7480DDQ=; b=h4Q1z4aFhR3RDE/DoUarBxZjWxa5S7SOAykyQxFDjt3s5DFvrRqxDONGKsx077M1jb iMeCtpFGxGG+SEXvp7ddHVaCqBdWjYrvejL5mOOrqgoGv7d7sTROZG4zVo/x0CneJqhn tzHzvSeMmsJYJqZLMR7+NNRDH5Y6Nytjuk6nuU6NMGhVK0yxit1/FuUwCi+EMsrq76LF xZLRhyqNsZRCREwBUxhJpryZ/WJTtzsxh7c4aW0eJeoJPdAlc1Xb8zL3/3t+gXuyt+FR tVVF1tXLVPxj8UMt9v1UnAliBpoKc8EvcIh01u1UBJXEQlhm0xPMKP7M8WLPwaqW+1MV RhhA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.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; 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 k8si5390166wre.110.2017.06.08.10.11.01; Thu, 08 Jun 2017 10:11:02 -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; 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 28FA5689CD9; Thu, 8 Jun 2017 20:10:58 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg0-f66.google.com (mail-pg0-f66.google.com [74.125.83.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 314E56808FC for ; Thu, 8 Jun 2017 20:10:51 +0300 (EEST) Received: by mail-pg0-f66.google.com with SMTP id f127so5217259pgc.2 for ; Thu, 08 Jun 2017 10:10:51 -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=hvk5yQc4rLquurcmjKHX3CqU28LuJToWleVpltEsjaM=; b=k2+UXObTAVyo86Ha38Dbe4QY6iUTcc5GH+yyccyjo4RDDQEc0rsmGNVfrmy8kqe+bZ 2r4f8gLtXCXzQonqqVaqe/PAs2sEoRxrrTucveSO5EFK6GGylXJHAV9ZbpqtqIS6Edfq ushmmSPw7rUM5IKSdhf9U4bBRA0CNQTXJkU941C8qht+FkaybY3gAaW2zkTk2sYNkSpU KRull1h5gygviEVMPaplC6WdYzpYpWSLoQg1Os7kIq3R8c0YymRF6aWBBQMq+tgbPrcQ Ta20ElvgZEr052Vkkn7cN9CiuUSh1VJNWA1iIuWUrZ8hyyPPOtyr6F5CPylP6Pqwx2lR WA7A== 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=hvk5yQc4rLquurcmjKHX3CqU28LuJToWleVpltEsjaM=; b=Z110fOaOI7fznbVtl0SOEBFVKKV1P3s6ohyWGOKWoAl3MkKcUnPatmfIHfkONb+F/y /Yv+qFStVEey3VMvmUNqSDkdAUjwfsbWRbfs2O4iE9xBlVL0lz8eq0S0+AD6HpuQrMcf ikLTRDqGWMe1w1bB0Ohhke82u/0THwdpDe0HIgN+2U9pq637InahNsVmUxvjHKKtMtVu /8HFUQP5Ea6CgitK3cnP1mieD3/zmb51zgmNfjzj681PQ7lOYvIvsTvDhQ52/n4d16oB 2mVU8oWi9AaKitU6b9sDK7NUoCLtbbC6ek1H1A92eEKYAZ5d+7kXAfCGuzhYUtwZwRyg ueXA== X-Gm-Message-State: AODbwcD0a0Y4XxdSO/SFAI1jO0AxrTS+YOwV/K82M2bFCT4XVjfXc0T2 gq1aihmFlkXo5GOP X-Received: by 10.101.73.135 with SMTP id r7mr20671260pgs.224.1496941462654; Thu, 08 Jun 2017 10:04:22 -0700 (PDT) Received: from dhcppc9.localdomain ([203.134.196.85]) by smtp.gmail.com with ESMTPSA id u20sm11348432pfa.17.2017.06.08.10.04.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 08 Jun 2017 10:04:22 -0700 (PDT) From: Paras Chadha To: ffmpeg-devel@ffmpeg.org Date: Thu, 8 Jun 2017 22:34:15 +0530 Message-Id: <1496941455-6296-1-git-send-email-paraschadha18@gmail.com> X-Mailer: git-send-email 2.4.11 Subject: [FFmpeg-devel] [PATCH] Add FITS Decoder 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" It supports all 2-d images alongwith bzero, bscale and blank keywords. RGBA images are supported as NAXIS3 = 3 or 4 i.e. Planes in RGBA order. Also CTYPE = 'RGB ' should be present. It currently does not support XTENSION keyword. Signed-off-by: Paras Chadha --- Changelog | 1 + doc/general.texi | 2 + libavcodec/Makefile | 1 + libavcodec/allcodecs.c | 1 + libavcodec/avcodec.h | 1 + libavcodec/codec_desc.c | 8 + libavcodec/fitsdec.c | 527 +++++++++++++++++++++++++++++++++++++++++++++++ libavcodec/version.h | 4 +- libavformat/Makefile | 1 + libavformat/allformats.c | 1 + libavformat/img2.c | 1 + libavformat/img2dec.c | 10 + 12 files changed, 556 insertions(+), 2 deletions(-) create mode 100644 libavcodec/fitsdec.c -- 2.4.11 diff --git a/Changelog b/Changelog index 3533bdc..671bc6c 100644 --- a/Changelog +++ b/Changelog @@ -17,6 +17,7 @@ version : - remove the libnut muxer/demuxer wrappers - remove the libschroedinger encoder/decoder wrappers - surround audio filter +- FITS Decoder version 3.3: - CrystalHD decoder moved to new decode API diff --git a/doc/general.texi b/doc/general.texi index 8f582d5..213e50e 100644 --- a/doc/general.texi +++ b/doc/general.texi @@ -591,6 +591,8 @@ following image formats are supported: @tab Digital Picture Exchange @item EXR @tab @tab X @tab OpenEXR +@item FITS @tab @tab X + @tab FITS image format @item JPEG @tab X @tab X @tab Progressive JPEG is not supported. @item JPEG 2000 @tab X @tab X diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 0818950..3654b0f 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -291,6 +291,7 @@ OBJS-$(CONFIG_FFV1_DECODER) += ffv1dec.o ffv1.o OBJS-$(CONFIG_FFV1_ENCODER) += ffv1enc.o ffv1.o OBJS-$(CONFIG_FFWAVESYNTH_DECODER) += ffwavesynth.o OBJS-$(CONFIG_FIC_DECODER) += fic.o +OBJS-$(CONFIG_FITS_DECODER) += fitsdec.o OBJS-$(CONFIG_FLAC_DECODER) += flacdec.o flacdata.o flac.o OBJS-$(CONFIG_FLAC_ENCODER) += flacenc.o flacdata.o flac.o vorbis_data.o OBJS-$(CONFIG_FLASHSV_DECODER) += flashsv.o diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index 89fadcd..5d846df 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -185,6 +185,7 @@ static void register_all(void) REGISTER_ENCDEC (FFV1, ffv1); REGISTER_ENCDEC (FFVHUFF, ffvhuff); REGISTER_DECODER(FIC, fic); + REGISTER_DECODER(FITS, fits); REGISTER_ENCDEC (FLASHSV, flashsv); REGISTER_ENCDEC (FLASHSV2, flashsv2); REGISTER_DECODER(FLIC, flic); diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 00f9c82..d46d8d1 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -446,6 +446,7 @@ enum AVCodecID { AV_CODEC_ID_MSCC, AV_CODEC_ID_SRGC, AV_CODEC_ID_SVG, + AV_CODEC_ID_FITS, /* various PCM "codecs" */ AV_CODEC_ID_FIRST_AUDIO = 0x10000, ///< A dummy id pointing at the start of audio codecs diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c index f0ca4ba..18d0ff7 100644 --- a/libavcodec/codec_desc.c +++ b/libavcodec/codec_desc.c @@ -1457,6 +1457,14 @@ static const AVCodecDescriptor codec_descriptors[] = { AV_CODEC_PROP_LOSSLESS, }, { + .id = AV_CODEC_ID_FITS, + .type = AVMEDIA_TYPE_VIDEO, + .name = "fits", + .long_name = NULL_IF_CONFIG_SMALL("FITS image"), + .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY | + AV_CODEC_PROP_LOSSLESS, + }, + { .id = AV_CODEC_ID_GIF, .type = AVMEDIA_TYPE_VIDEO, .name = "gif", diff --git a/libavcodec/fitsdec.c b/libavcodec/fitsdec.c new file mode 100644 index 0000000..d516042 --- /dev/null +++ b/libavcodec/fitsdec.c @@ -0,0 +1,527 @@ +/* + * FITS image decoder + * Copyright (c) 2017 Paras Chadha + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +/** + * @file + * FITS image decoder + * It supports all 2-d images alongwith, bzero, bscale and blank keywords. + * RGBA images are supported as NAXIS3 = 3 or 4 i.e. Planes in RGBA order. Also CTYPE = 'RGB ' should be present. + * It currently does not support XTENSION keyword. + * Also to interpret data, values are linearly scaled using min-max scaling but not RGB images. + */ + +#include "avcodec.h" +#include "internal.h" +#include + +/** + * Structure to store the header keywords in FITS file + */ +typedef struct fits_header { + char simple; + int bitpix; + int blank; + int naxis; + int naxisn[999]; + int rgb; /**< 1 if file contains RGB image, 0 otherwise */ + double bscale; + double bzero; + double data_min; + double data_max; +} fits_header; + +/** + * function calculates the data_min and data_max values from the data. + * This is called if the values are not present in the header. + * @param ptr8 - pointer to the data + * @param header - pointer to the header + * @return 1, if calculated successfully, otherwise AVERROR_INVALIDDATA + */ +static int fill_data_min_max(const uint8_t * ptr8, fits_header * header, const uint8_t * end) +{ + int16_t t16; + int32_t t32; + int64_t t64; + float tflt; + double tdbl; + int i, j; + + header->data_min = DBL_MAX; + header->data_max = DBL_MIN; + switch (header->bitpix) { + case -64: + t64 = (((uint64_t) ptr8[0]) << 56) | (((uint64_t) ptr8[1]) << 48) | (((uint64_t) ptr8[2]) << 40) | (((uint64_t) ptr8[3]) << 32) | (ptr8[4] << 24) | (ptr8[5] << 16) | (ptr8[6] << 8) | ptr8[7]; + memcpy(&tdbl, &t64, 8); + for (i = 0; i < header->naxisn[1]; i++) { + for (j = 0; j < header->naxisn[0]; j++) { + t64 = (((uint64_t) ptr8[0]) << 56) | (((uint64_t) ptr8[1]) << 48) | (((uint64_t) ptr8[2]) << 40) | (((uint64_t) ptr8[3]) << 32) | (ptr8[4] << 24) | (ptr8[5] << 16) | (ptr8[6] << 8) | ptr8[7]; + memcpy(&tdbl, &t64, 8); + if (tdbl > header->data_max) + header->data_max = tdbl; + if (tdbl < header->data_min) + header->data_min = tdbl; + ptr8 += 8; + } + } + return 1; + case -32: + t32 = (ptr8[0] << 24) | (ptr8[1] << 16) | (ptr8[2] << 8) | ptr8[3]; + memcpy(&tflt, &t32, 4); + for (i = 0; i < header->naxisn[1]; i++) { + for (j = 0; j < header->naxisn[0]; j++) { + t32 = (ptr8[0] << 24) | (ptr8[1] << 16) | (ptr8[2] << 8) | ptr8[3]; + memcpy(&tflt, &t32, 4); + if (tflt > header->data_max) + header->data_max = tflt; + if (tflt < header->data_min) + header->data_min = tflt; + ptr8 += 4; + } + } + return 1; + case 8: + for (i = 0; i < header->naxisn[1]; i++) { + for (j = 0; j < header->naxisn[0]; j++) { + if (ptr8[0] != header->blank) { + if (ptr8[0] > header->data_max) + header->data_max = ptr8[0]; + if (ptr8[0] < header->data_min) + header->data_min = ptr8[0]; + } + ptr8++; + } + } + return 1; + case 16: + t16 = ((ptr8[0] << 8) | ptr8[1]); + for (i = 0; i < header->naxisn[1]; i++) { + for (j = 0; j < header->naxisn[0]; j++) { + t16 = ((ptr8[0] << 8) | ptr8[1]); + if (t16 != header->blank) { + if (t16 > header->data_max) + header->data_max = t16; + if (t16 < header->data_min) + header->data_min = t16; + } + ptr8 += 2; + } + } + return 1; + case 32: + t32 = (ptr8[0] << 24) | (ptr8[1] << 16) | (ptr8[2] << 8) | ptr8[3]; + for (i = 0; i < header->naxisn[1]; i++) { + for (j = 0; j < header->naxisn[0]; j++) { + t32 = (ptr8[0] << 24) | (ptr8[1] << 16) | (ptr8[2] << 8) | ptr8[3]; + if (t32 != header->blank) { + if (t32 > header->data_max) + header->data_max = t32; + if (t32 < header->data_min) + header->data_min = t32; + } + ptr8 += 4; + } + } + return 1; + case 64: + t64 = (((uint64_t) ptr8[0]) << 56) | (((uint64_t) ptr8[1]) << 48) | (((uint64_t) ptr8[2]) << 40) | (((uint64_t) ptr8[3]) << 32) | (ptr8[4] << 24) | (ptr8[5] << 16) | (ptr8[6] << 8) | ptr8[7]; + for (i = 0; i < header->naxisn[1]; i++) { + for (j = 0; j < header->naxisn[0]; j++) { + t64 = (((uint64_t) ptr8[0]) << 56) | (((uint64_t) ptr8[1]) << 48) | (((uint64_t) ptr8[2]) << 40) | (((uint64_t) ptr8[3]) << 32) | (ptr8[4] << 24) | (ptr8[5] << 16) | (ptr8[6] << 8) | ptr8[7]; + if (t64 != header->blank) { + if (t64 > header->data_max) + header->data_max = t64; + if (t64 < header->data_min) + header->data_min = t64; + } + ptr8 += 8; + } + } + return 1; + default: + return AVERROR_INVALIDDATA; + } + return 1; +} + +/** + * function reads the fits header and stores the values in fits_header pointed by header + * @param avctx - AVCodec context + * @param ptr - pointer to pointer to the data + * @param header - pointer to the fits_header + * @param end - pointer to end of packet + * @return 1, if calculated successfully, otherwise AVERROR_INVALIDDATA + */ +static int fits_read_header(AVCodecContext *avctx, const uint8_t **ptr, fits_header * header, const uint8_t * end) +{ + const uint8_t *ptr8 = *ptr; + int lines_read = 0, i, dim_no, t, data_min_found = 0, data_max_found = 0, ret; + uint64_t size=1; + char str_val[80]; + double d; + + header->blank = 0; + header->bscale = 1.0; + header->bzero = 0; + header->rgb = 0; + + if (end - ptr8 < 80) + return AVERROR_INVALIDDATA; + + if (sscanf(ptr8, "SIMPLE = %c", &header->simple) != 1) { + av_log(avctx, AV_LOG_ERROR, "missing SIMPLE keyword\n"); + return AVERROR_INVALIDDATA; + } + + if (header->simple == 'F') + av_log(avctx, AV_LOG_WARNING, "not a standard FITS file\n"); + else if (header->simple != 'T') { + av_log(avctx, AV_LOG_ERROR, "invalid SIMPLE value, SIMPLE = %c\n", header->simple); + return AVERROR_INVALIDDATA; + } + + ptr8 += 80; + lines_read++; + + if (end - ptr8 < 80) + return AVERROR_INVALIDDATA; + + if (sscanf(ptr8, "BITPIX = %d", &header->bitpix) != 1) { + av_log(avctx, AV_LOG_ERROR, "missing BITPIX keyword\n"); + return AVERROR_INVALIDDATA; + } + + size = abs(header->bitpix) / 8; + ptr8 += 80; + lines_read++; + + if (end - ptr8 < 80) + return AVERROR_INVALIDDATA; + + if (sscanf(ptr8, "NAXIS = %d", &header->naxis) != 1) { + av_log(avctx, AV_LOG_ERROR, "missing NAXIS keyword\n"); + return AVERROR_INVALIDDATA; + } + + if (header->naxis == 0) { + av_log(avctx, AV_LOG_ERROR, "No image data found, NAXIS = %d\n", header->naxis); + return AVERROR_INVALIDDATA; + } + + if (header->naxis != 2 && header->naxis != 3) { + av_log(avctx, AV_LOG_ERROR, "unsupported number of dimensions, NAXIS = %d\n", header->naxis); + return AVERROR_INVALIDDATA; + } + + ptr8 += 80; + lines_read++; + + for (i = 0; i < header->naxis; i++) { + if (end - ptr8 < 80) + return AVERROR_INVALIDDATA; + + if (sscanf(ptr8, "NAXIS%d = %d", &dim_no, &header->naxisn[i]) != 2 || dim_no != i+1) { + av_log(avctx, AV_LOG_ERROR, "missing NAXIS%d keyword\n", i+1); + return AVERROR_INVALIDDATA; + } + + size *= header->naxisn[i]; + ptr8 += 80; + lines_read++; + } + + if (end - ptr8 < 80) + return AVERROR_INVALIDDATA; + + while (strncmp(ptr8, "END", 3)) { + if (sscanf(ptr8, "BLANK = %d", &t) == 1) + header->blank = t; + else if (sscanf(ptr8, "BSCALE = %lf", &d) == 1) + header->bscale = d; + else if (sscanf(ptr8, "BZERO = %lf", &d) == 1) + header->bzero = d; + else if (sscanf(ptr8, "DATAMAX = %lf", &d) == 1) { + data_max_found = 1; + header->data_max = d; + } + else if (sscanf(ptr8, "DATAMIN = %lf", &d) == 1) { + data_min_found = 1; + header->data_min = d; + } + else if (sscanf(ptr8, "CTYPE3 = '%s '", str_val) == 1) { + if (strncmp(str_val, "RGB", 3) == 0) { + header->rgb = 1; + + if (header->naxis != 3 || (header->naxisn[2] != 3 && header->naxisn[2] != 4)) { + av_log(avctx, AV_LOG_ERROR, "File contains RGB image but NAXIS = %d and NAXIS3 = %d\n", header->naxis, header->naxisn[2]); + return AVERROR_INVALIDDATA; + } + } + } + ptr8 += 80; + lines_read++; + + if (end - ptr8 < 80) + return AVERROR_INVALIDDATA; + } + + if (header->rgb == 0 && header->naxis != 2){ + av_log(avctx, AV_LOG_ERROR, "unsupported number of dimensions, NAXIS = %d\n", header->naxis); + return AVERROR_INVALIDDATA; + } + + ptr8 += 80; + lines_read++; + lines_read %= 36; + + t = ((36 - lines_read) % 36) * 80; + if (end - ptr8 < t) + return AVERROR_INVALIDDATA; + ptr8 += t; + *ptr = ptr8; + + if (end - ptr8 < size) + return AVERROR_INVALIDDATA; + + if (header->rgb == 0 && (data_min_found == 0 || data_max_found == 0)) { + if ((ret = fill_data_min_max(ptr8, header, end)) < 0) { + av_log(avctx, AV_LOG_ERROR, "invalid BITPIX, %d\n", header->bitpix); + return AVERROR_INVALIDDATA; + } + } + else{ + /* + * instead of applying bscale and bzero to every element, we can do inverse transformation on data_min and + * data_max + */ + header->data_min = (header->data_min - header->bzero) / header->bscale; + header->data_max = (header->data_max - header->bzero) / header->bscale; + } + return 1; +} + +static int fits_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, AVPacket *avpkt) +{ + AVFrame *p=data; + const uint8_t *ptr8 = avpkt->data, *end; + int16_t t16; + int32_t t32; + int64_t t64; + float tflt; + double tdbl; + int ret, i, j; + uint8_t *dst8; + uint16_t *dst16; + uint32_t *dst32; + uint64_t *dst64, size, r, g, b, a, t; + fits_header header; + + end = ptr8 + avpkt->size; + if ((ret = fits_read_header(avctx, &ptr8, &header, end) < 0)) + return ret; + + size = (header.naxisn[0]) * (header.naxisn[1]); + + if (header.rgb) { + if (header.bitpix == 8) + avctx->pix_fmt = AV_PIX_FMT_RGB32; + else if (header.bitpix == 16) + avctx->pix_fmt = AV_PIX_FMT_RGBA64; + else { + av_log(avctx, AV_LOG_ERROR, "unsupported BITPIX = %d\n", header.bitpix); + return AVERROR_INVALIDDATA; + } + } + else { + if (header.bitpix == 8) + avctx->pix_fmt = AV_PIX_FMT_GRAY8; + else + avctx->pix_fmt = AV_PIX_FMT_GRAY16; + } + + if ((ret = ff_set_dimensions(avctx, header.naxisn[0], header.naxisn[1])) < 0) + return ret; + + if ((ret = ff_get_buffer(avctx, p, 0)) < 0) + return ret; + + if (header.rgb) { + if (header.bitpix == 8) { + for (i = 0; i < avctx->height; i++) { + /* + * FITS stores images with bottom row first. Therefore we have + * to fill the image from bottom to top. + */ + dst32 = (uint32_t *)(p->data[0] + (avctx->height-i-1)* p->linesize[0]); + for (j = 0; j < avctx->width; j++) { + if (header.naxisn[2] == 4) { + if (ptr8[size * 3] != header.blank) + t = ptr8[size * 3] * header.bscale + header.bzero; + a = t << 24; + } + else + a = (255 << 24); + + if (ptr8[0] != header.blank) + t = ptr8[0] * header.bscale + header.bzero; + r = t << 16; + + if (ptr8[size] != header.blank) + t = ptr8[size] * header.bscale + header.bzero; + g = t << 8; + + if (ptr8[size * 2] != header.blank) + t = ptr8[size * 2] * header.bscale + header.bzero; + b = t; + + *dst32++ = ((uint32_t)a) | ((uint32_t)r) | ((uint32_t)g) | ((uint32_t)b); + ptr8++; + } + } + } + else if (header.bitpix == 16) { + // not tested .... + for (i = 0; i < avctx->height; i++) { + dst64 = (uint64_t *)(p->data[0] + (avctx->height-i-1) * p->linesize[0]); + for (j = 0; j < avctx->width; j++) { + + if (header.naxisn[2] == 4) { + t = ((ptr8[size * 3] << 8) | ptr8[size * 3 + 1]); + if (t != header.blank) + t = t*header.bscale + header.bzero; + a = t << 48; + } + else + a = 65535ULL << 48; + + t = ptr8[0] << 8 | ptr8[1]; + if (t != header.blank) + t = t*header.bscale + header.bzero; + r = t << 32; + + t = ptr8[size] << 8 | ptr8[size + 1]; + if (t != header.blank) + t = t*header.bscale + header.bzero; + g = t << 16; + + t = ptr8[size * 2] << 8 | ptr8[size * 2 + 1]; + if (t != header.blank) + t = t*header.bscale + header.bzero; + b = t; + + *dst64++ = a | r | g | b; + ptr8 += 2; + } + } + } + } + else { + if (header.bitpix == 8) { + for (i = 0; i < avctx->height; i++) { + dst8 = (uint8_t *) (p->data[0] + (avctx->height-i-1)* p->linesize[0]); + for (j = 0; j < avctx->width; j++) { + if (ptr8[0] != header.blank) + *dst8++ = ((ptr8[0] - header.data_min) * 255) / (header.data_max - header.data_min); + else + *dst8++ = ptr8[0]; + ptr8++; + } + } + } + else if (header.bitpix == 16) { + for (i = 0; i < avctx->height; i++) { + dst16 = (uint16_t *)(p->data[0] + (avctx->height-i-1) * p->linesize[0]); + for (j = 0; j < avctx->width; j++) { + t16 = ((ptr8[0] << 8) | ptr8[1]); + if (t16 != header.blank) + t16 = ((t16 - header.data_min) * 65535) / (header.data_max - header.data_min); + *dst16++ = t16; + ptr8 += 2; + } + } + } + else if (header.bitpix == 32) { + for (i = 0; i < avctx->height; i++) { + dst16 = (uint16_t *)(p->data[0] + (avctx->height-i-1) * p->linesize[0]); + for (j = 0; j < avctx->width; j++) { + t32 = (ptr8[0] << 24) | (ptr8[1] << 16) | (ptr8[2] << 8) | ptr8[3]; + if (t32 != header.blank) + t16 = ((t32 - header.data_min) * 65535) / (header.data_max - header.data_min); + *dst16++ = t16; + ptr8 += 4; + } + } + } + else if (header.bitpix == 64) { + for (i = 0; i < avctx->height; i++) { + dst16 = (uint16_t *)(p->data[0] + (avctx->height-i-1) * p->linesize[0]); + for (j = 0; j < avctx->width; j++) { + t64 = (((uint64_t) ptr8[0]) << 56) | (((uint64_t) ptr8[1]) << 48) | (((uint64_t) ptr8[2]) << 40) | (((uint64_t) ptr8[3]) << 32) | (ptr8[4] << 24) | (ptr8[5] << 16) | (ptr8[6] << 8) | ptr8[7]; + if (t64 != header.blank) + t16 = ((t64 - header.data_min) * 65535) / (header.data_max - header.data_min); + *dst16++ = t16; + ptr8 += 8; + } + } + } + else if (header.bitpix == -32) { + for (i = 0; i < avctx->height; i++) { + dst16 = (uint16_t *)(p->data[0] + (avctx->height-i-1) * p->linesize[0]); + for (j = 0; j < avctx->width; j++) { + t32 = (ptr8[0] << 24) | (ptr8[1] << 16) | (ptr8[2] << 8) | ptr8[3]; + memcpy(&tflt, &t32, 4); + *dst16++ = ((tflt - header.data_min) * 65535) / (header.data_max - header.data_min); + ptr8 += 4; + } + } + } + else if (header.bitpix == -64) { + for (i = 0; i < avctx->height; i++) { + dst16 = (uint16_t *)(p->data[0] + (avctx->height-i-1) * p->linesize[0]); + for (j = 0; j < avctx->width; j++) { + t64 = (((uint64_t) ptr8[0]) << 56) | (((uint64_t) ptr8[1]) << 48) | (((uint64_t) ptr8[2]) << 40) | (((uint64_t) ptr8[3]) << 32) | (ptr8[4] << 24) | (ptr8[5] << 16) | (ptr8[6] << 8) | ptr8[7]; + memcpy(&tdbl, &t64, 8); + *dst16++ = ((tdbl - header.data_min) * 65535) / (header.data_max - header.data_min); + ptr8 += 8; + } + } + } + else { + av_log(avctx, AV_LOG_ERROR, "invalid BITPIX, %d\n", header.bitpix); + return AVERROR_INVALIDDATA; + } + } + + p->key_frame = 1; + p->pict_type = AV_PICTURE_TYPE_I; + + *got_frame = 1; + + return avpkt->size; +} + +AVCodec ff_fits_decoder = { + .name = "fits", + .type = AVMEDIA_TYPE_VIDEO, + .id = AV_CODEC_ID_FITS, + .decode = fits_decode_frame, + .capabilities = AV_CODEC_CAP_DR1, + .long_name = NULL_IF_CONFIG_SMALL("FITS image") +}; diff --git a/libavcodec/version.h b/libavcodec/version.h index 5f2321c..2b259b8 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -28,8 +28,8 @@ #include "libavutil/version.h" #define LIBAVCODEC_VERSION_MAJOR 57 -#define LIBAVCODEC_VERSION_MINOR 96 -#define LIBAVCODEC_VERSION_MICRO 101 +#define LIBAVCODEC_VERSION_MINOR 97 +#define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \ diff --git a/libavformat/Makefile b/libavformat/Makefile index 00cba52..f5352d6 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -223,6 +223,7 @@ OBJS-$(CONFIG_IMAGE_BMP_PIPE_DEMUXER) += img2dec.o img2.o OBJS-$(CONFIG_IMAGE_DDS_PIPE_DEMUXER) += img2dec.o img2.o OBJS-$(CONFIG_IMAGE_DPX_PIPE_DEMUXER) += img2dec.o img2.o OBJS-$(CONFIG_IMAGE_EXR_PIPE_DEMUXER) += img2dec.o img2.o +OBJS-$(CONFIG_IMAGE_FITS_PIPE_DEMUXER) += img2dec.o img2.o OBJS-$(CONFIG_IMAGE_J2K_PIPE_DEMUXER) += img2dec.o img2.o OBJS-$(CONFIG_IMAGE_JPEG_PIPE_DEMUXER) += img2dec.o img2.o OBJS-$(CONFIG_IMAGE_JPEGLS_PIPE_DEMUXER) += img2dec.o img2.o diff --git a/libavformat/allformats.c b/libavformat/allformats.c index ad516eb..7988fae 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -355,6 +355,7 @@ static void register_all(void) REGISTER_DEMUXER (IMAGE_DDS_PIPE, image_dds_pipe); REGISTER_DEMUXER (IMAGE_DPX_PIPE, image_dpx_pipe); REGISTER_DEMUXER (IMAGE_EXR_PIPE, image_exr_pipe); + REGISTER_DEMUXER (IMAGE_FITS_PIPE, image_fits_pipe); REGISTER_DEMUXER (IMAGE_J2K_PIPE, image_j2k_pipe); REGISTER_DEMUXER (IMAGE_JPEG_PIPE, image_jpeg_pipe); REGISTER_DEMUXER (IMAGE_JPEGLS_PIPE, image_jpegls_pipe); diff --git a/libavformat/img2.c b/libavformat/img2.c index 8432cc0..e405df8 100644 --- a/libavformat/img2.c +++ b/libavformat/img2.c @@ -80,6 +80,7 @@ const IdStrMap ff_img_tags[] = { { AV_CODEC_ID_XPM, "xpm" }, { AV_CODEC_ID_XFACE, "xface" }, { AV_CODEC_ID_XWD, "xwd" }, + { AV_CODEC_ID_FITS, "fits" }, { AV_CODEC_ID_NONE, NULL } }; diff --git a/libavformat/img2dec.c b/libavformat/img2dec.c index 19cae87..a2b9413 100644 --- a/libavformat/img2dec.c +++ b/libavformat/img2dec.c @@ -959,6 +959,15 @@ static int xpm_probe(AVProbeData *p) return 0; } +static int fits_probe(AVProbeData *p) +{ + const uint8_t *b = p->buf; + + if (AV_RB32(b) == 0x53494d50 && AV_RB16(b+4) == 0x4c45) + return AVPROBE_SCORE_MAX - 1; + return 0; +} + #define IMAGEAUTO_DEMUXER(imgname, codecid)\ static const AVClass imgname ## _class = {\ .class_name = AV_STRINGIFY(imgname) " demuxer",\ @@ -982,6 +991,7 @@ IMAGEAUTO_DEMUXER(bmp, AV_CODEC_ID_BMP) IMAGEAUTO_DEMUXER(dds, AV_CODEC_ID_DDS) IMAGEAUTO_DEMUXER(dpx, AV_CODEC_ID_DPX) IMAGEAUTO_DEMUXER(exr, AV_CODEC_ID_EXR) +IMAGEAUTO_DEMUXER(fits, AV_CODEC_ID_FITS) IMAGEAUTO_DEMUXER(j2k, AV_CODEC_ID_JPEG2000) IMAGEAUTO_DEMUXER(jpeg, AV_CODEC_ID_MJPEG) IMAGEAUTO_DEMUXER(jpegls, AV_CODEC_ID_JPEGLS)