From patchwork Mon Aug 7 06:43:05 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paras X-Patchwork-Id: 4646 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.46.211 with SMTP id u202csp2504824vsu; Sun, 6 Aug 2017 23:43:33 -0700 (PDT) X-Received: by 10.223.160.229 with SMTP id n34mr8350915wrn.117.1502088213399; Sun, 06 Aug 2017 23:43:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1502088213; cv=none; d=google.com; s=arc-20160816; b=DHSrq79CfA/zz+aCVON6DLmZ3lh0+bJ83SOBnlQdWQFHHtuLQ52xb7EhPwZDZzsAoR MsJCgei+MPoBxzsyZ/jiCRZv+rceC8uHnYH9miycR5DIVg0kEJDmQUv01SxYyT2H40iS r2i9vMj2DqZuyb/15ZvB4PLWdpUNy6K0F6sqmny/I1KXayRwM30thFEQXOER8GpvRM7I 6s07bIptg1lRrhxdZIaz7lP2q2rMSjz4ur1ALk0TOw12IFxKaCZEMUKX/IF5fgjU7Qoo BTYVMXLPGEvqBlWt7fcmw+8OOGudjbFwyV5kztXVSPuwS9DaiaZGGEh4gmuAiUOI1PEg M4rg== 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=10tHoZeW4JZdnnv3LGmQGjRg5LoiS3qk98R7pXPwt6I=; b=B1v2LqOk+CExBzPz6TrfqR7KIoLoTJzf9b0EX0CsMPheUQsPN7Cu+Ri5k4Ah4uDtYq kd6vRCHZ/ONrD69kg91T399Xyfdn879VclnEAWwIlMucN6spdpkXaKnDYcNT5xviB1Zd PTbdoyq0r7xbAvclw6DtEN13iJMehJCAeX0duRLIhYc3o0oAtLdQpu2cLcnvZJ5vfXtr pqHkXcXAGr92q7lFH1kUQrm9p4SPmKRi9sWuPhFKTq3fCg0QWAvrJzKlklCGkNdJ2uQ8 7cQgP9QbiqOqH3OLOWa6K+Rnaz4xl6kIa9kYOaGTF3+QY97aBlDMdAJBDxYNHuDmf+nw SxiA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=cbNZTuDV; 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 h73si7077884wmi.116.2017.08.06.23.43.32; Sun, 06 Aug 2017 23:43:33 -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=cbNZTuDV; 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 057E2688347; Mon, 7 Aug 2017 09:43:28 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf0-f193.google.com (mail-pf0-f193.google.com [209.85.192.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2AA8668829C for ; Mon, 7 Aug 2017 09:43:21 +0300 (EEST) Received: by mail-pf0-f193.google.com with SMTP id j68so8164681pfc.2 for ; Sun, 06 Aug 2017 23:43:22 -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=oN7f7XfxgplMdE1kMeYJBoLjkexwu5zyHltN45djnOc=; b=cbNZTuDVmWsegi+H33i+hHTOvvkLvEni2yEuf21h5Q5bjp49SW0aB2Dr6450K6wD8g f+q+aRM3zFb9Qa8CE6P3oEGBSYu5QP4iEkD9kt8Gt0cFW+tl4rB48oDOe1mqu7OeOXgp OKOK8dRi8fmGyADW467SOiQyLiEMh52pYnsG+SIo8slIF28brVng16HDDWoTsjuGGi0+ MLCtKSizWbUZYk8AwZ2T0Jqhu4vN1W4Q5FkplRAeS35BKcJlN+D/B9UVNGpjX+7n0+8X rKggpXOptPb/9XbTsNkwO2+HXW7gMo6xMBoJacO1vgye9nIem/4lgS/oayU9UhVQXp04 FDFg== 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=oN7f7XfxgplMdE1kMeYJBoLjkexwu5zyHltN45djnOc=; b=Lx5ccBAiN29/ySseyrnawyOtIt+E0Ecdw18QHTyLVJMXym/BUcMCZHFLhictjv8Gfd S37YCEvvQei3WMYIyxS1d/khWTMzpHk2OSyzjh+KWUUPGzbZpohByrQKVpCVAR8D13cR MtuG7NMnfZOc2EcxklYCmJKuC3wMCcUeheHM+3EYopT6C5KFlR8lExJXUgA9jCBPv1lP 6CIz68TtXfkLewlIV8qka5PZfucyIuYpb7mpqKkRhYCw3U2R4r0scuXcjAKsOTUS0NGE ifJRwmbOml9upJQIKp3LdmoruYeLhW6Gair8uMTxhDZmJzBZbOiUW8/rAVoaX5U0h1GA 6EeQ== X-Gm-Message-State: AIVw112GogR2jEcpgzNOccyG0SncwKaMMe6Q0kssQvo2fG2k/yY7E+jn uKiHS0iiYTOqUW1H X-Received: by 10.99.119.10 with SMTP id s10mr10387110pgc.211.1502088200260; Sun, 06 Aug 2017 23:43:20 -0700 (PDT) Received: from dhcppc9.localdomain ([210.56.106.127]) by smtp.gmail.com with ESMTPSA id q3sm14543775pgf.69.2017.08.06.23.43.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 06 Aug 2017 23:43:19 -0700 (PDT) From: Paras Chadha To: ffmpeg-devel@ffmpeg.org Date: Mon, 7 Aug 2017 12:13:05 +0530 Message-Id: <1502088185-22086-1-git-send-email-paraschadha18@gmail.com> X-Mailer: git-send-email 2.4.11 In-Reply-To: <1500579987-14511-1-git-send-email-paraschadha18@gmail.com> References: <1500579987-14511-1-git-send-email-paraschadha18@gmail.com> Subject: [FFmpeg-devel] [PATCH] Add FITS Encoder 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 --- Moved header writing code to muxer Made the changes suggested Changelog | 1 + doc/general.texi | 2 +- libavcodec/Makefile | 1 + libavcodec/allcodecs.c | 2 +- libavcodec/fitsenc.c | 130 +++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 134 insertions(+), 2 deletions(-) create mode 100644 libavcodec/fitsenc.c -- 2.4.11 diff --git a/Changelog b/Changelog index 61414f8..4b7b41b 100644 --- a/Changelog +++ b/Changelog @@ -33,6 +33,7 @@ version : - tlut2 video filter - floodfill video filter - FITS demuxer and decoder +- FITS muxer and encoder version 3.3: - CrystalHD decoder moved to new decode API diff --git a/doc/general.texi b/doc/general.texi index 01402cb..1ea7984 100644 --- a/doc/general.texi +++ b/doc/general.texi @@ -592,7 +592,7 @@ following image formats are supported: @tab Digital Picture Exchange @item EXR @tab @tab X @tab OpenEXR -@item FITS @tab @tab X +@item FITS @tab X @tab X @tab Flexible Image Transport System @item JPEG @tab X @tab X @tab Progressive JPEG is not supported. diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 42eec07..590410c 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -292,6 +292,7 @@ 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 fits.o +OBJS-$(CONFIG_FITS_ENCODER) += fitsenc.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 8678ac2..7fe66f4 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -192,7 +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 (FITS, fits); REGISTER_ENCDEC (FLASHSV, flashsv); REGISTER_ENCDEC (FLASHSV2, flashsv2); REGISTER_DECODER(FLIC, flic); diff --git a/libavcodec/fitsenc.c b/libavcodec/fitsenc.c new file mode 100644 index 0000000..f67f3ad --- /dev/null +++ b/libavcodec/fitsenc.c @@ -0,0 +1,130 @@ +/* + * FITS image encoder + * 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 encoder + * + * Specification: https://fits.gsfc.nasa.gov/fits_standard.html Version 3.0 + * + * RGBA images are encoded as planes in RGBA order. So, NAXIS3 is 3 or 4 for them. + * Also CTYPE3 = 'RGB ' is added to the header to distinguish them from 3d images. + */ + +#include "libavutil/intreadwrite.h" +#include "avcodec.h" +#include "bytestream.h" +#include "internal.h" + +static int fits_encode_frame(AVCodecContext *avctx, AVPacket *pkt, + const AVFrame *pict, int *got_packet) +{ + AVFrame * const p = (AVFrame *)pict; + uint8_t *bytestream, *bytestream_start, *ptr; + const uint16_t flip = (1 << 15); + uint64_t data_size = 0, padded_data_size = 0; + int ret, bitpix, naxis3 = 1, i, j, k, bytes_left; + int map[] = {2, 0, 1, 3}; // mapping from GBRA -> RGBA as RGBA is to be stored in FITS file.. + + switch (avctx->pix_fmt) { + case AV_PIX_FMT_GRAY8: + case AV_PIX_FMT_GRAY16BE: + map[0] = 0; // grayscale images should be directly mapped + if (avctx->pix_fmt == AV_PIX_FMT_GRAY8) { + bitpix = 8; + } else { + bitpix = 16; + } + break; + case AV_PIX_FMT_GBRP: + case AV_PIX_FMT_GBRAP: + bitpix = 8; + if (avctx->pix_fmt == AV_PIX_FMT_GBRP) { + naxis3 = 3; + } else { + naxis3 = 4; + } + break; + case AV_PIX_FMT_GBRP16BE: + case AV_PIX_FMT_GBRAP16BE: + bitpix = 16; + if (avctx->pix_fmt == AV_PIX_FMT_GBRP16BE) { + naxis3 = 3; + } else { + naxis3 = 4; + } + break; + default: + av_log(avctx, AV_LOG_ERROR, "unsupported pixel format\n"); + return AVERROR(EINVAL); + } + + data_size = (bitpix >> 3) * avctx->height * avctx->width * naxis3; + padded_data_size = ((data_size + 2879) / 2880 ) * 2880; + + if ((ret = ff_alloc_packet2(avctx, pkt, padded_data_size, 0)) < 0) + return ret; + + bytestream_start = + bytestream = pkt->data; + + for (k = 0; k < naxis3; k++) { + for (i = 0; i < avctx->height; i++) { + ptr = p->data[map[k]] + (avctx->height - i - 1) * p->linesize[map[k]]; + if (bitpix == 16) { + for (j = 0; j < avctx->width; j++) { + // subtracting bzero is equivalent to first bit flip + bytestream_put_be16(&bytestream, AV_RB16(ptr) ^ flip); + ptr += 2; + } + } else { + memcpy(bytestream, ptr, avctx->width); + bytestream += avctx->width; + } + } + } + + bytes_left = padded_data_size - data_size; + memset(bytestream, 0, bytes_left); + bytestream += bytes_left; + + pkt->size = bytestream - bytestream_start; + pkt->flags |= AV_PKT_FLAG_KEY; + *got_packet = 1; + + return 0; +} + +AVCodec ff_fits_encoder = { + .name = "fits", + .long_name = NULL_IF_CONFIG_SMALL("Flexible Image Transport System"), + .type = AVMEDIA_TYPE_VIDEO, + .id = AV_CODEC_ID_FITS, + .encode2 = fits_encode_frame, + .pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_GBRAP16BE, + AV_PIX_FMT_GBRP16BE, + AV_PIX_FMT_GBRP, + AV_PIX_FMT_GBRAP, + AV_PIX_FMT_GBRP, + AV_PIX_FMT_GRAY16BE, + AV_PIX_FMT_GRAY8, + AV_PIX_FMT_NONE }, +};