From patchwork Fri Oct 23 00:53:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Ross X-Patchwork-Id: 23166 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 2FDB844AFFC for ; Fri, 23 Oct 2020 03:53:21 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1784F68A26E; Fri, 23 Oct 2020 03:53:21 +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 70ABE68A1F0 for ; Fri, 23 Oct 2020 03:53:14 +0300 (EEST) Received: from 642f3d44731ee2ffcc5d001b69ff9ae9 ([1.152.138.94]) (authenticated (128 bits)) by mx.sdf.org (8.15.2/8.14.5) with ESMTPSA id 09N0r7u6004907 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits) verified NO) for ; Fri, 23 Oct 2020 00:53:12 GMT Date: Fri, 23 Oct 2020 11:53:03 +1100 From: Peter Ross To: ffmpeg-devel@ffmpeg.org Message-ID: <084bb0162355237aba95905e1d1806b38cba00aa.1603414347.git.pross@xvid.org> References: <85335241f8913ff084c065dd678eca591314d7f9.1603414347.git.pross@xvid.org> MIME-Version: 1.0 In-Reply-To: <85335241f8913ff084c065dd678eca591314d7f9.1603414347.git.pross@xvid.org> Subject: [FFmpeg-devel] [PATCHv2 2/2] avformat/mspdec: Microsoft Paint (MSP) 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Peter Ross --- Changelog | 1 + doc/general_contents.texi | 2 + libavformat/Makefile | 1 + libavformat/allformats.c | 1 + libavformat/mspdec.c | 117 ++++++++++++++++++++++++++++++++++++++ 5 files changed, 122 insertions(+) create mode 100644 libavformat/mspdec.c diff --git a/Changelog b/Changelog index ff2db9e083..a34c1cf7a4 100644 --- a/Changelog +++ b/Changelog @@ -38,6 +38,7 @@ version : - VDPAU accelerated VP9 10/12bit decoding - afreqshift and aphaseshift filters - Microsoft Paint (MSP) version 2 decoder +- Microsoft Paint (MSP) demuxer version 4.3: diff --git a/doc/general_contents.texi b/doc/general_contents.texi index f441a75ee9..db9486ac8c 100644 --- a/doc/general_contents.texi +++ b/doc/general_contents.texi @@ -735,6 +735,8 @@ following image formats are supported: @item JPEG-LS @tab X @tab X @item LJPEG @tab X @tab @tab Lossless JPEG +@item MSP @tab @tab X + @tab Microsoft Paint image @item PAM @tab X @tab X @tab PAM is a PNM extension with alpha support. @item PBM @tab X @tab X diff --git a/libavformat/Makefile b/libavformat/Makefile index a5e8bddb87..4956a4ee22 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -355,6 +355,7 @@ OBJS-$(CONFIG_MPL2_DEMUXER) += mpl2dec.o subtitles.o OBJS-$(CONFIG_MSF_DEMUXER) += msf.o OBJS-$(CONFIG_MPSUB_DEMUXER) += mpsubdec.o subtitles.o OBJS-$(CONFIG_MSNWC_TCP_DEMUXER) += msnwc_tcp.o +OBJS-$(CONFIG_MSP_DEMUXER) += mspdec.o rawdec.o OBJS-$(CONFIG_MTAF_DEMUXER) += mtaf.o OBJS-$(CONFIG_MTV_DEMUXER) += mtv.o OBJS-$(CONFIG_MUSX_DEMUXER) += musx.o diff --git a/libavformat/allformats.c b/libavformat/allformats.c index 96b9bc2a0c..4b95540dc6 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -284,6 +284,7 @@ extern AVInputFormat ff_mpl2_demuxer; extern AVInputFormat ff_mpsub_demuxer; extern AVInputFormat ff_msf_demuxer; extern AVInputFormat ff_msnwc_tcp_demuxer; +extern AVInputFormat ff_msp_demuxer; extern AVInputFormat ff_mtaf_demuxer; extern AVInputFormat ff_mtv_demuxer; extern AVInputFormat ff_musx_demuxer; diff --git a/libavformat/mspdec.c b/libavformat/mspdec.c new file mode 100644 index 0000000000..4de24d3c80 --- /dev/null +++ b/libavformat/mspdec.c @@ -0,0 +1,117 @@ +/* + * Microsoft Paint (MSP) demuxer + * Copyright (c) 2020 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 + * Microsoft Paint (MSP) demuxer + */ + +#include "libavutil/intreadwrite.h" +#include "libavutil/imgutils.h" +#include "avformat.h" +#include "internal.h" +#include "rawdec.h" + +typedef struct { + int packet_size; +} MSPContext; + +static int msp_probe(const AVProbeData *p) +{ + unsigned int i, sum; + + if (p->buf_size <= 32 || (memcmp(p->buf, "DanM", 4) && memcmp(p->buf, "LinS", 4))) + return 0; + + sum = 0; + for (i = 0; i < 24; i += 2) + sum ^= AV_RL16(p->buf + i); + + return AV_RL16(p->buf + 24) == sum ? AVPROBE_SCORE_MAX : 0; +} + +static int msp_read_header(AVFormatContext *s) +{ + MSPContext * cntx = s->priv_data; + AVIOContext *pb = s->pb; + AVStream *st; + + st = avformat_new_stream(s, NULL); + if (!st) + return AVERROR(ENOMEM); + + st->codecpar->codec_type = AVMEDIA_TYPE_VIDEO; + st->codecpar->codec_id = avio_rl32(pb) == MKTAG('D', 'a', 'n', 'M') ? AV_CODEC_ID_RAWVIDEO : AV_CODEC_ID_MSP2; + + st->codecpar->width = avio_rl16(pb); + st->codecpar->height = avio_rl16(pb); + st->codecpar->format = AV_PIX_FMT_MONOBLACK; + + st->sample_aspect_ratio.num = avio_rl16(pb); + st->sample_aspect_ratio.den = avio_rl16(pb); + avio_skip(pb, 20); + + if (st->codecpar->codec_id == AV_CODEC_ID_RAWVIDEO) { + cntx->packet_size = av_image_get_buffer_size(st->codecpar->format, st->codecpar->width, st->codecpar->height, 1); + if (cntx->packet_size < 0) + return cntx->packet_size; + } else + cntx->packet_size = 2 * st->codecpar->height; + + return 0; +} + +static int msp_read_packet(AVFormatContext *s, AVPacket *pkt) +{ + AVStream *st = s->streams[0]; + MSPContext *cntx = s->priv_data; + int ret; + + ret = av_get_packet(s->pb, pkt, cntx->packet_size); + if (ret < 0) + return ret; + + if (st->codecpar->codec_id == AV_CODEC_ID_MSP2) { + unsigned int size, i; + if (pkt->size != 2 * st->codecpar->height) + return AVERROR_INVALIDDATA; + size = 0; + for (i = 0; i < st->codecpar->height; i++) + size += AV_RL16(&pkt->data[i * 2]); + ret = av_append_packet(s->pb, pkt, size); + if (ret < 0) + return ret; + } + + pkt->stream_index = 0; + pkt->flags |= AV_PKT_FLAG_KEY; + return 0; +} + +AVInputFormat ff_msp_demuxer = { + .name = "msp", + .long_name = NULL_IF_CONFIG_SMALL("Microsoft Paint (MSP))"), + .read_probe = msp_probe, + .read_header = msp_read_header, + .read_packet = msp_read_packet, + .flags = AVFMT_NOTIMESTAMPS, + .priv_data_size = sizeof(FFRawDemuxerContext), +};