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)