From patchwork Sun Apr 16 16:48:04 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 3431 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.3.129 with SMTP id 123csp972171vsd; Sun, 16 Apr 2017 09:48:38 -0700 (PDT) X-Received: by 10.223.163.80 with SMTP id d16mr14517594wrb.133.1492361318069; Sun, 16 Apr 2017 09:48:38 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id h13si12445876wrc.165.2017.04.16.09.48.37; Sun, 16 Apr 2017 09:48:38 -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; 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=NONE 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 0BE01689943; Sun, 16 Apr 2017 19:48:27 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f50.google.com (mail-wm0-f50.google.com [74.125.82.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 52E3D6891E2 for ; Sun, 16 Apr 2017 19:48:20 +0300 (EEST) Received: by mail-wm0-f50.google.com with SMTP id w64so21766370wma.0 for ; Sun, 16 Apr 2017 09:48:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=h+wafFI7iwJDyQJ16VV3C0pIwW6JzyYm7/Yc/spKTF0=; b=j8sD23F1Eh2ZCj1KweAFha8wHppYedP2/oRb0CiAz6FNvaKCPMPRDOaX0T3b/MV224 VlGyhcqaDfdocxbWN0DLWnVjzQkvTU2rHUsyaienFNCfAJNl6zRWo16kfq9792OqXPF4 kM0rkvlsn17dR7ru20/4Hp3RviXKp5/JYgLhNnybU6rYlYEDAFVHBSDVCfKSGFilSoXR QO03jam4prAKIisjE+2rqKGVnc0GhnywgQ9ephOPeiagGtxmq4NqrHj7w6fV1RsUWshy BQZjBsWNOjVCAd85oJvsln5oSEQHS71j97Ye+jmJgb8BW8Nb1W3tC8WNryPsoaB3dtJW 8Xww== 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; bh=h+wafFI7iwJDyQJ16VV3C0pIwW6JzyYm7/Yc/spKTF0=; b=TA+byC554REcvkw6TRxbDPBocGrOGQS0Zb2m0HW8xokTTLMR5QGLM1vCJkDytYeKvD yRc+/X+dpt0Nm0gpMm6OzbgCOi5LYw4e0bTM0aAK3zObjULnsOFKsTHEj0z3uBrew32b Aee2sTZCqawVB6FylVsQJsZDrSP/U37oisWiQ2FJBp1aKpZgrtEpY6a4rUmf2Kg2Wsvn L/XZBxDEu+Qmt44z39Yb2JpPAIF60V3pYddoSp7cldMI8AuAL8WMr8sQI60c94qjJTUv Oai5aU+aG/m935adl2ZQgKMxRjrFuFc29/xjlgi9fL7mHEWTjKq6BOw3biWe7vyzmg9/ 57/A== X-Gm-Message-State: AN3rC/7vp6aIOD56JLcTGnOFFAbkyIs2ZBMzabftqe1KX7ONbvDNbPqO 9wjEozPGNYc3LRR3 X-Received: by 10.28.199.198 with SMTP id x189mr6074745wmf.95.1492361306926; Sun, 16 Apr 2017 09:48:26 -0700 (PDT) Received: from localhost.localdomain ([94.250.174.60]) by smtp.gmail.com with ESMTPSA id d23sm4983105wra.6.2017.04.16.09.48.24 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 16 Apr 2017 09:48:25 -0700 (PDT) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Sun, 16 Apr 2017 18:48:04 +0200 Message-Id: <20170416164805.15765-1-onemda@gmail.com> X-Mailer: git-send-email 2.9.3 Subject: [FFmpeg-devel] [PATCH 1/2] avcodec: add Mandsoft Screen Capture Codec 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Paul B Mahol --- configure | 1 + doc/general.texi | 1 + libavcodec/Makefile | 1 + libavcodec/allcodecs.c | 1 + libavcodec/avcodec.h | 1 + libavcodec/codec_desc.c | 7 ++ libavcodec/mscc.c | 231 ++++++++++++++++++++++++++++++++++++++++++++++++ libavformat/riff.c | 1 + 8 files changed, 244 insertions(+) create mode 100644 libavcodec/mscc.c diff --git a/configure b/configure index e6fe05a..6d4eb2b 100755 --- a/configure +++ b/configure @@ -2488,6 +2488,7 @@ mpeg2video_encoder_select="aandcttables mpegvideoenc h263dsp" mpeg4_decoder_select="h263_decoder mpeg4video_parser" mpeg4_encoder_select="h263_encoder" msa1_decoder_select="mss34dsp" +mscc_decoder_select="zlib" msmpeg4v1_decoder_select="h263_decoder" msmpeg4v2_decoder_select="h263_decoder" msmpeg4v2_encoder_select="h263_encoder" diff --git a/doc/general.texi b/doc/general.texi index a02437b..72f02b1 100644 --- a/doc/general.texi +++ b/doc/general.texi @@ -789,6 +789,7 @@ following image formats are supported: @tab Used in LucasArts games / SMUSH animations. @item lossless MJPEG @tab X @tab X @item MagicYUV Video @tab @tab X +@item Mandsoft Screen Capture Codec @tab @tab X @item Microsoft ATC Screen @tab @tab X @tab Also known as Microsoft Screen 3. @item Microsoft Expression Encoder Screen @tab @tab X diff --git a/libavcodec/Makefile b/libavcodec/Makefile index c745454..cf5317d 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -429,6 +429,7 @@ OBJS-$(CONFIG_MPEG4_MEDIACODEC_DECODER) += mediacodecdec.o OBJS-$(CONFIG_MPEG4_OMX_ENCODER) += omx.o OBJS-$(CONFIG_MPL2_DECODER) += mpl2dec.o ass.o OBJS-$(CONFIG_MSA1_DECODER) += mss3.o +OBJS-$(CONFIG_MSCC_DECODER) += mscc.o OBJS-$(CONFIG_MSMPEG4V1_DECODER) += msmpeg4dec.o msmpeg4.o msmpeg4data.o OBJS-$(CONFIG_MSMPEG4V2_DECODER) += msmpeg4dec.o msmpeg4.o msmpeg4data.o OBJS-$(CONFIG_MSMPEG4V2_ENCODER) += msmpeg4enc.o msmpeg4.o msmpeg4data.o diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index 379bd6e..5a708b3 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -258,6 +258,7 @@ static void register_all(void) REGISTER_DECODER(MPEG2_CRYSTALHD, mpeg2_crystalhd); REGISTER_DECODER(MPEG2_QSV, mpeg2_qsv); REGISTER_DECODER(MSA1, msa1); + REGISTER_DECODER(MSCC, mscc); REGISTER_DECODER(MSMPEG4V1, msmpeg4v1); REGISTER_ENCDEC (MSMPEG4V2, msmpeg4v2); REGISTER_ENCDEC (MSMPEG4V3, msmpeg4v3); diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index ee13371..da9d9dc 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -443,6 +443,7 @@ enum AVCodecID { AV_CODEC_ID_XPM, AV_CODEC_ID_AV1, AV_CODEC_ID_BITPACKED, + AV_CODEC_ID_MSCC, /* 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 7b2a1b9..e342db7 100644 --- a/libavcodec/codec_desc.c +++ b/libavcodec/codec_desc.c @@ -1388,6 +1388,13 @@ static const AVCodecDescriptor codec_descriptors[] = { .long_name = NULL_IF_CONFIG_SMALL("Bitpacked"), .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS, }, + { + .id = AV_CODEC_ID_MSCC, + .type = AVMEDIA_TYPE_VIDEO, + .name = "mscc", + .long_name = NULL_IF_CONFIG_SMALL("Mandsoft Screen Capture Codec"), + .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS, + }, /* image codecs */ { diff --git a/libavcodec/mscc.c b/libavcodec/mscc.c new file mode 100644 index 0000000..c42889a --- /dev/null +++ b/libavcodec/mscc.c @@ -0,0 +1,231 @@ +/* + * Mandsoft Screen Capture Codec decoder + * + * Copyright (c) 2017 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 MSCCContext { + unsigned bpp; + unsigned int decomp_size; + uint8_t *decomp_buf; + unsigned int uncomp_size; + uint8_t *uncomp_buf; + z_stream zstream; +} MSCCContext; + +static int rle_uncompress(AVCodecContext *avctx, GetByteContext *gb, PutByteContext *pb, int bpp) +{ + while (bytestream2_get_bytes_left(gb) > 0) { + uint32_t fill; + int j; + unsigned run = bytestream2_get_byte(gb); + + if (run) { + switch (avctx->bits_per_coded_sample) { + case 8: + fill = bytestream2_get_byte(gb); + break; + case 16: + fill = bytestream2_get_le16(gb); + break; + case 24: + fill = bytestream2_get_le24(gb); + break; + case 32: + fill = bytestream2_get_le32(gb); + break; + } + + for (j = 0; j < run; j++) { + switch (avctx->bits_per_coded_sample) { + case 8: + bytestream2_put_byte(pb, fill); + break; + case 16: + bytestream2_put_le16(pb, fill); + break; + case 24: + bytestream2_put_le24(pb, fill); + break; + case 32: + bytestream2_put_le32(pb, fill); + break; + } + } + } else { + unsigned copy = bytestream2_get_byte(gb); + + if (copy == 1) { + return 0; + } else if (copy == 2) { + unsigned x, y; + + x = bytestream2_get_byte(gb); + y = bytestream2_get_byte(gb); + + bytestream2_skip_p(pb, x * bpp); + bytestream2_skip_p(pb, y * bpp * avctx->width); + } else { + for (j = 0; j < copy; j++) { + switch (avctx->bits_per_coded_sample) { + case 8: + bytestream2_put_byte(pb, bytestream2_get_byte(gb)); + break; + case 16: + bytestream2_put_le16(pb, bytestream2_get_le16(gb)); + break; + case 24: + bytestream2_put_le24(pb, bytestream2_get_le24(gb)); + break; + case 32: + bytestream2_put_le32(pb, bytestream2_get_le32(gb)); + break; + } + } + } + } + } + + return AVERROR_INVALIDDATA; +} + +static int decode_frame(AVCodecContext *avctx, + void *data, int *got_frame, + AVPacket *avpkt) +{ + MSCCContext *s = avctx->priv_data; + AVFrame *frame = data; + GetByteContext gb; + PutByteContext pb; + int ret, j; + + if (avpkt->size < 3) + return AVERROR_INVALIDDATA; + if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) + return ret; + + avpkt->data[2] ^= avpkt->data[0]; + + ret = inflateReset(&s->zstream); + if (ret != Z_OK) { + av_log(avctx, AV_LOG_ERROR, "Inflate reset error: %d\n", ret); + return AVERROR_UNKNOWN; + } + s->zstream.next_in = avpkt->data + 2; + s->zstream.avail_in = avpkt->size - 2; + 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_UNKNOWN; + } + + bytestream2_init(&gb, s->decomp_buf, s->zstream.total_out); + bytestream2_init_writer(&pb, s->uncomp_buf, s->uncomp_size); + + ret = rle_uncompress(avctx, &gb, &pb, s->bpp); + if (ret) + 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->key_frame = 1; + frame->pict_type = AV_PICTURE_TYPE_I; + + *got_frame = 1; + + return avpkt->size; +} + +static av_cold int decode_init(AVCodecContext *avctx) +{ + MSCCContext *s = avctx->priv_data; + int zret; + + switch (avctx->bits_per_coded_sample) { + case 8: avctx->pix_fmt = AV_PIX_FMT_GRAY8; break; + case 16: avctx->pix_fmt = AV_PIX_FMT_RGB555; break; + case 24: avctx->pix_fmt = AV_PIX_FMT_BGR24; break; + case 32: avctx->pix_fmt = AV_PIX_FMT_BGRA; break; + default: + av_log(avctx, AV_LOG_ERROR, "Unsupported bitdepth %i\n", avctx->bits_per_coded_sample); + return AVERROR_INVALIDDATA; + } + + s->bpp = avctx->bits_per_coded_sample >> 3; + memset(&s->zstream, 0, sizeof(z_stream)); + + s->decomp_size = 4 * avctx->height * ((avctx->width * avctx->bits_per_coded_sample + 31) / 32); + if (!(s->decomp_buf = av_malloc(s->decomp_size))) + return AVERROR(ENOMEM); + + s->uncomp_size = 4 * avctx->height * ((avctx->width * avctx->bits_per_coded_sample + 31) / 32); + 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_UNKNOWN; + } + + return 0; +} + +static av_cold int decode_close(AVCodecContext *avctx) +{ + MSCCContext *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_mscc_decoder = { + .name = "mscc", + .long_name = NULL_IF_CONFIG_SMALL("Mandsoft Screen Capture Codec"), + .type = AVMEDIA_TYPE_VIDEO, + .id = AV_CODEC_ID_MSCC, + .priv_data_size = sizeof(MSCCContext), + .init = decode_init, + .close = decode_close, + .decode = decode_frame, + .capabilities = AV_CODEC_CAP_DR1, +}; diff --git a/libavformat/riff.c b/libavformat/riff.c index 2f2f537..294d11b 100644 --- a/libavformat/riff.c +++ b/libavformat/riff.c @@ -452,6 +452,7 @@ const AVCodecTag ff_codec_bmp_tags[] = { { AV_CODEC_ID_SCPR, MKTAG('S', 'C', 'P', 'R') }, { AV_CODEC_ID_CLEARVIDEO, MKTAG('U', 'C', 'O', 'D') }, { AV_CODEC_ID_AV1, MKTAG('A', 'V', '0', '1') }, + { AV_CODEC_ID_MSCC, MKTAG('M', 'S', 'C', 'C') }, { AV_CODEC_ID_NONE, 0 } };