From patchwork Mon Jun 19 15:37:38 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paras X-Patchwork-Id: 4046 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.22.4 with SMTP id 4csp967969vsw; Mon, 19 Jun 2017 08:38:03 -0700 (PDT) X-Received: by 10.223.128.65 with SMTP id 59mr18554565wrk.0.1497886683758; Mon, 19 Jun 2017 08:38:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1497886683; cv=none; d=google.com; s=arc-20160816; b=hpCXJ+ZDw912tmt7ED1Zr2K4GClvJiTb7Ru5hCMnLYpWWH2jZjFRcv8SEw8pJqr6Fi DpYH9Sd2NKSSIkWJxaipn4Os9IjFxDArCazIjqnX7AI5Whmm7MAQUXuBN3QEW9d/BRzy tSSLQoYPpwI7vwANEQ53RQNFDslNYQDvNy1K/1zvxyeYhsup0S35ydXrY7TOtv93EnL0 8UvoaKFDGS+LPGWzFy30bshtVAtUYZZNd0E39Ux3TxNPHCjrAB4yOyZ4gjk0xrgz5kqJ xAsi1tMpS+a4Qad+TNeEC7WeaWesU9jUuQrzQNRWfe1sLty2wPnX1yfePK88hZiDov6T aoOQ== 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=uvcItC/b6QL/FQSUWowaNxEuLxrdp2hJEA6Q7/Y445E=; b=SckSMr5qZweZY1kE1MEjrhd1BLhjAwwYYAoCN0df7clwBJjAgW8QQxlzVJ4K8ToH7x Fn8wrOZ0dXBzMj58w0lgFRBGLfDiThNOy6C8kBFUY7Sn0VPgbCt0K13RQ247BcspwbSs Vk2khWERXyeqv+eFARvq72xO1GqclE5U7+oeOmV1n32DvvtZZ3sXVYb3tB+JQgAwOgpU VxpD49zocLGxNhYuk78YN4IpDjrFIL62O0MKNcQvn4wv0cbWgTK7AnAuxpgltM8mC5S/ oLSx/bhDSiQLEkuU6wnO6QISisjJuc0pzK+PTbrvFqK1d55TledxlnsM0MxgE+cLEKaV WmNw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=AVmfojG/; 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 62si6047790wrh.283.2017.06.19.08.38.03; Mon, 19 Jun 2017 08:38:03 -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=AVmfojG/; 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 105AF68A554; Mon, 19 Jun 2017 18:37:56 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg0-f67.google.com (mail-pg0-f67.google.com [74.125.83.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 40A8668A535 for ; Mon, 19 Jun 2017 18:37:49 +0300 (EEST) Received: by mail-pg0-f67.google.com with SMTP id j186so16615849pge.1 for ; Mon, 19 Jun 2017 08:37:54 -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=KdaFTRuH9baDHnTEgwc1p3c0crh3lCtubGld1KJMJfM=; b=AVmfojG/LL76Q6HWiwiUJ8EyzvnnGYnLHYHkScvcTftSQ4+uj0PUijaTYyenEUNpiP 3cSj0czSH3gZulNfrJ7SMfyRMBF1LxmYuRC4IUOX905blAnT7e86sD7BS1od2dvKkcVr nH5M8csvzt9XcyNC+xU7wP8ghImDEo9QD0oymxEvVZDmD1LnPKiDh4zeGEYeu4umgfEd pWcQqvnV+r3WhNpZWNsMb+tFLGCLaRcW3sUFjJYq4nkw6Zf3gBsoTp8MnIRqzwcQLtjW nt1ZHEUZful2rUYzBb/lIAkq2lX3g+sUHXTQLK+4LwJKsmcSujXrZRDRR1MKJNgA0ZB1 Mw8w== 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=KdaFTRuH9baDHnTEgwc1p3c0crh3lCtubGld1KJMJfM=; b=O41DEwi/fCkLBs9GacxQsQaU/PGfIRKUntKgf0BtpzinR/a+Cwe80kde4xUQ7fwIb5 sKuAD9yNu9poVpg3meYHzseSQqEc290ST7GK93/mEEFzuYw++7Y5qqctpqA5/SerAd9P AyFYo9PcnxdSqYno0VBoVVaAKOhG5EVtTJQqPvjkFi4BKIU42D0l/L9fYAIL7gFp+YiL n+nvhytojeBO1fvQS8oJRqTzXCVwFaUjngAfatKlpwet05rTldIrk0sO0QD1D5vJjkAo alY397w2THNPPdQ/kJems/ZA+TQcK0vixWDFw5W6rJ034i0VqLyty4w0UI1uOo9vVOW3 3nIA== X-Gm-Message-State: AKS2vOwgWDjoBpk3iQJFN0yt8UBxNUPpXlETHnqbQvs/53Ropt1iKbVK Gez5ONjtZ9E9SmFm X-Received: by 10.99.100.68 with SMTP id y65mr16069453pgb.165.1497886672167; Mon, 19 Jun 2017 08:37:52 -0700 (PDT) Received: from dhcppc9.localdomain ([124.253.19.79]) by smtp.gmail.com with ESMTPSA id v8sm21504599pfa.10.2017.06.19.08.37.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 19 Jun 2017 08:37:51 -0700 (PDT) From: Paras Chadha To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Jun 2017 21:07:38 +0530 Message-Id: <1497886658-3500-1-git-send-email-paraschadha18@gmail.com> X-Mailer: git-send-email 2.4.11 Subject: [FFmpeg-devel] [PATCH] Add FITS Demuxer 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 --- Changelog | 2 +- libavformat/Makefile | 1 + libavformat/allformats.c | 1 + libavformat/fitsdec.c | 207 +++++++++++++++++++++++++++++++++++++++++++++++ libavformat/version.h | 2 +- 5 files changed, 211 insertions(+), 2 deletions(-) create mode 100644 libavformat/fitsdec.c diff --git a/Changelog b/Changelog index a07644c..77361e6 100644 --- a/Changelog +++ b/Changelog @@ -22,7 +22,7 @@ version : - headphone audio filter - superequalizer audio filter - roberts video filter -- FITS decoder +- FITS demuxer and decoder version 3.3: - CrystalHD decoder moved to new decode API diff --git a/libavformat/Makefile b/libavformat/Makefile index 80aeed2..1d43c05 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -164,6 +164,7 @@ OBJS-$(CONFIG_FFMETADATA_MUXER) += ffmetaenc.o OBJS-$(CONFIG_FIFO_MUXER) += fifo.o OBJS-$(CONFIG_FILMSTRIP_DEMUXER) += filmstripdec.o OBJS-$(CONFIG_FILMSTRIP_MUXER) += filmstripenc.o +OBJS-$(CONFIG_FITS_DEMUXER) += fitsdec.o OBJS-$(CONFIG_FLAC_DEMUXER) += flacdec.o rawdec.o \ flac_picture.o \ oggparsevorbis.o \ diff --git a/libavformat/allformats.c b/libavformat/allformats.c index a0e2fb8..74a2e15 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -121,6 +121,7 @@ static void register_all(void) REGISTER_MUXDEMUX(FFMETADATA, ffmetadata); REGISTER_MUXER (FIFO, fifo); REGISTER_MUXDEMUX(FILMSTRIP, filmstrip); + REGISTER_DEMUXER (FITS, fits); REGISTER_MUXDEMUX(FLAC, flac); REGISTER_DEMUXER (FLIC, flic); REGISTER_MUXDEMUX(FLV, flv); diff --git a/libavformat/fitsdec.c b/libavformat/fitsdec.c new file mode 100644 index 0000000..4a9fe87 --- /dev/null +++ b/libavformat/fitsdec.c @@ -0,0 +1,207 @@ +/* + * FITS demuxer + * 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 demuxer. + */ + +#include "libavutil/intreadwrite.h" +#include "internal.h" +#include "libavutil/opt.h" + +typedef struct FITSContext { + const AVClass *class; + AVRational framerate; + int image; + int64_t pts; +} FITSContext; + +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; +} + +static int fits_read_header(AVFormatContext *s) +{ + AVStream *st = avformat_new_stream(s, NULL); + FITSContext * fits = s->priv_data; + + if (!st) + return AVERROR(ENOMEM); + + st->codecpar->codec_type = AVMEDIA_TYPE_VIDEO; + st->codecpar->codec_id = AV_CODEC_ID_FITS; + + avpriv_set_pts_info(st, 64, fits->framerate.den, fits->framerate.num); + fits->pts = 0; + return 0; +} + +static int64_t find_size(AVIOContext * pb, FITSContext * fits) +{ + int bitpix, naxis, dim_no, i, naxisn[999], groups=0; + int64_t header_size = 0, data_size=0, ret, pcount=0, gcount=1, d; + char buf[80], c; + + if ((ret = avio_read(pb, buf, 80)) != 80) + return AVERROR_EOF; + if (!strncmp(buf, "SIMPLE", 6) || !strncmp(buf, "XTENSION= 'IMAGE", 16)) { + fits->image = 1; + } else { + fits->image = 0; + } + header_size += 80; + + if ((ret = avio_read(pb, buf, 80)) != 80) + return AVERROR_EOF; + if (sscanf(buf, "BITPIX = %d", &bitpix) != 1) + return AVERROR_INVALIDDATA; + header_size += 80; + + if ((ret = avio_read(pb, buf, 80)) != 80) + return AVERROR_EOF; + if (sscanf(buf, "NAXIS = %d", &naxis) != 1) + return AVERROR_INVALIDDATA; + header_size += 80; + + for (i = 0; i < naxis; i++) { + if ((ret = avio_read(pb, buf, 80)) != 80) + return AVERROR_EOF; + if (sscanf(buf, "NAXIS%d = %d", &dim_no, &naxisn[i]) != 2 || dim_no != i+1) + return AVERROR_INVALIDDATA; + header_size += 80; + } + + if ((ret = avio_read(pb, buf, 80)) != 80) + return AVERROR_EOF; + header_size += 80; + + while (strncmp(buf, "END", 3)) { + if (sscanf(buf, "PCOUNT = %ld", &d) == 1) { + pcount = d; + } else if (sscanf(buf, "GCOUNT = %ld", &d) == 1) { + gcount = d; + } else if (sscanf(buf, "GROUPS = %c", &c) == 1) { + if (c == 'T') { + groups = 1; + } + } + + if ((ret = avio_read(pb, buf, 80)) != 80) + return AVERROR_EOF; + header_size += 80; + } + + header_size = ceil(header_size/2880.0)*2880; + + if (groups) { + fits->image = 0; + if (naxis > 1) + data_size = 1; + for (i = 1; i < naxis; i++) { + data_size *= naxisn[i]; + } + } else if (naxis) { + data_size = 1; + for (i = 0; i < naxis; i++) { + data_size *= naxisn[i]; + } + } else { + fits->image = 0; + } + + data_size += pcount; + data_size *= (abs(bitpix) >> 3) * gcount; + + if (!data_size) { + fits->image = 0; + } else { + data_size = ceil(data_size/2880.0)*2880; + } + + return header_size + data_size; +} + +static int fits_read_packet(AVFormatContext *s, AVPacket *pkt) +{ + int64_t size=0, pos, ret; + FITSContext * fits = s->priv_data; + + fits->image = 0; + pos = avio_tell(s->pb); + while (!fits->image) { + if ((ret = avio_seek(s->pb, pos+size, SEEK_SET)) < 0) + return ret; + + if (avio_feof(s->pb)) + return AVERROR_EOF; + + pos = avio_tell(s->pb); + if ((size = find_size(s->pb, fits)) < 0) + return size; + } + + if ((ret = avio_seek(s->pb, pos, SEEK_SET)) < 0) + return ret; + + ret = av_get_packet(s->pb, pkt, size); + if (ret != size) { + if (ret > 0) av_packet_unref(pkt); + return AVERROR(EIO); + } + + pkt->stream_index = 0; + pkt->flags |= AV_PKT_FLAG_KEY; + pkt->pos = pos; + pkt->size = size; + pkt->pts = fits->pts; + fits->pts++; + + return size; +} + +static const AVOption fits_options[] = { + { "framerate", "set the framerate", offsetof(FITSContext, framerate), AV_OPT_TYPE_VIDEO_RATE, {.str = "1"}, 0, INT_MAX, AV_OPT_FLAG_DECODING_PARAM}, + { NULL }, +}; + +static const AVClass fits_demuxer_class = { + .class_name = "FITS demuxer", + .item_name = av_default_item_name, + .option = fits_options, + .version = LIBAVUTIL_VERSION_INT, +}; + +AVInputFormat ff_fits_demuxer = { + .name = "fits", + .long_name = NULL_IF_CONFIG_SMALL("Flexible Image Transport System"), + .priv_data_size = sizeof(FITSContext), + .read_probe = fits_probe, + .read_header = fits_read_header, + .read_packet = fits_read_packet, + .priv_class = &fits_demuxer_class, + .raw_codec_id = AV_CODEC_ID_FITS, +}; diff --git a/libavformat/version.h b/libavformat/version.h index b00a8b0..1fb8ffb 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -32,7 +32,7 @@ // Major bumping may affect Ticket5467, 5421, 5451(compatibility with Chromium) // Also please add any ticket numbers that you believe might be affected here #define LIBAVFORMAT_VERSION_MAJOR 57 -#define LIBAVFORMAT_VERSION_MINOR 73 +#define LIBAVFORMAT_VERSION_MINOR 74 #define LIBAVFORMAT_VERSION_MICRO 100 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \