From patchwork Thu Jul 20 17:08:57 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paras X-Patchwork-Id: 4393 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.1.76 with SMTP id 73csp2417097vsb; Thu, 20 Jul 2017 10:31:47 -0700 (PDT) X-Received: by 10.223.136.174 with SMTP id f43mr7975510wrf.148.1500571907484; Thu, 20 Jul 2017 10:31:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500571907; cv=none; d=google.com; s=arc-20160816; b=Q45ZXj6WnIT1yJqeqDL/hFyB3f5XYk36oAns2wVj1pDwV+/NgEvTCtM1KhFL7SieHP FagJ3qX84BDKtmlTgGhAdsnXDIkN9jXxlP4XRxpidR7oGsAFF0Log1m+llZI1pNzlvBA kVR9PpnATMiLijivwLG2B6iMKKmUQwTPj8kkr/U/SC+xnJx/qysjVV1kUv4wFMGwbs4v zwd3t1t6RxzjXfD/FeCFQJbL+DSKATNFHHKDI/BbkG8tve+pKOkydD4W8lm/0E6Ol0Hl qT/zqHAu5+M73NBw4GGHaLKLkQ4pgZeJGd/rMb2LRmnuMytfBYMuDlmDKeS8e9oivIw6 JD+Q== 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:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=IdsLHhcV/p9VhR9oN9B6gErk5lUZ9vJ1dHmFlNemiJw=; b=TDIGeq7UcypQMEXsaisbvleXCdO5GRAy1UN8r/BBGeEokSbviT27RobyqZsl6X5pkN yyIKzYfKiuGBF1EVdP0R+T/rWFeBUJI92CkMpXASymARlIWenvXNIKcPpXxh8AKpLmNN NV5FgXoncDIa1NIq7jITU+thpTWjvAcEcTkERyqVvW77m0JtXoCduEQOr1ZJE+T3W34z DGa/O+Fl09L6TUj+8oPXGlIHx42y6Rbcd0npJzrUlzU4uVg6W0zUn1d/FnLWOcTXe9FF ntvLKku+8ZdQcBMEhNDfn7/MpkKqAu/fL+mjVlcpnneHwiv7zy77rqCTOq+R/EtIbCua X2Tw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=BaMLREND; 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 190si2044315wmh.163.2017.07.20.10.31.46; Thu, 20 Jul 2017 10:31:47 -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.b=BaMLREND; 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 C7BD2689A3E; Thu, 20 Jul 2017 20:31:35 +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 74560680057 for ; Thu, 20 Jul 2017 20:31:29 +0300 (EEST) Received: by mail-pg0-f66.google.com with SMTP id s4so3298763pgr.5 for ; Thu, 20 Jul 2017 10:31:37 -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:in-reply-to:references; bh=/3wmnVT+lIsgNi70bRKUnbkFNIU2dNZX1P1dpfcM58w=; b=BaMLRENDzS67HURVGy0ESxb7gdRn4hwhxu6HIknD7ZvJPrmifJ1fGeFUK5Mx7T63ja FILukah3oKMzltg33WjdfqGSTg1cxuHVSjeUOgEa5Ba0mxs0/Q0eEjBnRaLs1jC1RR1W XIsayNbGZazuzp7P5xm7D3QIZp9rveipV0TyV/+PENSI/LgJsC2eNPI3f3xzDbfDDHgS S16iBbdeftRGhCS+IPmhmxB3nNMKVJ85dSjWca8iIjkjf9/9EOZb/VEJjCQx54udaEbK Ym6UGte96/1SaIBM4XTfopTSqUSCBofCVnjEkCDVzX5tMhPDvElnQQWCFkNMahi7AiuE ItwA== 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:in-reply-to :references; bh=/3wmnVT+lIsgNi70bRKUnbkFNIU2dNZX1P1dpfcM58w=; b=iBGHntbt/B4EFHlnGFP2VRoThOxaaszT6JpO9sGQqhq+TpNoNbJbUY1LVKCMJG/UtU kkxWBXrHRC9whr/aouLl9kmLErwr9NKGLiOdL+s0ozeviuYL+CvqPWpzsxJv33h+RgnM OzzxQ08IdPpeWI+irBZ686wzfFA13gkJgMEcu92Uus1zLyxmp7KLhW/Pi2Vnnm09WLk7 dvY9hn8SzGZRINHUu2wZrJ06Dme+1Z77V78Dr/ex5NY7zRcOoTyIjgOpGN2yXEAHVmPs IY+eiD4PlqTt7+1wtbOWhuRe2+BvFj40ElH70zON242ttsmprE208Wx5qukcCKEYejWb 2LoQ== X-Gm-Message-State: AIVw111hfhctI+vqZnWqnn182EIwxv0c5jxuQycwlFmOfFeQ7DwX7Zmx YlJklIKqlCmyRdEL X-Received: by 10.99.61.143 with SMTP id k137mr4510643pga.57.1500570552293; Thu, 20 Jul 2017 10:09:12 -0700 (PDT) Received: from dhcppc9.localdomain ([124.253.30.234]) by smtp.gmail.com with ESMTPSA id s67sm4890555pgb.13.2017.07.20.10.09.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 20 Jul 2017 10:09:10 -0700 (PDT) From: Paras Chadha To: ffmpeg-devel@ffmpeg.org Date: Thu, 20 Jul 2017 22:38:57 +0530 Message-Id: <1500570537-27898-1-git-send-email-paraschadha18@gmail.com> X-Mailer: git-send-email 2.4.11 In-Reply-To: <1498983220-20542-1-git-send-email-paraschadha18@gmail.com> References: <1498983220-20542-1-git-send-email-paraschadha18@gmail.com> 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" Signed-off-by: Paras Chadha --- Fixed an issue with RGB48 and RGBA64 images. Also simplified the RGB decoding code. 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 | 487 ++++++++++++++++++++++++++++++++++++++++++++++++ libavcodec/version.h | 2 +- libavformat/img2.c | 1 + 9 files changed, 503 insertions(+), 1 deletion(-) create mode 100644 libavcodec/fitsdec.c -- 2.4.11 diff --git a/Changelog b/Changelog index 187ae79..d9af2b9 100644 --- a/Changelog +++ b/Changelog @@ -29,6 +29,7 @@ version : - limiter video filter - libvmaf video filter - Dolby E decoder and SMPTE 337M demuxer +- FITS demuxer and decoder version 3.3: - CrystalHD decoder moved to new decode API diff --git a/doc/general.texi b/doc/general.texi index 036c8c2..01402cb 100644 --- a/doc/general.texi +++ b/doc/general.texi @@ -592,6 +592,8 @@ following image formats are supported: @tab Digital Picture Exchange @item EXR @tab @tab X @tab OpenEXR +@item FITS @tab @tab X + @tab Flexible Image Transport System @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 357fa1a..5348ed9 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 4712592..8678ac2 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -192,6 +192,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 c594993..b28002f 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -447,6 +447,7 @@ enum AVCodecID { AV_CODEC_ID_SRGC, AV_CODEC_ID_SVG, AV_CODEC_ID_GDV, + 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 6f43b68..8dcd3ec 100644 --- a/libavcodec/codec_desc.c +++ b/libavcodec/codec_desc.c @@ -1464,6 +1464,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("Flexible Image Transport System"), + .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..8c940c0 --- /dev/null +++ b/libavcodec/fitsdec.c @@ -0,0 +1,487 @@ +/* + * 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 + * + * Specification: https://fits.gsfc.nasa.gov/fits_standard.html Version 3.0 + * + * Support all 2d 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. + * Also to interpret data, values are linearly scaled using min-max scaling but not RGB images. + */ + +#include "avcodec.h" +#include "internal.h" +#include +#include "libavutil/intreadwrite.h" +#include "libavutil/intfloat.h" +#include "libavutil/dict.h" +#include "libavutil/opt.h" + +typedef struct FITSContext { + const AVClass *class; + int blank_val; +} FITSContext; + +/** + * Structure to store the header keywords in FITS file + */ +typedef struct FITSHeader { + char simple; + int bitpix; + int64_t blank; + int blank_found; + int naxis; + int naxisn[3]; + int rgb; /**< 1 if file contains RGB image, 0 otherwise */ + double bscale; + double bzero; + double data_min; + double data_max; +} FITSHeader; + +/** + * Calculate 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 + * @param end pointer to end of packet + * @return 0 if calculated successfully otherwise AVERROR_INVALIDDATA + */ +static int fill_data_min_max(const uint8_t * ptr8, FITSHeader * header, const uint8_t * end) +{ + uint8_t t8; + 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) { +#define CASE_N(a, t, rd) \ + case a: \ + for (i = 0; i < header->naxisn[1]; i++) { \ + for (j = 0; j < header->naxisn[0]; j++) { \ + t = rd; \ + if (!header->blank_found || t != header->blank) { \ + if (t > header->data_max) \ + header->data_max = t; \ + if (t < header->data_min) \ + header->data_min = t; \ + } \ + ptr8 += abs(a) >> 3; \ + } \ + } \ + break + + CASE_N(-64, tdbl, av_int2double(AV_RB64(ptr8))); + CASE_N(-32, tflt, av_int2float(AV_RB32(ptr8))); + CASE_N(8, t8, ptr8[0]); + CASE_N(16, t16, AV_RB16(ptr8)); + CASE_N(32, t32, AV_RB32(ptr8)); + CASE_N(64, t64, AV_RB64(ptr8)); + default: + return AVERROR_INVALIDDATA; + } + return 0; +} + +/** + * Extract keyword and value from a header line (80 bytes) and store them in keyword and value strings respectively + * @param ptr8 pointer to the data + * @param keyword pointer to the char array in which keyword is to be stored + * @param value pointer to the char array in which value is to be stored + * @param end pointer to end of packet + * @return 0 if calculated successfully otherwise AVERROR_INVALIDDATA + */ +static int read_keyword_value(const uint8_t * ptr8, char * keyword, char * value, const uint8_t * end) +{ + int i; + + if (end - ptr8 < 80) + return AVERROR_INVALIDDATA; + + for (i = 0; i < 8 && ptr8[i] != ' '; i++) { + keyword[i] = ptr8[i]; + } + keyword[i] = '\0'; + + if (ptr8[8] == '=') { + i = 10; + while (i < 80 && ptr8[i] == ' ') { + i++; + } + + if (i < 80) { + *value++ = ptr8[i]; + i++; + if (ptr8[i-1] == '\'') { + for (; i < 80 && ptr8[i] != '\''; i++) { + *value++ = ptr8[i]; + } + *value++ = '\''; + } else if (ptr8[i-1] == '(') { + for (; i < 80 && ptr8[i] != ')'; i++) { + *value++ = ptr8[i]; + } + *value++ = ')'; + } else { + for (; i < 80 && ptr8[i] != ' ' && ptr8[i] != '/'; i++) { + *value++ = ptr8[i]; + } + } + } + } + *value = '\0'; + return 0; +} + +/** + * Read the fits header and store the values in FITSHeader pointed by header + * @param avctx AVCodec context + * @param ptr pointer to pointer to the data + * @param header pointer to the FITSHeader + * @param end pointer to end of packet + * @param meta pointer to pointer to AVDictionary to store metadata + * @return 0 if calculated successfully otherwise AVERROR_INVALIDDATA + */ +static int fits_read_header(AVCodecContext *avctx, const uint8_t **ptr, FITSHeader * header, + const uint8_t * end, AVDictionary **meta) +{ + const uint8_t *ptr8 = *ptr; + int lines_read = 0, i, dim_no, data_min_found = 0, data_max_found = 0, ret; + int64_t t, size = 1; + double d; + AVDictionary *metadata = NULL; + char keyword[10], value[72]; + + header->blank_found = 0; + header->bscale = 1.0; + header->bzero = 0; + header->rgb = 0; + + if ((ret = read_keyword_value(ptr8, keyword, value, end)) < 0) + return ret; + ptr8 += 80; + lines_read++; + + if (!strncmp(keyword, "SIMPLE", 6)) { + header->simple = value[0]; + 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; + } + } else if (strncmp(keyword, "XTENSION", 8) || strncmp(value, "'IMAGE '", 10)) { + av_log(avctx, AV_LOG_ERROR, "missing SIMPLE keyword or invalid XTENSION\n"); + return AVERROR_INVALIDDATA; + } + + av_dict_set(&metadata, keyword, value, 0); + + if ((ret = read_keyword_value(ptr8, keyword, value, end)) < 0) + return ret; + ptr8 += 80; + lines_read++; + + if (!strncmp(keyword, "BITPIX", 6) && sscanf(value, "%d", &header->bitpix) != 1) { + av_log(avctx, AV_LOG_ERROR, "missing BITPIX or invalid value of BITPIX, found %s = %s\n", keyword, value); + return AVERROR_INVALIDDATA; + } + + size = abs(header->bitpix) >> 3; + av_dict_set(&metadata, keyword, value, 0); + + if ((ret = read_keyword_value(ptr8, keyword, value, end)) < 0) + return ret; + ptr8 += 80; + lines_read++; + + if (!strncmp(keyword, "NAXIS", 5) && sscanf(value, "%d", &header->naxis) != 1) { + av_log(avctx, AV_LOG_ERROR, "missing NAXIS or invalid value of NAXIS, found %s = %s\n", keyword, value); + return AVERROR_INVALIDDATA; + } + + if (!header->naxis) { + 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; + } + + av_dict_set(&metadata, keyword, value, 0); + + for (i = 0; i < header->naxis; i++) { + + if ((ret = read_keyword_value(ptr8, keyword, value, end)) < 0) + return ret; + ptr8 += 80; + lines_read++; + + if (sscanf(keyword, "NAXIS%d", &dim_no) != 1) { + av_log(avctx, AV_LOG_ERROR, "missing NAXIS%d keyword", i+1); + return AVERROR_INVALIDDATA; + } + + if (dim_no != i+1) { + av_log(avctx, AV_LOG_ERROR, "expected NAXIS%d keyword, found %s = %s\n", i+1, keyword, value); + return AVERROR_INVALIDDATA; + } + + if (sscanf(value, "%d", &header->naxisn[i]) != 1) { + av_log(avctx, AV_LOG_ERROR, "invalid value of NAXIS%d = %s\n", i+1, value); + return AVERROR_INVALIDDATA; + } + + av_dict_set(&metadata, keyword, value, 0); + size *= header->naxisn[i]; + + if (size <= 0) { + av_log(avctx, AV_LOG_ERROR, "unsupported size of FITS image"); + return AVERROR_INVALIDDATA; + } + } + + if ((ret = read_keyword_value(ptr8, keyword, value, end)) < 0) + return ret; + ptr8 += 80; + lines_read++; + + while (strncmp(keyword, "END", 3)) { + if (!strncmp(keyword, "BLANK", 5) && sscanf(value, "%ld", &t) == 1) { + header->blank = t; + header->blank_found = 1; + } else if (!strncmp(keyword, "BSCALE", 6) && sscanf(value, "%lf", &d) == 1) { + header->bscale = d; + } else if (!strncmp(keyword, "BZERO", 5) && sscanf(value, "%lf", &d) == 1) { + header->bzero = d; + } else if (!strncmp(keyword, "DATAMAX", 7) && sscanf(value, "%lf", &d) == 1) { + data_max_found = 1; + header->data_max = d; + } else if (!strncmp(keyword, "DATAMIN", 7) && sscanf(value, "%lf", &d) == 1) { + data_min_found = 1; + header->data_min = d; + } else if (!strncmp(keyword, "CTYPE3", 6) && !strncmp(value, "'RGB", 4)) { + 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; + } + } + + av_dict_set(&metadata, keyword, value, 0); + + if ((ret = read_keyword_value(ptr8, keyword, value, end)) < 0) + return ret; + ptr8 += 80; + lines_read++; + } + + if (!header->rgb && header->naxis != 2) { + av_log(avctx, AV_LOG_ERROR, "unsupported number of dimensions, NAXIS = %d\n", header->naxis); + return AVERROR_INVALIDDATA; + } + + if (header->blank_found && (header->bitpix == -32 || header->bitpix == -64)) { + av_log(avctx, AV_LOG_WARNING, "BLANK keyword found but BITPIX = %d\n. Ignoring BLANK", header->bitpix); + header->blank_found = 0; + } + + 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 && (!data_min_found || !data_max_found)) { + if ((ret = fill_data_min_max(ptr8, header, end)) < 0) { + av_log(avctx, AV_LOG_ERROR, "invalid BITPIX, %d\n", header->bitpix); + return ret; + } + } 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; + } + + *meta = metadata; + return 0; +} + +static int fits_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, AVPacket *avpkt) +{ + AVFrame *p=data; + const uint8_t *ptr8 = avpkt->data, *end; + uint8_t t8; + int16_t t16; + int32_t t32; + int64_t t64; + float tflt; + double tdbl; + int ret, i, j, k; + uint8_t *dst8; + uint16_t *dst16; + uint64_t size, t; + FITSHeader header; + FITSContext * fitsctx = avctx->priv_data; + + end = ptr8 + avpkt->size; + if ((ret = fits_read_header(avctx, &ptr8, &header, end, &p->metadata)) < 0) + return ret; + + size = (abs(header.bitpix) >> 3) * (header.naxisn[0]) * (header.naxisn[1]); + + if (header.rgb) { + if (header.bitpix == 8) { + if (header.naxisn[2] == 3) { + avctx->pix_fmt = AV_PIX_FMT_RGB24; + } else { + avctx->pix_fmt = AV_PIX_FMT_RGBA; + } + } else if (header.bitpix == 16) { + if (header.naxisn[2] == 3) { + avctx->pix_fmt = AV_PIX_FMT_RGB48LE; + } else { + avctx->pix_fmt = AV_PIX_FMT_RGBA64LE; + } + } 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; + + /* + * FITS stores images with bottom row first. Therefore we have + * to fill the image from bottom to top. + */ + if (header.rgb) { + switch(header.bitpix) { +#define CASE_RGB(cas, dst, type, dref) \ + case cas: \ + for (i = 0; i < avctx->height; i++) { \ + dst = (type *) (p->data[0] + (avctx->height-i-1)* p->linesize[0]); \ + for (j = 0; j < avctx->width; j++) { \ + for (k = 0; k < header.naxisn[2]; k++) { \ + t32 = (int16_t) dref(ptr8 + size * k); \ + if (!header.blank_found || t32 != header.blank) { \ + t = t32 * header.bscale + header.bzero; \ + } else { \ + t = fitsctx->blank_val; \ + } \ + *dst++ = (type) t; \ + } \ + ptr8 += cas >> 3; \ + } \ + } \ + break + CASE_RGB(8, dst8, uint8_t, *); + CASE_RGB(16, dst16, uint16_t, AV_RB16); + } + } else { + switch (header.bitpix) { +#define CASE_GRAY(cas, dst, type, t, rd) \ + case cas: \ + for (i = 0; i < avctx->height; i++) { \ + dst = (type *) (p->data[0] + (avctx->height-i-1)* p->linesize[0]); \ + for (j = 0; j < avctx->width; j++) { \ + t = rd; \ + if (!header.blank_found || t != header.blank) { \ + t = ((t - header.data_min) * ((1 << (sizeof(type) * 8)) - 1)) / (header.data_max - header.data_min); \ + } else { \ + t = fitsctx->blank_val; \ + } \ + *dst++ = (type) t; \ + ptr8 += abs(cas) >> 3; \ + } \ + } \ + break + + CASE_GRAY(-64, dst16, uint16_t, tdbl, av_int2double(AV_RB64(ptr8))); + CASE_GRAY(-32, dst16, uint16_t, tflt, av_int2float(AV_RB32(ptr8))); + CASE_GRAY(8, dst8, uint8_t, t8, ptr8[0]); + CASE_GRAY(16, dst16, uint16_t, t16, AV_RB16(ptr8)); + CASE_GRAY(32, dst16, uint16_t, t32, AV_RB32(ptr8)); + CASE_GRAY(64, dst16, uint16_t, t64, AV_RB64(ptr8)); + default: + 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; +} + +static const AVOption fits_options[] = { + { "blank_value", "value that is used to replace BLANK pixels in data array", offsetof(FITSContext, blank_val), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 65535, AV_OPT_FLAG_DECODING_PARAM | AV_OPT_FLAG_VIDEO_PARAM}, + { NULL }, +}; + +static const AVClass fits_decoder_class = { + .class_name = "FITS decoder", + .item_name = av_default_item_name, + .option = fits_options, + .version = LIBAVUTIL_VERSION_INT, +}; + +AVCodec ff_fits_decoder = { + .name = "fits", + .type = AVMEDIA_TYPE_VIDEO, + .id = AV_CODEC_ID_FITS, + .priv_data_size = sizeof(FITSContext), + .decode = fits_decode_frame, + .capabilities = AV_CODEC_CAP_DR1, + .long_name = NULL_IF_CONFIG_SMALL("Flexible Image Transport System"), + .priv_class = &fits_decoder_class +}; diff --git a/libavcodec/version.h b/libavcodec/version.h index 02c4f41..7473000 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -28,7 +28,7 @@ #include "libavutil/version.h" #define LIBAVCODEC_VERSION_MAJOR 57 -#define LIBAVCODEC_VERSION_MINOR 102 +#define LIBAVCODEC_VERSION_MINOR 103 #define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ 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 } };