From patchwork Fri Aug 24 20:06:52 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 10124 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:12c4:0:0:0:0:0 with SMTP id 65-v6csp3764785jap; Fri, 24 Aug 2018 13:07:18 -0700 (PDT) X-Google-Smtp-Source: ANB0Vda8UY35V3+b7unP1OUtnJKkQTYd7q9fYCdAenNmFNEQAV/bL0pHmmPBYL6YeV82OjmWSH6E X-Received: by 2002:a1c:dc8b:: with SMTP id t133-v6mr2239261wmg.108.1535141238025; Fri, 24 Aug 2018 13:07:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1535141237; cv=none; d=google.com; s=arc-20160816; b=D2PlrLnmnlfohd4YytCifkNwtqa/TFbuXhxC4o1njaLfdDc2M2RQVyU+4YkIIYpQvE EV/YMM8z5cRpgeyj1vCK7hLAhJ563jq3NXD5tJzYnsbWDgI1yXR2ix0+LB2yWqSliAsV 2Dd97W1ORUdY2yrPjF+9fPHIwTi2jqt0JGe1wbUXK4s7DU4PTNoY3fOU6/7vTZfi9Lj8 75I6w3n0xu0NgjX45dHMNU9Q09H6dBEhcN5h7MMhtnT15NY/gh9SKjHhav7PAWDUZQgG Decv5gPKjP1U/rmLsgQct5fVlbWkvVBY/XtDiSbrx6waK1oO6T7RxXd/SE7Zv8j14sSZ hPzQ== 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:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=LA5utLnToCKeKs1FJ2R0e5oyqquGuI01LlA8ZG3Sl7A=; b=N4jCWw5GHmNgDBlkj1bPYoM0AAj8Cqy7fOBdGUFhO4mARjb6yZLNHCySbcj/+IOtxx 9ECp5FUrfQHRXkGnBk4cwnFJEnMidX6Tv+VeNW6AWOfQbc9+Zp6oRMKU2FKxJ/Kl7FTd 0TVaPesqaE+TNuWTIXsjH2QhbnzMWH0v1Hutd9/bWgntwE+KVBAO0tr22S1NSH4Fu2Ft h9oAqCaBiuEGs+IHkd8yx5845kLq/JgL4FrJ/WOVzs2CrMDsjCb5NJroyklqeKmafFe+ Otq8GxAd8sLxE9EaSNeTmyvhtOWe2lkX0xKJUrmeqncT7Wd+XEJhY5sYO39BgRTX5xRk Y1nw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=od2J4WTn; 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 m1-v6si1706179wmb.20.2018.08.24.13.07.17; Fri, 24 Aug 2018 13:07:17 -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=od2J4WTn; 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 C1728689EE2; Fri, 24 Aug 2018 23:07:13 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f68.google.com (mail-wm0-f68.google.com [74.125.82.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0FB66689D4B for ; Fri, 24 Aug 2018 23:07:07 +0300 (EEST) Received: by mail-wm0-f68.google.com with SMTP id 207-v6so2725068wme.5 for ; Fri, 24 Aug 2018 13:07:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=HiW2rvpOL1bQTXLsLrYWB/kPFEi6+XUSNGNiGrNfAS8=; b=od2J4WTn2xGmO6NprxElJGwZW159vEsL48aR3p6kEiMo2cn1RX7ns86GAZRG4SwKj6 RqhECbmrKMR023i92atZRwoveQFfRJPZQXtTkEjVL2F+Wza232T6oIUU77ki4KayLOzS 9H8Dy595ukPgbNvtw0txxGaFev1pU0s/5+CQGH33NkBxNCpof0DcKylgFAcSYGvLFDF8 Ta01gBnGzvoYT8xdENuPK6hzm+7WHrsL4awE+EY16CoAW9E4+71+88WtVaCefBq5PNj/ qUUNSCVEgNuWtHyxN7wcLKabz8PntwjeKc9JgxsQdfpZTdwV4CWoREg1WgUAHL8KKqKK Y/dQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=HiW2rvpOL1bQTXLsLrYWB/kPFEi6+XUSNGNiGrNfAS8=; b=K2Pr5PZXbP+eSyxq8xG4uMoDyDE6b9dD12YFCIpEI+gI9nw69ZJC4EgCAUWgk/EQaT 8dU1hmeh7BTVsVFq0Uzm0rsb0ZMQ2seEk0SjvgccjVn5gtt6sVoUXcOIYUnEYYAS0V5D CX0oUlzzVehaKVYh+mVVbrqwhWeFFRpPvcVZ5IbbLw17LNYbQ9mcqRFJRRyIWGGwWw6k Qfk+hwysV0yTJyebdW6nIYu+4cHZTBV1FZFBdyXYDdBMmFktHYmxxZMcSIKkqWnF84Bu 4HgSySrIm1SJ1t32q/GMFFtPK7mjwzaPqsJB6vyPQ+fJUTysKmoKtf23J5TwOAUwqown 52lg== X-Gm-Message-State: APzg51D4LIneAXDsHTwju0JViWXecjnyjwU5WR4dsoCwedF6+yE1mlEe 8mxIgxz5nMmUYnHc/pCMb4rBkwAR X-Received: by 2002:a1c:5e08:: with SMTP id s8-v6mr2437621wmb.88.1535141228379; Fri, 24 Aug 2018 13:07:08 -0700 (PDT) Received: from localhost.localdomain ([94.250.174.60]) by smtp.gmail.com with ESMTPSA id l16-v6sm1528577wmc.38.2018.08.24.13.07.07 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 24 Aug 2018 13:07:07 -0700 (PDT) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Fri, 24 Aug 2018 22:06:52 +0200 Message-Id: <20180824200652.19481-1-onemda@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180824184815.22395-1-onemda@gmail.com> References: <20180824184815.22395-1-onemda@gmail.com> Subject: [FFmpeg-devel] [PATCH] avcodec: add MatchWare Screen Capture Codec 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Paul B Mahol --- configure | 1 + libavcodec/Makefile | 1 + libavcodec/allcodecs.c | 1 + libavcodec/avcodec.h | 1 + libavcodec/codec_desc.c | 7 ++ libavcodec/mwsc.c | 182 ++++++++++++++++++++++++++++++++++++++++ libavformat/riff.c | 1 + 7 files changed, 194 insertions(+) create mode 100644 libavcodec/mwsc.c diff --git a/configure b/configure index b9c9d0b307..0c1f6a79a7 100755 --- a/configure +++ b/configure @@ -2679,6 +2679,7 @@ msmpeg4v3_decoder_select="h263_decoder" msmpeg4v3_encoder_select="h263_encoder" mss2_decoder_select="mpegvideo qpeldsp vc1_decoder" mts2_decoder_select="mss34dsp" +mwsc_decoder_deps="zlib" mxpeg_decoder_select="mjpeg_decoder" nellymoser_decoder_select="mdct sinewin" nellymoser_encoder_select="audio_frame_queue mdct sinewin" diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 9a309c348e..aee4f5431a 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -482,6 +482,7 @@ OBJS-$(CONFIG_MSZH_DECODER) += lcldec.o OBJS-$(CONFIG_MTS2_DECODER) += mss4.o OBJS-$(CONFIG_MVC1_DECODER) += mvcdec.o OBJS-$(CONFIG_MVC2_DECODER) += mvcdec.o +OBJS-$(CONFIG_MWSC_DECODER) += mwsc.o OBJS-$(CONFIG_MXPEG_DECODER) += mxpegdec.o OBJS-$(CONFIG_NELLYMOSER_DECODER) += nellymoserdec.o nellymoser.o OBJS-$(CONFIG_NELLYMOSER_ENCODER) += nellymoserenc.o nellymoser.o diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index b1d1ef26c0..d41868c591 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -212,6 +212,7 @@ extern AVCodec ff_mszh_decoder; extern AVCodec ff_mts2_decoder; extern AVCodec ff_mvc1_decoder; extern AVCodec ff_mvc2_decoder; +extern AVCodec ff_mwsc_decoder; extern AVCodec ff_mxpeg_decoder; extern AVCodec ff_nuv_decoder; extern AVCodec ff_paf_video_decoder; diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 2a4be2ca4f..b327284449 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -449,6 +449,7 @@ enum AVCodecID { AV_CODEC_ID_FITS, AV_CODEC_ID_IMM4, AV_CODEC_ID_PROSUMER, + AV_CODEC_ID_MWSC, /* various PCM "codecs" */ AV_CODEC_ID_FIRST_AUDIO = 0x10000, ///< A dummy id pointing at the start of audio codecs diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c index e611183599..129d0f1aac 100644 --- a/libavcodec/codec_desc.c +++ b/libavcodec/codec_desc.c @@ -1668,6 +1668,13 @@ static const AVCodecDescriptor codec_descriptors[] = { .long_name = NULL_IF_CONFIG_SMALL("Brooktree ProSumer Video"), .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY, }, + { + .id = AV_CODEC_ID_MWSC, + .type = AVMEDIA_TYPE_VIDEO, + .name = "mwsc", + .long_name = NULL_IF_CONFIG_SMALL("MatchWare Screen Capture Codec"), + .props = AV_CODEC_PROP_LOSSLESS, + }, /* various PCM "codecs" */ { diff --git a/libavcodec/mwsc.c b/libavcodec/mwsc.c new file mode 100644 index 0000000000..632d1cc30c --- /dev/null +++ b/libavcodec/mwsc.c @@ -0,0 +1,182 @@ +/* + * MatchWare Screen Capture Codec decoder + * + * Copyright (c) 2018 Paul B Mahol + * + * 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 +#include +#include + +#include "avcodec.h" +#include "bytestream.h" +#include "internal.h" + +#include + +typedef struct MWSCContext { + unsigned bpp; + unsigned int decomp_size; + uint8_t *decomp_buf; + unsigned int uncomp_size; + uint8_t *uncomp_buf; + z_stream zstream; +} MWSCContext; + +static int rle_uncompress(AVCodecContext *avctx, GetByteContext *gb, PutByteContext *pb, int bpp) +{ + int intra = 1; + + while (bytestream2_get_bytes_left(gb) > 0) { + uint32_t fill = bytestream2_get_le24(gb); + unsigned run = bytestream2_get_byte(gb); + int j; + + if (run == 0) { + run = bytestream2_get_le32(gb); + for (j = 0; j < run; j++) { + bytestream2_put_le24(pb, fill); + } + } else if (run == 255) { + bytestream2_skip_p(pb, fill * 3); + intra = 0; + } else { + for (j = 0; j < run; j++) { + bytestream2_put_le24(pb, fill); + } + } + } + + return intra; +} + +static int decode_frame(AVCodecContext *avctx, + void *data, int *got_frame, + AVPacket *avpkt) +{ + MWSCContext *s = avctx->priv_data; + AVFrame *frame = data; + uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; + GetByteContext gb; + PutByteContext pb; + int ret, j; + + ret = inflateReset(&s->zstream); + if (ret != Z_OK) { + av_log(avctx, AV_LOG_ERROR, "Inflate reset error: %d\n", ret); + return AVERROR_EXTERNAL; + } + s->zstream.next_in = buf; + s->zstream.avail_in = buf_size; + s->zstream.next_out = s->decomp_buf; + s->zstream.avail_out = s->decomp_size; + ret = inflate(&s->zstream, Z_FINISH); + if (ret != Z_STREAM_END) { + av_log(avctx, AV_LOG_ERROR, "Inflate error: %d\n", ret); + return AVERROR_EXTERNAL; + } + + bytestream2_init(&gb, s->decomp_buf, s->zstream.total_out); + bytestream2_init_writer(&pb, s->uncomp_buf, s->uncomp_size); + + frame->key_frame = rle_uncompress(avctx, &gb, &pb, s->bpp); + + if ((ret = ff_reget_buffer(avctx, frame)) < 0) + return ret; + + for (j = 0; j < avctx->height; j++) { + memcpy(frame->data[0] + (avctx->height - j - 1) * frame->linesize[0], + s->uncomp_buf + s->bpp * j * avctx->width, s->bpp * avctx->width); + } + + frame->pict_type = frame->key_frame ? AV_PICTURE_TYPE_I : AV_PICTURE_TYPE_P; + + *got_frame = 1; + + return avpkt->size; +} + +static av_cold int decode_init(AVCodecContext *avctx) +{ + MWSCContext *s = avctx->priv_data; + int64_t size; + int zret; + + switch (avctx->bits_per_coded_sample) { + case 24: avctx->pix_fmt = AV_PIX_FMT_BGR24; break; + default: + av_log(avctx, AV_LOG_ERROR, "Unsupported bitdepth %d\n", avctx->bits_per_coded_sample); + return AVERROR_INVALIDDATA; + } + + s->bpp = avctx->bits_per_coded_sample >> 3; + + size = 8LL * avctx->height * ((avctx->width * avctx->bits_per_coded_sample + 31) / 32); + if (size >= INT32_MAX) + return AVERROR_INVALIDDATA; + s->decomp_size = size; + if (!(s->decomp_buf = av_malloc(s->decomp_size))) + return AVERROR(ENOMEM); + + size = 4LL * avctx->height * ((avctx->width * avctx->bits_per_coded_sample + 31) / 32); + if (size >= INT32_MAX) + return AVERROR_INVALIDDATA; + s->uncomp_size = size; + if (!(s->uncomp_buf = av_malloc(s->uncomp_size))) + return AVERROR(ENOMEM); + + s->zstream.zalloc = Z_NULL; + s->zstream.zfree = Z_NULL; + s->zstream.opaque = Z_NULL; + zret = inflateInit(&s->zstream); + if (zret != Z_OK) { + av_log(avctx, AV_LOG_ERROR, "Inflate init error: %d\n", zret); + return AVERROR_EXTERNAL; + } + + return 0; +} + +static av_cold int decode_close(AVCodecContext *avctx) +{ + MWSCContext *s = avctx->priv_data; + + av_freep(&s->decomp_buf); + s->decomp_size = 0; + av_freep(&s->uncomp_buf); + s->uncomp_size = 0; + inflateEnd(&s->zstream); + + return 0; +} + +AVCodec ff_mwsc_decoder = { + .name = "mwsc", + .long_name = NULL_IF_CONFIG_SMALL("MatchWare Screen Capture Codec"), + .type = AVMEDIA_TYPE_VIDEO, + .id = AV_CODEC_ID_MWSC, + .priv_data_size = sizeof(MWSCContext), + .init = decode_init, + .close = decode_close, + .decode = decode_frame, + .capabilities = AV_CODEC_CAP_DR1, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | + FF_CODEC_CAP_INIT_CLEANUP, +}; diff --git a/libavformat/riff.c b/libavformat/riff.c index cf27d0dfd5..aef3c047ac 100644 --- a/libavformat/riff.c +++ b/libavformat/riff.c @@ -472,6 +472,7 @@ const AVCodecTag ff_codec_bmp_tags[] = { { AV_CODEC_ID_SRGC, MKTAG('S', 'R', 'G', 'C') }, { AV_CODEC_ID_IMM4, MKTAG('I', 'M', 'M', '4') }, { AV_CODEC_ID_PROSUMER, MKTAG('B', 'T', '2', '0') }, + { AV_CODEC_ID_MWSC, MKTAG('M', 'W', 'S', 'C') }, { AV_CODEC_ID_NONE, 0 } };