From patchwork Mon Jun 29 18:56:17 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gautam Ramakrishnan X-Patchwork-Id: 20713 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:80ca:0:0:0:0:0 with SMTP id c10csp3049281ybm; Mon, 29 Jun 2020 12:29:04 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxSetp2vXbb4OaDIFy2T2LEQkuRydXbfYzKhRwatToVF+dIItVQXKMLPCt7JcwQRr6ZB4D/ X-Received: by 2002:a5d:4649:: with SMTP id j9mr17677308wrs.270.1593458944274; Mon, 29 Jun 2020 12:29:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1593458944; cv=none; d=google.com; s=arc-20160816; b=jIzRc3MRHb2zoW0g6U06Qmg28SjlIYWxxYZYL+yD3/Qj6SbOrdBBHAYcG0iGD9hT3z 8T+0tX5aKNRqV7XKMR9A2BJX0P2gAyP/PtyeVWdHcJPFW/tCM4svo2lL5SGjM9haXXey vNVZFU3Ia2NGBhLmdhtakJLKBMs5E6TBL/EdxSY3vkdTYiT2RUkyu6eFvg94tv7Na/DA S1njRmuLsHeodS5JqdGZ2Yr7kzqjYgNTKm2bhQ1/eg/xWHDVGtt63OBx42qzQtir5kIW G+lEORZjrVFIWFeISAsWu0atkpPz64d5iOLaK8p3o9Y6xyEG5/QsF7nwE8FosdLkMX3g zgtw== 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; bh=7ArLkXAjwpu4l+ZGvKKF+zHbU4CDIFeHrh5FsYh30a0=; b=eUJrTJP4991G87+GWuPIgZb1erESScI0dDL08s3s5OCEQS3nN4lKIwyfeNwWbmZJl7 9qHShMqkW/E9E2lCAYMQO6UmTC5bv5I0jPeE3Cqbyd3syXnata9tr5P/4inYPU0DXArw 9bIiTqS/1E6VLoIM7KWpvf7edyWBaCsss3txlX5bTmqbFOfe3GLPZM3FsznaV7JabbX5 4W7t3CjrKOIiYg3Cg0EjJ98oRDpJUoN6Mr9VcTLWX0PbXaPeDDmTNTtQZxNpSWa0DVyY G6Dl1VkXNj6qhKp/+sRyl33SGNeJtEP6r4XOCQDPStkPY0kh7eYNfcnngn8cVdwx8Buf 53Bg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=GYOtqlnK; 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=QUARANTINE 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 z8si711346wrn.90.2020.06.29.12.29.03; Mon, 29 Jun 2020 12:29:04 -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=GYOtqlnK; 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=QUARANTINE 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 DA3A068806F; Mon, 29 Jun 2020 22:29:01 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f65.google.com (mail-qv1-f65.google.com [209.85.219.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 98C0B6804B0 for ; Mon, 29 Jun 2020 22:28:55 +0300 (EEST) Received: by mail-qv1-f65.google.com with SMTP id el4so4111603qvb.13 for ; Mon, 29 Jun 2020 12:28:55 -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=S0QOMR+bm7kxtAK1CR+574Koq99eh9V6mn+MqZ0dikk=; b=GYOtqlnKAOp3Dhjx+nOjKisit9HvvvdnuNyhdrTH67iHjZm+/kYcMwSGgS5y8VE0EW mfaRdJgyzP+096Hk2M1foLgkaMEKFTnhmucyKdJig8sceNYB0qvltiWBoQApYUSnS5kW Mc+yFnFtMC8rIhQIM1d+0eA4Fm2wzDFg26NLctmhIJCdnPU5NEzbCgXxMb5yeDEaykb8 5ej8NjNHWBFTgacGcs4v8FzWodjDwUAI4MJBkWQDwEisVU7GHVi8vLZ65lpb8456F9zS aFBgwcphLCyQugvdWxHD0a6d7EUc89rGiiFsgq/Q4+oj/jIOVdIevDDBYwKjTdSyAC6g p/Hw== 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=S0QOMR+bm7kxtAK1CR+574Koq99eh9V6mn+MqZ0dikk=; b=M5pyEtJRJyh4wamBgYrGivAWtnLHiwD4kzaBvNwi7+LtiXsb3RjjBuxtAthuIcJVNS mkBMY00jFEPuTRdR5jiDBjyw3FTXCm7Yn9fyJQf5VCqDzuSpfaniMDFpSVUXNN/FU/v/ iFqcLqbG0QwgVDPfiuNZ4RGoD0PBF9P+xBAR6wIuwcosjLHu8L8bxkaoXd++Qq+JqKx7 Y8wkIhQWXJCMl+9Yn4yEnHgVU1ImMDOMtoBJmzTWaAbHRW8cLQ2+aE6qZe8/EzpHj+9W CUTASmmI0i6cEIZxhKfkdPWUwpanyTroAY9iM/DmuoH1c/pidEp4oehdv+JcHPGEUezv dOZA== X-Gm-Message-State: AOAM533IfGpyh4gYLVwoj26BzNI0/7VzQwxPxnwo1CG/OucuIAWHAaNv 8zwWmqdXNTcW59O8D0p2DvRjIUjrFxe8gw== X-Received: by 2002:a62:fc53:: with SMTP id e80mr15013108pfh.129.1593456987423; Mon, 29 Jun 2020 11:56:27 -0700 (PDT) Received: from localhost.localdomain ([122.181.59.182]) by smtp.gmail.com with ESMTPSA id d5sm261178pjo.20.2020.06.29.11.56.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Jun 2020 11:56:26 -0700 (PDT) From: gautamramk@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Tue, 30 Jun 2020 00:26:17 +0530 Message-Id: <20200629185618.15101-1-gautamramk@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH v4 1/2] libavcodec/pgxdec: Add PGX 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: Gautam Ramakrishnan MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: MI0LALNoNSI5 Content-Length: 13921 From: Gautam Ramakrishnan This patch adds a pgx decoder. --- Changelog | 1 + doc/general.texi | 2 + libavcodec/Makefile | 1 + libavcodec/allcodecs.c | 1 + libavcodec/codec_desc.c | 7 ++ libavcodec/codec_id.h | 1 + libavcodec/pgxdec.c | 199 ++++++++++++++++++++++++++++++++++++++++ libavcodec/version.h | 2 +- 8 files changed, 213 insertions(+), 1 deletion(-) create mode 100644 libavcodec/pgxdec.c diff --git a/Changelog b/Changelog index a60e7d2eb8..1bb9931c0d 100644 --- a/Changelog +++ b/Changelog @@ -4,6 +4,7 @@ releases are sorted from youngest to oldest. version : - AudioToolbox output device - MacCaption demuxer +- PGX decoder version 4.3: diff --git a/doc/general.texi b/doc/general.texi index ea34b963b5..53d556c56c 100644 --- a/doc/general.texi +++ b/doc/general.texi @@ -751,6 +751,8 @@ following image formats are supported: @tab Portable GrayMap image @item PGMYUV @tab X @tab X @tab PGM with U and V components in YUV 4:2:0 +@item PGX @tab @tab X + @tab PGX file decoder @item PIC @tab @tab X @tab Pictor/PC Paint @item PNG @tab X @tab X diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 5a6ea59715..12aa43fe51 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -536,6 +536,7 @@ OBJS-$(CONFIG_PGM_ENCODER) += pnmenc.o OBJS-$(CONFIG_PGMYUV_DECODER) += pnmdec.o pnm.o OBJS-$(CONFIG_PGMYUV_ENCODER) += pnmenc.o OBJS-$(CONFIG_PGSSUB_DECODER) += pgssubdec.o +OBJS-$(CONFIG_PGX_DECODER) += pgxdec.o OBJS-$(CONFIG_PICTOR_DECODER) += pictordec.o cga_data.o OBJS-$(CONFIG_PIXLET_DECODER) += pixlet.o OBJS-$(CONFIG_PJS_DECODER) += textdec.o ass.o diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index fa0c08d42e..a5048290f7 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -238,6 +238,7 @@ extern AVCodec ff_pgm_encoder; extern AVCodec ff_pgm_decoder; extern AVCodec ff_pgmyuv_encoder; extern AVCodec ff_pgmyuv_decoder; +extern AVCodec ff_pgx_decoder; extern AVCodec ff_pictor_decoder; extern AVCodec ff_pixlet_decoder; extern AVCodec ff_png_encoder; diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c index 9f8847544f..67e0a3055c 100644 --- a/libavcodec/codec_desc.c +++ b/libavcodec/codec_desc.c @@ -1405,6 +1405,13 @@ static const AVCodecDescriptor codec_descriptors[] = { .long_name = NULL_IF_CONFIG_SMALL("AVS2-P2/IEEE1857.4"), .props = AV_CODEC_PROP_LOSSY, }, + { + .id = AV_CODEC_ID_PGX, + .type = AVMEDIA_TYPE_VIDEO, + .name = "pgx", + .long_name = NULL_IF_CONFIG_SMALL("PGX (JPEG2000 Test Format)"), + .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS, + }, { .id = AV_CODEC_ID_Y41P, .type = AVMEDIA_TYPE_VIDEO, diff --git a/libavcodec/codec_id.h b/libavcodec/codec_id.h index d885962c9c..896ecb0ce0 100644 --- a/libavcodec/codec_id.h +++ b/libavcodec/codec_id.h @@ -241,6 +241,7 @@ enum AVCodecID { AV_CODEC_ID_SCREENPRESSO, AV_CODEC_ID_RSCC, AV_CODEC_ID_AVS2, + AV_CODEC_ID_PGX, AV_CODEC_ID_Y41P = 0x8000, AV_CODEC_ID_AVRP, diff --git a/libavcodec/pgxdec.c b/libavcodec/pgxdec.c new file mode 100644 index 0000000000..9c3b18f87d --- /dev/null +++ b/libavcodec/pgxdec.c @@ -0,0 +1,199 @@ +/* + * PGX image format + * Copyright (c) 2020 Gautam Ramakrishnan + * + * 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 + */ + +#include "avcodec.h" +#include "internal.h" +#include "bytestream.h" +#include "libavutil/imgutils.h" + +typedef struct PGXContext { + GetByteContext g; +} PGXContext; + +static int pgx_get_number(AVCodecContext *avctx, PGXContext * const s) { + int ret = -1; + char digit; + + while (1) { + uint64_t temp; + if (!bytestream2_get_bytes_left(&s->g)) + return -1; + digit = bytestream2_get_byte(&s->g); + if (digit == ' ' || digit == 0xA || digit == 0xD) + break; + else if (digit < '0' || digit > '9') + return -1; + + if (ret < 0) + ret = 0; + + temp = 10 * ret + (digit - '0'); + if (temp > INT_MAX) + return -1; + ret = temp; + } + + if (ret >= 0) + return ret; + return -1; +} + +static int ff_pgx_decode_header(AVCodecContext *avctx, PGXContext * s, + int *depth, int *width, int *height, + int *sign) +{ + int byte; + + if (bytestream2_get_bytes_left(&s->g) < 6) { + return AVERROR_INVALIDDATA; + } + + bytestream2_skip(&s->g, 6); + + // Is the component signed? + byte = bytestream2_peek_byte(&s->g); + if (byte == '+') { + *sign = 0; + bytestream2_skip(&s->g, 1); + } else if (byte == '-') { + *sign = 1; + bytestream2_skip(&s->g, 1); + } else if (byte == 0) + goto error; + + byte = bytestream2_peek_byte(&s->g); + if (byte == ' ') + bytestream2_skip(&s->g, 1); + else if (byte == 0) + goto error; + + *depth = pgx_get_number(avctx, s); + *width = pgx_get_number(avctx, s); + *height = pgx_get_number(avctx, s); + if (*depth <= 0 || *width <= 0 || *height <= 0) + goto error; + + if (bytestream2_peek_byte(&s->g) == 0xA) + bytestream2_skip(&s->g, 1); + return 0; + +error: + av_log(avctx, AV_LOG_ERROR, "Error in decoding header.\n"); + return AVERROR_INVALIDDATA; +} + +static inline int write_frame_8(AVPacket *avpkt, AVFrame *frame, PGXContext * const s, + int width, int height, int sign, int depth) +{ + int i, j; + for (i = 0; i < height; i++) { + uint8_t *line = frame->data[0] + i * frame->linesize[0]; + for (j = 0; j < width; j++) { + int val; + if (bytestream2_get_bytes_left(&s->g) < 1) + return AVERROR_INVALIDDATA; + if (sign) + val = bytestream2_get_byte(&s->g) + (1 << (depth - 1)); + else + val = bytestream2_get_byteu(&s->g); + val <<= (8 - depth); + *(line + j) = val; + } + line += frame->linesize[0]; + } + return 0; +} + +static inline int write_frame_16(AVPacket *avpkt, AVFrame *frame, PGXContext * const s, + int width, int height, int sign, int depth) +{ + int i, j; + for (i = 0; i < height; i++) { + uint16_t *line = (uint16_t*)frame->data[0] + i*frame->linesize[0]/2; + for (j = 0; j < width; j++) { + int val; + if (bytestream2_get_bytes_left(&s->g) < 2) + return AVERROR_INVALIDDATA; + if (sign) + val = (int16_t)bytestream2_get_be16(&s->g) + (1 << (depth - 1)); + else + val = bytestream2_get_be16u(&s->g); + val <<= (16 - depth); + *(line + j) = val; + } + line += frame->linesize[0]/2; + } + return 0; +} + +static int pgx_decode_frame(AVCodecContext *avctx, void *data, + int *got_frame, AVPacket *avpkt) +{ + PGXContext *s = avctx->priv_data; + AVFrame *p = data; + int ret; + int bpp; + int width, height, depth; + int sign = 0; + bytestream2_init(&s->g, avpkt->data, avpkt->size); + + if ((ret = ff_pgx_decode_header(avctx, s, &depth, &width, &height, &sign)) < 0) + return ret; + if (ret = av_image_check_size(width, height, 0, avctx)) { + av_log(avctx, AV_LOG_ERROR, "Image too large.\n"); + return ret; + } + if ((ret = ff_set_dimensions(avctx, width, height)) < 0) + return ret; + + if (depth <= 8) { + avctx->pix_fmt = AV_PIX_FMT_GRAY8; + bpp = 8; + } else if (depth <= 16) { + avctx->pix_fmt = AV_PIX_FMT_GRAY16BE; + bpp = 16; + } else { + av_log(avctx, AV_LOG_ERROR, "Maximum depth of 16 bits supported.\n"); + return AVERROR_PATCHWELCOME; + } + + if ((ret = ff_get_buffer(avctx, p, 0)) < 0) + return ret; + *got_frame = 1; + p->pict_type = AV_PICTURE_TYPE_I; + p->key_frame = 1; + avctx->bits_per_raw_sample = depth; + if (bpp == 8) + write_frame_8(avpkt, p, s, width, height, sign, depth); + else if (bpp == 16) + write_frame_16(avpkt, p, s, width, height, sign, depth); + return 0; +} + +AVCodec ff_pgx_decoder = { + .name = "pgx", + .long_name = NULL_IF_CONFIG_SMALL("PGX (JPEG2000 Test Format)"), + .type = AVMEDIA_TYPE_VIDEO, + .id = AV_CODEC_ID_PGX, + .priv_data_size = sizeof(PGXContext), + .decode = pgx_decode_frame, + .capabilities = AV_CODEC_CAP_DR1, +}; diff --git a/libavcodec/version.h b/libavcodec/version.h index 03593026b3..482cc6d6ba 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -28,7 +28,7 @@ #include "libavutil/version.h" #define LIBAVCODEC_VERSION_MAJOR 58 -#define LIBAVCODEC_VERSION_MINOR 93 +#define LIBAVCODEC_VERSION_MINOR 94 #define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \