From patchwork Fri Sep 17 08:38:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Ross X-Patchwork-Id: 30307 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp1995346iov; Fri, 17 Sep 2021 01:39:02 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxOAmKltf62C01c2ujItfkVh1iVoqOgyBhhsYJZf3Y/VyYxB8B5+zBcZJNddhgUf2ZKoAwR X-Received: by 2002:a17:906:e216:: with SMTP id gf22mr10792986ejb.357.1631867942039; Fri, 17 Sep 2021 01:39:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631867942; cv=none; d=google.com; s=arc-20160816; b=fxJ+XugcTM8128tLRWzoyg5GJeHcXuztUyjAvqaHgDNxXlKgmTPd87Sw05lg2jM6YR +dPYydT5DnMCESX9KfH1MOBhmJeI7yLTV90dnjWqpUXvGg8obRRq2MwEzT4Z8a7ITBNZ NqSGC1zWa2nhJF7wGXH833pKxzDdK7QeRrLVwgF94sMp6DooXR9zENMYhTo26vgXfquy 98f1Y5uXqdxnYlxb6MSMNIF6PIoAOhN2k2+9Pad9FdqAeg8ZU3ZPOOIoS0VeQ+bf91PA yrC0zgbemiltFaHi2lPyxVFTT8Faj7ad4KiFXbSeOM2K+KsGZdGucdsUwhQU+m+z4N2e dXvg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:message-id:to:from:date:delivered-to; bh=Kl6mvGkNPYNqR2dZTffUNQND730rSvRmSmdwxVdAq8o=; b=00zgH+ogFERLJBQKIBcUY9KkL5K9TOwVEXdyTQtLXG+ZzxOncJZqoHSuVFtmvGSIEK 7GVOdCLNysDJflXag2lnoQI4KrZM2/sxaTk5hICWmtND2wQKBoCzoHEGqFMVxxzESt3O PTbvoSvWZ53a/r0PR6JnGkujSaOchPMf/iXLd6Pc1YhZVR0GByzljvjn0DKD0T2aSSQl 3vR7e1Eygxx1VqrM5IyYy2acplj3+yWOiKeFgaeyJsVJPZZaxo+o3un2R03rj3naxS0/ dB3+hdgy0wKxZmY0gHI3a+994IGeYyp4naHN/4bFXRWqYNl8srOde/lRlPGHMAWSRNgh 9X/w== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id r24si7774841ejy.432.2021.09.17.01.39.01; Fri, 17 Sep 2021 01:39:02 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 400BD68AFE6; Fri, 17 Sep 2021 11:38:57 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mx.sdf.org (mx.sdf.org [205.166.94.24]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5AC7768A929 for ; Fri, 17 Sep 2021 11:38:50 +0300 (EEST) Received: from f302ce7cf81a2706cff3e7e3d05eafa0 ([1.145.161.12]) (authenticated (128 bits)) by mx.sdf.org (8.15.2/8.14.5) with ESMTPSA id 18H8ccjp010008 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits) verified NO) for ; Fri, 17 Sep 2021 08:38:43 GMT Date: Fri, 17 Sep 2021 18:38:34 +1000 From: Peter Ross To: ffmpeg-devel@ffmpeg.org Message-ID: <755fd91b4ae6c9327668f339acfc67fcdd02c0bd.1631867851.git.pross@xvid.org> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] avcodec: GEM Raster image decoder X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: aoKy3NpfFb6e --- Samples: https://telparia.com/fileFormatSamples/image/gem/ Changelog | 1 + doc/general_contents.texi | 2 + libavcodec/Makefile | 1 + libavcodec/allcodecs.c | 1 + libavcodec/codec_desc.c | 7 + libavcodec/codec_id.h | 1 + libavcodec/gemdec.c | 343 ++++++++++++++++++++++++++++++++++++++ 7 files changed, 356 insertions(+) create mode 100644 libavcodec/gemdec.c diff --git a/Changelog b/Changelog index d0b1a9724e..5d81f05dd9 100644 --- a/Changelog +++ b/Changelog @@ -20,6 +20,7 @@ version : - MSN Siren decoder - scharr video filter - apsyclip audio filter +- GEM Raster image decoder version 4.4: diff --git a/doc/general_contents.texi b/doc/general_contents.texi index ce5fd4639d..ef841ecfd8 100644 --- a/doc/general_contents.texi +++ b/doc/general_contents.texi @@ -741,6 +741,8 @@ following image formats are supported: @tab OpenEXR @item FITS @tab X @tab X @tab Flexible Image Transport System +@item IMG @tab @tab X + @tab GEM Raster image @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 11873eecae..983760d3b7 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -348,6 +348,7 @@ OBJS-$(CONFIG_G723_1_ENCODER) += g723_1enc.o g723_1.o \ acelp_vectors.o celp_filters.o celp_math.o OBJS-$(CONFIG_G729_DECODER) += g729dec.o lsp.o celp_math.o celp_filters.o acelp_filters.o acelp_pitch_delay.o acelp_vectors.o g729postfilter.o OBJS-$(CONFIG_GDV_DECODER) += gdv.o +OBJS-$(CONFIG_GEM_DECODER) += gemdec.o OBJS-$(CONFIG_GIF_DECODER) += gifdec.o lzw.o OBJS-$(CONFIG_GIF_ENCODER) += gif.o lzwenc.o OBJS-$(CONFIG_GREMLIN_DPCM_DECODER) += dpcm.o diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index c42aba140d..861c4b786a 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -134,6 +134,7 @@ extern const AVCodec ff_fraps_decoder; extern const AVCodec ff_frwu_decoder; extern const AVCodec ff_g2m_decoder; extern const AVCodec ff_gdv_decoder; +extern const AVCodec ff_gem_decoder; extern const AVCodec ff_gif_encoder; extern const AVCodec ff_gif_decoder; extern const AVCodec ff_h261_encoder; diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c index a06992fce8..86fa827431 100644 --- a/libavcodec/codec_desc.c +++ b/libavcodec/codec_desc.c @@ -1855,6 +1855,13 @@ static const AVCodecDescriptor codec_descriptors[] = { .long_name = NULL_IF_CONFIG_SMALL("Digital Pictures SGA Video"), .props = AV_CODEC_PROP_LOSSY, }, + { + .id = AV_CODEC_ID_GEM, + .type = AVMEDIA_TYPE_VIDEO, + .name = "gem", + .long_name = NULL_IF_CONFIG_SMALL("GEM Raster image"), + .props = AV_CODEC_PROP_LOSSY, + }, /* various PCM "codecs" */ { diff --git a/libavcodec/codec_id.h b/libavcodec/codec_id.h index 446bb2c2fb..ab265ec584 100644 --- a/libavcodec/codec_id.h +++ b/libavcodec/codec_id.h @@ -307,6 +307,7 @@ enum AVCodecID { AV_CODEC_ID_CRI, AV_CODEC_ID_SIMBIOSIS_IMX, AV_CODEC_ID_SGA_VIDEO, + AV_CODEC_ID_GEM, /* various PCM "codecs" */ AV_CODEC_ID_FIRST_AUDIO = 0x10000, ///< A dummy id pointing at the start of audio codecs diff --git a/libavcodec/gemdec.c b/libavcodec/gemdec.c new file mode 100644 index 0000000000..bf0927b763 --- /dev/null +++ b/libavcodec/gemdec.c @@ -0,0 +1,343 @@ +/* + * GEM Raster image decoder + * Copyright (c) 2021 Peter Ross (pross@xvid.org) + * + * 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 + * GEM Raster image decoder + */ + +#include "avcodec.h" +#include "bytestream.h" +#include "internal.h" + +static const uint32_t gem_color_palette[16]={ + 0xFFFFFFFF, 0xFFFF0000, 0xFF00FF00, 0xFFFFFF00, + 0xFF0000FF, 0xFFFF00FF, 0xFF00FFFF, 0xFFAEAEAE, + 0xFF555555, 0xFFAE0000, 0xFF00AE00, 0xFFAEAE00, + 0xFF0000AE, 0xFFAE00AE, 0xFF00AEAE, 0xFF000000, +}; + +static const uint8_t gem_gray[256]={ + 0xFF, 0x7F, 0xBF, 0x3F, 0xDF, 0x5F, 0x9F, 0x1F, 0xEF, 0x6F, 0xAF, 0x2F, 0xCF, 0x4F, 0x8F, 0x0F, + 0xF7, 0x77, 0xB7, 0x37, 0xD7, 0x57, 0x97, 0x17, 0xE7, 0x67, 0xA7, 0x27, 0xC7, 0x47, 0x87, 0x07, + 0xFB, 0x7B, 0xBB, 0x3B, 0xDB, 0x5B, 0x9B, 0x1B, 0xEB, 0x6B, 0xAB, 0x2B, 0xCB, 0x4B, 0x8B, 0x0B, + 0xF3, 0x73, 0xB3, 0x33, 0xD3, 0x53, 0x93, 0x13, 0xE3, 0x63, 0xA3, 0x23, 0xC3, 0x43, 0x83, 0x03, + 0xFD, 0x7D, 0xBD, 0x3D, 0xDD, 0x5D, 0x9D, 0x1D, 0xED, 0x6D, 0xAD, 0x2D, 0xCD, 0x4D, 0x8D, 0x0D, + 0xF5, 0x75, 0xB5, 0x35, 0xD5, 0x55, 0x95, 0x15, 0xE5, 0x65, 0xA5, 0x25, 0xC5, 0x45, 0x85, 0x05, + 0xF9, 0x79, 0xB9, 0x39, 0xD9, 0x59, 0x99, 0x19, 0xE9, 0x69, 0xA9, 0x29, 0xC9, 0x49, 0x89, 0x09, + 0xF1, 0x71, 0xB1, 0x31, 0xD1, 0x51, 0x91, 0x11, 0xE1, 0x61, 0xA1, 0x21, 0xC1, 0x41, 0x81, 0x01, + 0xFE, 0x7E, 0xBE, 0x3E, 0xDE, 0x5E, 0x9E, 0x1E, 0xEE, 0x6E, 0xAE, 0x2E, 0xCE, 0x4E, 0x8E, 0x0E, + 0xF6, 0x76, 0xB6, 0x36, 0xD6, 0x56, 0x96, 0x16, 0xE6, 0x66, 0xA6, 0x26, 0xC6, 0x46, 0x86, 0x06, + 0xFA, 0x7A, 0xBA, 0x3A, 0xDA, 0x5A, 0x9A, 0x1A, 0xEA, 0x6A, 0xAA, 0x2A, 0xCA, 0x4A, 0x8A, 0x0A, + 0xF2, 0x72, 0xB2, 0x32, 0xD2, 0x52, 0x92, 0x12, 0xE2, 0x62, 0xA2, 0x22, 0xC2, 0x42, 0x82, 0x02, + 0xFC, 0x7C, 0xBC, 0x3C, 0xDC, 0x5C, 0x9C, 0x1C, 0xEC, 0x6C, 0xAC, 0x2C, 0xCC, 0x4C, 0x8C, 0x0C, + 0xF4, 0x74, 0xB4, 0x34, 0xD4, 0x54, 0x94, 0x14, 0xE4, 0x64, 0xA4, 0x24, 0xC4, 0x44, 0x84, 0x04, + 0xF8, 0x78, 0xB8, 0x38, 0xD8, 0x58, 0x98, 0x18, 0xE8, 0x68, 0xA8, 0x28, 0xC8, 0x48, 0x88, 0x08, + 0xF0, 0x70, 0xB0, 0x30, 0xD0, 0x50, 0x90, 0x10, 0xE0, 0x60, 0xA0, 0x20, 0xC0, 0x40, 0x80, 0x00, +}; + +typedef struct { + int y, pl, x, vdup; +} State; + +static void put_lines_bits(AVCodecContext *avctx, int planes, int row_width, int pixel_size, State * state, uint8_t * row, AVFrame *p) +{ + int pl_byte = state->pl / 8; + int pl_bit = state->pl & 7; + for (int y = 0; y < state->vdup && (state->y + y) < avctx->height; y++) + for (int x = 0; x < row_width; x++) + for (int i = 7; i >= 0 && x * 8 + 7 - i < avctx->width; i--) + p->data[0][ (state->y + y) * p->linesize[0] + (x * 8 + 7 - i) * pixel_size + pl_byte] |= !!(row[x] & (1 << i)) << pl_bit; + + state->pl++; + if (state->pl >= planes) { + state->pl = 0; + state->y += state->vdup; + state->vdup = 1; + } +} + +static void put_lines_bytes(AVCodecContext *avctx, int planes, int row_width, int pixel_size, State * state, uint8_t * row, AVFrame *p) +{ + for (int y = 0; y < state->vdup && (state->y + y) < avctx->height; y++) + memcpy(p->data[0] + (state->y + y) * p->linesize[0], row, avctx->width * pixel_size); + + state->y += state->vdup; + state->vdup = 1; +} + +static int gem_decode_frame(AVCodecContext *avctx, + void *data, int *got_frame, + AVPacket *avpkt) +{ + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; + const uint8_t *buf_end = buf + buf_size; + AVFrame *p = data; + int header_size, planes, pattern_size, tag = 0, count_scalar = 1, ret; + unsigned int x, count, v; + GetByteContext gb; + uint32_t *palette; + const uint8_t * b; + uint8_t * row; + int row_width, pixel_size; + State state = {.y = 0, .pl = 0, .x = 0, .vdup = 1}; + void (*put_lines)(AVCodecContext *avctx, int planes, int row_width, int pixel_size, State * state, uint8_t * row, AVFrame *p); + + if (buf_size <= 16) + return AVERROR_INVALIDDATA; + + bytestream2_init(&gb, buf + 2, buf_size - 2); + header_size = bytestream2_get_be16(&gb); + if (header_size < 8 || buf_size <= header_size * 2) + return AVERROR_INVALIDDATA; + + planes = bytestream2_get_be16(&gb); + pattern_size = bytestream2_get_be16(&gb); + avctx->sample_aspect_ratio.num = bytestream2_get_be16(&gb); + avctx->sample_aspect_ratio.den = bytestream2_get_be16(&gb); + avctx->width = bytestream2_get_be16(&gb); + avctx->height = bytestream2_get_be16(&gb); + + row_width = (avctx->width + 7) / 8; + put_lines = put_lines_bits; + + if (header_size == 9) { + count_scalar = bytestream2_get_be16(&gb); + if (count_scalar != 3) { + avpriv_request_sample(avctx, "count_scalar=%d", count_scalar); + return AVERROR_PATCHWELCOME; + } + planes = 24; + avctx->pix_fmt = AV_PIX_FMT_BGR24; + pixel_size = 3; + } else if (planes == 15) { +#if HAVE_BIGENDIAN + avctx->pix_fmt = AV_PIX_FMT_BGR555BE; +#else + avctx->pix_fmt = AV_PIX_FMT_BGR555LE; +#endif + pixel_size = 2; + } else if (planes == 16) { + avctx->pix_fmt = AV_PIX_FMT_RGB565BE; + pixel_size = 2; + } else if (planes == 24) { + avctx->pix_fmt = AV_PIX_FMT_RGB24; + pixel_size = 3; + } else if (planes == 32) { + avctx->pix_fmt = AV_PIX_FMT_0RGB; + pixel_size = 4; + } else { + avctx->pix_fmt = AV_PIX_FMT_PAL8; + pixel_size = 1; + } + + if (header_size >= 11) + tag = bytestream2_peek_be32(&gb); + + if ((ret = ff_get_buffer(avctx, p, 0)) < 0) + return ret; + + p->pict_type = AV_PICTURE_TYPE_I; + p->key_frame = 1; + p->palette_has_changed = 1; + palette = (uint32_t *)p->data[1]; + + if (tag == AV_RB32("STTT")) { + bytestream2_skip(&gb, 6); + if (planes == 4) { + for (int i = 0; i < (1 << planes); i++) { + int v = bytestream2_get_be16(&gb); + int r = ((v >> 8) & 0x7) << 5; + int g = ((v >> 4) & 0x7) << 5; + int b = ((v ) & 0x7) << 5; + palette[i] = 0xFF000000 | r << 16 | g << 8 | b; + } + } else { + avpriv_request_sample(avctx, "STTT planes=%d", planes); + return AVERROR_PATCHWELCOME; + } + } else if (tag == AV_RB32("TIMG")) { + bytestream2_skip(&gb, 4); + if (planes != 15) { + avpriv_request_sample(avctx, "TIMG planes=%d", planes); + return AVERROR_PATCHWELCOME; + } + } else if (tag == AV_RB32("XIMG")) { + bytestream2_skip(&gb, 6); + if (planes == 1 || planes == 2 || planes == 4 || planes == 8) { + for (int i = 0; i < (1 << planes); i++) { + int r = (bytestream2_get_be16(&gb) * 51 + 100) / 200; + int g = (bytestream2_get_be16(&gb) * 51 + 100) / 200; + int b = (bytestream2_get_be16(&gb) * 51 + 100) / 200; + palette[i] = 0xFF000000 | r << 16 | g << 8 | b; + } + } else if (planes == 16) { + planes = 1; + row_width = ((avctx->width + 7)/8)*8 * pixel_size; + put_lines = put_lines_bytes; + } else if (planes == 24) { + planes = 1; + row_width = ((avctx->width + 15)/16)*16 * pixel_size; + put_lines = put_lines_bytes; + } else if (planes == 32) { + planes = 1; + row_width = avctx->width * pixel_size; + put_lines = put_lines_bytes; + } else { + avpriv_request_sample(avctx, "XIMG planes=%d", planes); + return AVERROR_PATCHWELCOME; + } + } else if (planes == 1) { + palette[0] = 0xFFFFFFFF; + palette[1] = 0xFF000000; + } else if (planes == 2 || planes == 3 || planes == 4) { + if (header_size == 9 + (1 << planes)) { + bytestream2_skip(&gb, 2); + for (int i = 0; i < (1 << planes); i++) { + int v = bytestream2_get_be16(&gb); + int r = ((v >> 8) & 0x7) << 5; + int g = ((v >> 4) & 0x7) << 5; + int b = ((v ) & 0x7) << 5; + palette[i] = 0xFF000000 | r << 16 | g << 8 | b; + } + } else + memcpy(palette, gem_color_palette, sizeof(gem_color_palette)); + } else if (planes == 8) { + for (int i = 0; i < 256; i++) + palette[i] = 0xFF000000 | (gem_gray[i]<<16) | (gem_gray[i]<<8) | gem_gray[i]; + } else if (planes == 16) { + planes = 1; + row_width = avctx->width * pixel_size; + put_lines = put_lines_bytes; + } else if (planes == 24) { + planes = 1; + row_width = avctx->width * pixel_size; + put_lines = put_lines_bytes; + } else { + avpriv_request_sample(avctx, "planes=%d", planes); + return AVERROR_PATCHWELCOME; + } + + ret = av_reallocp_array(&avctx->priv_data, planes, row_width); + if (ret < 0) + return ret; + row = avctx->priv_data; + + memset(p->data[0], 0, avctx->height * p->linesize[0]); + b = buf + header_size * 2; + x = 0; + +#define SKIP \ +do { \ + x++; \ + if (x >= row_width) { \ + put_lines(avctx, planes, row_width, pixel_size, &state, row + state.pl * row_width, p); \ + if (state.y >= avctx->height) goto abort; \ + x = 0; \ + } \ +} while(0) + +#define PUT(v) \ +do { \ + row[state.pl * row_width + x++] = v; \ + if (x >= row_width) { \ + put_lines(avctx, planes, row_width, pixel_size, &state, row + state.pl * row_width, p); \ + if (state.y >= avctx->height) goto abort; \ + x = 0; \ + } \ +} while(0) + + while(b < buf_end) { + int opcode = *b++; + if (opcode == 0x80) { /* copy */ + if (b >= buf_end) + goto abort; + count = *b++; + if (!count) + count = 256; + count *= count_scalar; + for (int j = 0; j < count; j++) { + if (b >= buf_end) + goto abort; + PUT(*b++); + } + } else if (opcode) { /* run */ + count = opcode & 0x7f; + if (!count) + count = 256; + count *= count_scalar; + v = opcode & 0x80 ? 0xFF : 0x00; + for (int i = 0; i < count; i++) + PUT(v); + } else { + if (b >= buf_end) + goto abort; + count = *b++; + if (count) { /* pattern */ + if (b > buf_end - pattern_size) + goto abort; + + count *= count_scalar; + for (int j = 0; j < count; j++) + for (int k = 0; k < pattern_size; k++) + PUT(b[k]); + + b += pattern_size; + } else { + if (b >= buf_end) + goto abort; + count = *b++; + if (count == 0xFF) { /* vertical duplication */ + if (b >= buf_end) + goto abort; + state.vdup = *b++; + if (!state.vdup) + state.vdup = 256; + } else { /* horizontal duplication */ + for (int i = 0; i < count + 1; i++) + SKIP; + } + } + } + } + +abort: + + *got_frame = 1; + return buf_size; +} + +static av_cold int gem_close(AVCodecContext *avctx) +{ + av_freep(&avctx->priv_data); + return 0; +} + +const AVCodec ff_gem_decoder = { + .name = "gem", + .long_name = NULL_IF_CONFIG_SMALL("GEM Raster image"), + .type = AVMEDIA_TYPE_VIDEO, + .id = AV_CODEC_ID_GEM, + .decode = gem_decode_frame, + .close = gem_close, + .capabilities = AV_CODEC_CAP_DR1, +}; From patchwork Fri Sep 17 08:39:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Ross X-Patchwork-Id: 30306 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp1995560iov; Fri, 17 Sep 2021 01:39:21 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwePgMjTCaNW8MnpCJ7kh66hOxLedDw9WN/aYA5lN88Ri/qm3hbDaPCDIXihkjd2WQMkSyG X-Received: by 2002:a05:6402:1ac5:: with SMTP id ba5mr11393777edb.20.1631867960993; Fri, 17 Sep 2021 01:39:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631867960; cv=none; d=google.com; s=arc-20160816; b=kvE5UO1HDv/Ax8y/V/WtPaBW5oG1snJPL0epJ6sTRr3RrsXko6AwPoE2Ouqto8W5+f 6eE1tAofKk7lK3XBOmbTBG+m6HQ1bM5R1m5N/BtsTgq4bvNyXCxnPvEsyfpz2GzEq9zy 5h8pnXeifBgPOxc6LNCw4rOmWylpFD/DtlZHg8QloLIqg7sThqXkkMClj5uf9aQREkti YT2Ao4Ho0xpocuaBL7ZHV5s3ozc4pXuutoM7iWJ/o05ERxmfVT7p3JDRiaEgBMU57rWM Rzxpqt+dzzM1hkxut9uY65AKr9JmFjjcI7bxzrjOVmwSBOWc+PSLdo2zXg26o/yx+vUi 3dew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject :in-reply-to:mime-version:references:message-id:to:from:date :delivered-to; bh=1xAYGFQn8n/tHlJS5/SW+kR0xVEZAA1707mi3Nj98Qc=; b=VnDTBo3qM5ZRk4zAp6TL0LWvhcl5a0LMg7aJaVkwvls9y5/BCfdo+fVWACJ1L5D7vK WSXj4xDnnwbX0jINiVMT8YkG84UlAOEuM5CUsHaDeUH3kGk0Z0TBqRQGPJzS44/wtphp X9mMaed96ctB2N26H6ZSuwFPU4o7HNkzb/pr4un7S3w7CmWNqujo/CjuVzR5VscYyzlG F4Iw5sfBEKrh4CqjO5YrrUy894lGBZuzsIUxrmTpuzbKqaBQZ8iAoqVkQ9hzcwqLEd/u QGvWsoPjVEmzH2ScwdoRYaybw3mug84CLvJ0Ui8iFwql2mllSyJJjhL9rgHUqbZoNDU1 wIFQ== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id s11si6107391ejm.723.2021.09.17.01.39.20; Fri, 17 Sep 2021 01:39:20 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 39AB868B07E; Fri, 17 Sep 2021 11:39:18 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mx.sdf.org (mx.sdf.org [205.166.94.24]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 170C768B059 for ; Fri, 17 Sep 2021 11:39:10 +0300 (EEST) Received: from 674e79c5e9aea4f86171aa0329543d63 ([1.145.161.12]) (authenticated (128 bits)) by mx.sdf.org (8.15.2/8.14.5) with ESMTPSA id 18H8d4s1006837 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits) verified NO) for ; Fri, 17 Sep 2021 08:39:08 GMT Date: Fri, 17 Sep 2021 18:39:01 +1000 From: Peter Ross To: ffmpeg-devel@ffmpeg.org Message-ID: <54d14822e998e9f1ac99e919fe223433d3c509e2.1631867851.git.pross@xvid.org> References: <755fd91b4ae6c9327668f339acfc67fcdd02c0bd.1631867851.git.pross@xvid.org> MIME-Version: 1.0 In-Reply-To: <755fd91b4ae6c9327668f339acfc67fcdd02c0bd.1631867851.git.pross@xvid.org> Subject: [FFmpeg-devel] [PATCH 2/2] avformat/img2dec: add GEM Raster image demuxer X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: G/LiSPoIbYsW --- libavformat/allformats.c | 1 + libavformat/img2.c | 3 +++ libavformat/img2dec.c | 22 ++++++++++++++++++++++ 3 files changed, 26 insertions(+) diff --git a/libavformat/allformats.c b/libavformat/allformats.c index 5471f7c16f..99d8c91e00 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -499,6 +499,7 @@ extern const AVInputFormat ff_image_cri_pipe_demuxer; extern const AVInputFormat ff_image_dds_pipe_demuxer; extern const AVInputFormat ff_image_dpx_pipe_demuxer; extern const AVInputFormat ff_image_exr_pipe_demuxer; +extern const AVInputFormat ff_image_gem_pipe_demuxer; extern const AVInputFormat ff_image_gif_pipe_demuxer; extern const AVInputFormat ff_image_j2k_pipe_demuxer; extern const AVInputFormat ff_image_jpeg_pipe_demuxer; diff --git a/libavformat/img2.c b/libavformat/img2.c index 6bdd7efe26..4153102c92 100644 --- a/libavformat/img2.c +++ b/libavformat/img2.c @@ -84,6 +84,9 @@ const IdStrMap ff_img_tags[] = { { AV_CODEC_ID_XPM, "xpm" }, { AV_CODEC_ID_XFACE, "xface" }, { AV_CODEC_ID_XWD, "xwd" }, + { AV_CODEC_ID_GEM, "img" }, + { AV_CODEC_ID_GEM, "ximg" }, + { AV_CODEC_ID_GEM, "timg" }, { AV_CODEC_ID_NONE, NULL } }; diff --git a/libavformat/img2dec.c b/libavformat/img2dec.c index 485444ed31..acfd5910de 100644 --- a/libavformat/img2dec.c +++ b/libavformat/img2dec.c @@ -1105,6 +1105,27 @@ static int photocd_probe(const AVProbeData *p) return AVPROBE_SCORE_MAX - 1; } +static int gem_probe(const AVProbeData *p) +{ + const uint8_t *b = p->buf; + int ret = 0; + if ( AV_RB16(b ) >= 1 && AV_RB16(b ) <= 3 && + AV_RB16(b + 2) >= 8 && AV_RB16(b + 2) <= 779 && + (AV_RB16(b + 4) > 0 || AV_RB16(b + 4) <= 8) && + (AV_RB16(b + 6) > 0 || AV_RB16(b + 6) <= 8) && + AV_RB16(b + 8) && + AV_RB16(b + 10) && + AV_RB16(b + 12) && + AV_RB16(b + 14)) { + ret = AVPROBE_SCORE_EXTENSION / 4; + if (AV_RN32(b + 16) == AV_RN32("STTT") || + AV_RN32(b + 16) == AV_RN32("TIMG") || + AV_RN32(b + 16) == AV_RN32("XIMG")) + ret += 1; + } + return ret; +} + #define IMAGEAUTO_DEMUXER(imgname, codecid)\ const AVInputFormat ff_image_ ## imgname ## _pipe_demuxer = {\ .name = AV_STRINGIFY(imgname) "_pipe",\ @@ -1123,6 +1144,7 @@ IMAGEAUTO_DEMUXER(cri, AV_CODEC_ID_CRI) IMAGEAUTO_DEMUXER(dds, AV_CODEC_ID_DDS) IMAGEAUTO_DEMUXER(dpx, AV_CODEC_ID_DPX) IMAGEAUTO_DEMUXER(exr, AV_CODEC_ID_EXR) +IMAGEAUTO_DEMUXER(gem, AV_CODEC_ID_GEM) IMAGEAUTO_DEMUXER(gif, AV_CODEC_ID_GIF) IMAGEAUTO_DEMUXER(j2k, AV_CODEC_ID_JPEG2000) IMAGEAUTO_DEMUXER(jpeg, AV_CODEC_ID_MJPEG)