From patchwork Fri Sep 15 20:30:27 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paras X-Patchwork-Id: 5156 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.36.26 with SMTP id f26csp1036597jaa; Fri, 15 Sep 2017 13:38:45 -0700 (PDT) X-Received: by 10.28.30.13 with SMTP id e13mr3578276wme.72.1505507925525; Fri, 15 Sep 2017 13:38:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1505507925; cv=none; d=google.com; s=arc-20160816; b=yRjwgopsXyR6X0sAPVuc5dNLcHlPkPDddqMiEQeNfr29ezOqznk/i2BHS1POHokCAI TdObCKLeJevSxqSoZ0yghiJueiJFEUPVor/WVNsQ/wYM0fcFWEQcW+guGaCw0KBORS4w jqC3YfYvJP9hpNt1/1SvPzr9/IoLbOoRzSu6RL7wZ9YUXWsFWpBQzVkZBbfXrLIWT67v EJ1EtA5uBND/MjH1lSwe+r5PXO0yGvkxWuNRpq053RtPqSNgOOb09GxyDssDT0rOh3nb 07ub2sefdDVHs8lUKrNgjwK3KvrkG2nnX411xUvvEouwK1Z11DYEbKvX7RQqhDKLvlmV OhFQ== 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=l+42WoizuaYPNwz+/Nv0KjL2V28FoNIjI+xpS85+ApE=; b=w5NsYVXK/+tsRyxYUSo/2mcqsSjQVBCy40eJt94OUUM5b7/vnbtaNQ1rDEv4zRU5SX 56t7mIqpOSaBKe7ZiQZ7EFhT4pKAq98IBuF9BumXxOmcVIzxQS+OqJ2lF2fFxg3GmeLD /PC1wJLdIbXdwSvqLCLRHss6jSqSEXNqJMEIo8puhKzwUX/OLDVecT3p48A1USaC120W CSVa6ZxsWQVBwvliBiwi/8qajtWWPzcksmte82xbpEfoHaL/V6aRPs0u6d99LYjrAP80 31QcbHlHDyTYkJKf1HZ2FBSuDfpP2X8Zu5VxuQpMmwctPxmlW6siKT5FvBieDM+pHPqc H97Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=W+9DoDIr; 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 e29si1401133wra.308.2017.09.15.13.38.45; Fri, 15 Sep 2017 13:38:45 -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=W+9DoDIr; 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 C569F689BDE; Fri, 15 Sep 2017 23:38:35 +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 BF33C689BDE for ; Fri, 15 Sep 2017 23:38:28 +0300 (EEST) Received: by mail-pg0-f68.google.com with SMTP id j16so1857319pga.2 for ; Fri, 15 Sep 2017 13:38:36 -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=cwUpA2xSkrugw1fjrEI20TirWkUzaZVgbi65mpS9eAI=; b=W+9DoDIrvsSISaGGBzcDHRwty+PptQy/AqC5hmty4Av/r0praOY4PiTVJN34lyFMKK r3kNgmmUbuOm/4qJXVjGdxzxrpwk70NxpYy+ezj6hqdyRPboVcX04Q3g3EKA9ARNuVoT 3F7h/fYYWFyXgfItbh/G1djwkplvwy+qkU/VLhEQeKzTqJ9dOhCNbg/T7dYv9Qv+MaL9 jlFp2MTUn2kxI8Go5jB/Bd2P6cb+RhuZyzQL+cPnj+iD9mST40AKOajVqNDIDAkv71hu DAACKYLbUqMa52TIcsVkkR0N/hHBhNYlmLsBCXJmAsyGiJvIlNhiNN61fIumYmWMKte3 9QPg== 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=cwUpA2xSkrugw1fjrEI20TirWkUzaZVgbi65mpS9eAI=; b=m9jNg0mD+BBnk348mpRZ3sOHVUZ9z0ECorOrDxlhccn895y2omB2DIK0h3yWUscVuu 0WzLBJKx6z5DwFQ8qC9Ll7ZxWtqHikMm1T4+N8suYKc8WQOTbdPQUWQGAGIbjRYlYQBA qaf0u4TCsLzrGK2WVm+r+GjmUafWRsPAn++P9E2jOm54FBAOS2TuN4bP8Vqg55MI2aaA Osf3hr9xdbLTI2KN4QnDxjJat9wZfHqV3iYb39rV2RDUX443OcfbGu8If+/UVYK3vULs RpQOdFqAKqEiupm/A4g12Rzwtb1JZFnPq8QiK9wLty79tCNW5n+sDPVkwm6LdsdMPHhA Y6Lg== X-Gm-Message-State: AHPjjUiLj2LzgpRn1EM087gLXF0AHsdryLQ2vtdA0t35LR+p7apIleYe 18fA7hnzjk/1yc9D X-Google-Smtp-Source: ADKCNb5/uQmgNSWR5cuVi8wc3WadmekuSoqdN1o/pCBrmKdiQut8a2MYeW0ipk08fLFMMR1B20BT+A== X-Received: by 10.101.82.77 with SMTP id q13mr25413910pgp.140.1505507438742; Fri, 15 Sep 2017 13:30:38 -0700 (PDT) Received: from dhcppc9.localdomain ([124.253.50.167]) by smtp.gmail.com with ESMTPSA id l12sm3876808pgr.10.2017.09.15.13.30.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 15 Sep 2017 13:30:38 -0700 (PDT) From: Paras Chadha To: ffmpeg-devel@ffmpeg.org Date: Sat, 16 Sep 2017 02:00:27 +0530 Message-Id: <1505507428-14308-1-git-send-email-paraschadha18@gmail.com> X-Mailer: git-send-email 2.4.11 Subject: [FFmpeg-devel] [PATCH 1/2] avcodec/fitsdec: change to be pixel formats 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 --- libavcodec/fitsdec.c | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/libavcodec/fitsdec.c b/libavcodec/fitsdec.c index b075381..c72415f 100644 --- a/libavcodec/fitsdec.c +++ b/libavcodec/fitsdec.c @@ -205,9 +205,9 @@ static int fits_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, } } else if (header.bitpix == 16) { if (header.naxisn[2] == 3) { - avctx->pix_fmt = AV_PIX_FMT_GBRP16; + avctx->pix_fmt = AV_PIX_FMT_GBRP16BE; } else { - avctx->pix_fmt = AV_PIX_FMT_GBRAP16; + avctx->pix_fmt = AV_PIX_FMT_GBRAP16BE; } } else { av_log(avctx, AV_LOG_ERROR, "unsupported BITPIX = %d\n", header.bitpix); @@ -217,7 +217,7 @@ static int fits_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, if (header.bitpix == 8) { avctx->pix_fmt = AV_PIX_FMT_GRAY8; } else { - avctx->pix_fmt = AV_PIX_FMT_GRAY16; + avctx->pix_fmt = AV_PIX_FMT_GRAY16BE; } } @@ -233,7 +233,7 @@ static int fits_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, */ if (header.rgb) { switch(header.bitpix) { -#define CASE_RGB(cas, dst, type, dref) \ +#define CASE_RGB(cas, dst, type, dref, write) \ case cas: \ for (k = 0; k < header.naxisn[2]; k++) { \ for (i = 0; i < avctx->height; i++) { \ @@ -245,40 +245,42 @@ static int fits_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, } else { \ t = fitsctx->blank_val; \ } \ - *dst++ = (type) t; \ + write(dst, (type) t); \ + dst++; \ ptr8 += cas >> 3; \ } \ } \ } \ break - CASE_RGB(8, dst8, uint8_t, *); - CASE_RGB(16, dst16, uint16_t, AV_RB16); + CASE_RGB(8, dst8, uint8_t, *, AV_WB8); + CASE_RGB(16, dst16, uint16_t, AV_RB16, AV_WB16); } } else { switch (header.bitpix) { -#define CASE_GRAY(cas, dst, type, t, rd) \ +#define CASE_GRAY(cas, dst, type, t, rd, write) \ 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) { \ - *dst++ = ((t - header.data_min) * ((1 << (sizeof(type) * 8)) - 1)) / (header.data_max - header.data_min); \ + write(dst, ((t - header.data_min) * ((1 << (sizeof(type) * 8)) - 1)) / (header.data_max - header.data_min)); \ } else { \ - *dst++ = fitsctx->blank_val; \ + write(dst, fitsctx->blank_val); \ } \ + dst++; \ 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)); + CASE_GRAY(-64, dst16, uint16_t, tdbl, av_int2double(AV_RB64(ptr8)), AV_WB16); + CASE_GRAY(-32, dst16, uint16_t, tflt, av_int2float(AV_RB32(ptr8)), AV_WB16); + CASE_GRAY(8, dst8, uint8_t, t8, ptr8[0], AV_WB8); + CASE_GRAY(16, dst16, uint16_t, t16, AV_RB16(ptr8), AV_WB16); + CASE_GRAY(32, dst16, uint16_t, t32, AV_RB32(ptr8), AV_WB16); + CASE_GRAY(64, dst16, uint16_t, t64, AV_RB64(ptr8), AV_WB16); default: av_log(avctx, AV_LOG_ERROR, "invalid BITPIX, %d\n", header.bitpix); return AVERROR_INVALIDDATA;