History

avcodec: add Mandsoft Screen Capture Codec decoder

Paul B Mahol committed 9 years ago

Commit a96db6b1 parent fd1443b8 files · +244 −0Browse files

Unified · Split

8 files
  1. configure +1 −0
  2. doc/general.texi +1 −0
  3. libavcodec/Makefile +1 −0
  4. libavcodec/allcodecs.c +1 −0
  5. libavcodec/avcodec.h +1 −0
  6. libavcodec/codec_desc.c +7 −0
  7. libavcodec/mscc.c +231 −0
  8. libavformat/riff.c +1 −0
configure+1−0
@@ -2471,6 +2471,7 @@ mpeg2video_encoder_select="aandcttables mpegvideoenc h263dsp" · 2470 unmodified lines
2471mpeg4_decoder_select="h263_decoder mpeg4video_parser"2471mpeg4_decoder_select="h263_decoder mpeg4video_parser"
2472mpeg4_encoder_select="h263_encoder"2472mpeg4_encoder_select="h263_encoder"
2473msa1_decoder_select="mss34dsp"2473msa1_decoder_select="mss34dsp"
2474mscc_decoder_select="zlib"
2474msmpeg4v1_decoder_select="h263_decoder"2475msmpeg4v1_decoder_select="h263_decoder"
2475msmpeg4v2_decoder_select="h263_decoder"2476msmpeg4v2_decoder_select="h263_decoder"
2476msmpeg4v2_encoder_select="h263_encoder"2477msmpeg4v2_encoder_select="h263_encoder"
doc/general.texi+1−0
@@ -789,6 +789,7 @@ following image formats are supported: · 788 unmodified lines
789 @tab Used in LucasArts games / SMUSH animations.789 @tab Used in LucasArts games / SMUSH animations.
790@item lossless MJPEG @tab X @tab X790@item lossless MJPEG @tab X @tab X
791@item MagicYUV Video @tab @tab X791@item MagicYUV Video @tab @tab X
792@item Mandsoft Screen Capture Codec @tab @tab X
792@item Microsoft ATC Screen @tab @tab X793@item Microsoft ATC Screen @tab @tab X
793 @tab Also known as Microsoft Screen 3.794 @tab Also known as Microsoft Screen 3.
794@item Microsoft Expression Encoder Screen @tab @tab X795@item Microsoft Expression Encoder Screen @tab @tab X
libavcodec/Makefile+1−0
@@ -429,6 +429,7 @@ OBJS-$(CONFIG_MPEG4_MEDIACODEC_DECODER) += mediacodecdec.o · 428 unmodified lines
429OBJS-$(CONFIG_MPEG4_OMX_ENCODER) += omx.o429OBJS-$(CONFIG_MPEG4_OMX_ENCODER) += omx.o
430OBJS-$(CONFIG_MPL2_DECODER) += mpl2dec.o ass.o430OBJS-$(CONFIG_MPL2_DECODER) += mpl2dec.o ass.o
431OBJS-$(CONFIG_MSA1_DECODER) += mss3.o431OBJS-$(CONFIG_MSA1_DECODER) += mss3.o
432OBJS-$(CONFIG_MSCC_DECODER) += mscc.o
432OBJS-$(CONFIG_MSMPEG4V1_DECODER) += msmpeg4dec.o msmpeg4.o msmpeg4data.o433OBJS-$(CONFIG_MSMPEG4V1_DECODER) += msmpeg4dec.o msmpeg4.o msmpeg4data.o
433OBJS-$(CONFIG_MSMPEG4V2_DECODER) += msmpeg4dec.o msmpeg4.o msmpeg4data.o434OBJS-$(CONFIG_MSMPEG4V2_DECODER) += msmpeg4dec.o msmpeg4.o msmpeg4data.o
434OBJS-$(CONFIG_MSMPEG4V2_ENCODER) += msmpeg4enc.o msmpeg4.o msmpeg4data.o435OBJS-$(CONFIG_MSMPEG4V2_ENCODER) += msmpeg4enc.o msmpeg4.o msmpeg4data.o
libavcodec/allcodecs.c+1−0
@@ -258,6 +258,7 @@ static void register_all(void) · 257 unmodified lines
258 REGISTER_DECODER(MPEG2_CRYSTALHD, mpeg2_crystalhd);258 REGISTER_DECODER(MPEG2_CRYSTALHD, mpeg2_crystalhd);
259 REGISTER_DECODER(MPEG2_QSV, mpeg2_qsv);259 REGISTER_DECODER(MPEG2_QSV, mpeg2_qsv);
260 REGISTER_DECODER(MSA1, msa1);260 REGISTER_DECODER(MSA1, msa1);
261 REGISTER_DECODER(MSCC, mscc);
261 REGISTER_DECODER(MSMPEG4V1, msmpeg4v1);262 REGISTER_DECODER(MSMPEG4V1, msmpeg4v1);
262 REGISTER_ENCDEC (MSMPEG4V2, msmpeg4v2);263 REGISTER_ENCDEC (MSMPEG4V2, msmpeg4v2);
263 REGISTER_ENCDEC (MSMPEG4V3, msmpeg4v3);264 REGISTER_ENCDEC (MSMPEG4V3, msmpeg4v3);
libavcodec/avcodec.h+1−0
@@ -443,6 +443,7 @@ enum AVCodecID { · 442 unmodified lines
443 AV_CODEC_ID_XPM,443 AV_CODEC_ID_XPM,
444 AV_CODEC_ID_AV1,444 AV_CODEC_ID_AV1,
445 AV_CODEC_ID_BITPACKED,445 AV_CODEC_ID_BITPACKED,
446 AV_CODEC_ID_MSCC,
446 447
447 /* various PCM "codecs" */448 /* various PCM "codecs" */
448 AV_CODEC_ID_FIRST_AUDIO = 0x10000, ///< A dummy id pointing at the start of audio codecs449 AV_CODEC_ID_FIRST_AUDIO = 0x10000, ///< A dummy id pointing at the start of audio codecs
libavcodec/codec_desc.c+7−0
@@ -1388,6 +1388,13 @@ static const AVCodecDescriptor codec_descriptors[] = { · 1387 unmodified lines
1388 .long_name = NULL_IF_CONFIG_SMALL("Bitpacked"),1388 .long_name = NULL_IF_CONFIG_SMALL("Bitpacked"),
1389 .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS,1389 .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS,
1390 },1390 },
1391 {
1392 .id = AV_CODEC_ID_MSCC,
1393 .type = AVMEDIA_TYPE_VIDEO,
1394 .name = "mscc",
1395 .long_name = NULL_IF_CONFIG_SMALL("Mandsoft Screen Capture Codec"),
1396 .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS,
1397 },
1391 1398
1392 /* image codecs */1399 /* image codecs */
1393 {1400 {
libavcodec/mscc.c+231−0
@@ -0,0 +1,231 @@
1/*
2 * Mandsoft Screen Capture Codec decoder
3 *
4 * Copyright (c) 2017 Paul B Mahol
5 *
6 * This file is part of FFmpeg.
7 *
8 * FFmpeg is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Lesser General Public
10 * License as published by the Free Software Foundation; either
11 * version 2.1 of the License, or (at your option) any later version.
12 *
13 * FFmpeg is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
16 * Lesser General Public License for more details.
17 *
18 * You should have received a copy of the GNU Lesser General Public
19 * License along with FFmpeg; if not, write to the Free Software
20 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21 */
22
23#include <stdio.h>
24#include <stdlib.h>
25#include <string.h>
26
27#include "avcodec.h"
28#include "bytestream.h"
29#include "internal.h"
30
31#include <zlib.h>
32
33typedef struct MSCCContext {
34 unsigned bpp;
35 unsigned int decomp_size;
36 uint8_t *decomp_buf;
37 unsigned int uncomp_size;
38 uint8_t *uncomp_buf;
39 z_stream zstream;
40} MSCCContext;
41
42static int rle_uncompress(AVCodecContext *avctx, GetByteContext *gb, PutByteContext *pb, int bpp)
43{
44 while (bytestream2_get_bytes_left(gb) > 0) {
45 uint32_t fill;
46 int j;
47 unsigned run = bytestream2_get_byte(gb);
48
49 if (run) {
50 switch (avctx->bits_per_coded_sample) {
51 case 8:
52 fill = bytestream2_get_byte(gb);
53 break;
54 case 16:
55 fill = bytestream2_get_le16(gb);
56 break;
57 case 24:
58 fill = bytestream2_get_le24(gb);
59 break;
60 case 32:
61 fill = bytestream2_get_le32(gb);
62 break;
63 }
64
65 for (j = 0; j < run; j++) {
66 switch (avctx->bits_per_coded_sample) {
67 case 8:
68 bytestream2_put_byte(pb, fill);
69 break;
70 case 16:
71 bytestream2_put_le16(pb, fill);
72 break;
73 case 24:
74 bytestream2_put_le24(pb, fill);
75 break;
76 case 32:
77 bytestream2_put_le32(pb, fill);
78 break;
79 }
80 }
81 } else {
82 unsigned copy = bytestream2_get_byte(gb);
83
84 if (copy == 1) {
85 return 0;
86 } else if (copy == 2) {
87 unsigned x, y;
88
89 x = bytestream2_get_byte(gb);
90 y = bytestream2_get_byte(gb);
91
92 bytestream2_skip_p(pb, x * bpp);
93 bytestream2_skip_p(pb, y * bpp * avctx->width);
94 } else {
95 for (j = 0; j < copy; j++) {
96 switch (avctx->bits_per_coded_sample) {
97 case 8:
98 bytestream2_put_byte(pb, bytestream2_get_byte(gb));
99 break;
100 case 16:
101 bytestream2_put_le16(pb, bytestream2_get_le16(gb));
102 break;
103 case 24:
104 bytestream2_put_le24(pb, bytestream2_get_le24(gb));
105 break;
106 case 32:
107 bytestream2_put_le32(pb, bytestream2_get_le32(gb));
108 break;
109 }
110 }
111 }
112 }
113 }
114
115 return AVERROR_INVALIDDATA;
116}
117
118static int decode_frame(AVCodecContext *avctx,
119 void *data, int *got_frame,
120 AVPacket *avpkt)
121{
122 MSCCContext *s = avctx->priv_data;
123 AVFrame *frame = data;
124 GetByteContext gb;
125 PutByteContext pb;
126 int ret, j;
127
128 if (avpkt->size < 3)
129 return AVERROR_INVALIDDATA;
130 if ((ret = ff_get_buffer(avctx, frame, 0)) < 0)
131 return ret;
132
133 avpkt->data[2] ^= avpkt->data[0];
134
135 ret = inflateReset(&s->zstream);
136 if (ret != Z_OK) {
137 av_log(avctx, AV_LOG_ERROR, "Inflate reset error: %d\n", ret);
138 return AVERROR_UNKNOWN;
139 }
140 s->zstream.next_in = avpkt->data + 2;
141 s->zstream.avail_in = avpkt->size - 2;
142 s->zstream.next_out = s->decomp_buf;
143 s->zstream.avail_out = s->decomp_size;
144 ret = inflate(&s->zstream, Z_FINISH);
145 if (ret != Z_STREAM_END) {
146 av_log(avctx, AV_LOG_ERROR, "Inflate error: %d\n", ret);
147 return AVERROR_UNKNOWN;
148 }
149
150 bytestream2_init(&gb, s->decomp_buf, s->zstream.total_out);
151 bytestream2_init_writer(&pb, s->uncomp_buf, s->uncomp_size);
152
153 ret = rle_uncompress(avctx, &gb, &pb, s->bpp);
154 if (ret)
155 return ret;
156
157 for (j = 0; j < avctx->height; j++) {
158 memcpy(frame->data[0] + (avctx->height - j - 1) * frame->linesize[0],
159 s->uncomp_buf + s->bpp * j * avctx->width, s->bpp * avctx->width);
160 }
161
162 frame->key_frame = 1;
163 frame->pict_type = AV_PICTURE_TYPE_I;
164
165 *got_frame = 1;
166
167 return avpkt->size;
168}
169
170static av_cold int decode_init(AVCodecContext *avctx)
171{
172 MSCCContext *s = avctx->priv_data;
173 int zret;
174
175 switch (avctx->bits_per_coded_sample) {
176 case 8: avctx->pix_fmt = AV_PIX_FMT_GRAY8; break;
177 case 16: avctx->pix_fmt = AV_PIX_FMT_RGB555; break;
178 case 24: avctx->pix_fmt = AV_PIX_FMT_BGR24; break;
179 case 32: avctx->pix_fmt = AV_PIX_FMT_BGRA; break;
180 default:
181 av_log(avctx, AV_LOG_ERROR, "Unsupported bitdepth %i\n", avctx->bits_per_coded_sample);
182 return AVERROR_INVALIDDATA;
183 }
184
185 s->bpp = avctx->bits_per_coded_sample >> 3;
186 memset(&s->zstream, 0, sizeof(z_stream));
187
188 s->decomp_size = 4 * avctx->height * ((avctx->width * avctx->bits_per_coded_sample + 31) / 32);
189 if (!(s->decomp_buf = av_malloc(s->decomp_size)))
190 return AVERROR(ENOMEM);
191
192 s->uncomp_size = 4 * avctx->height * ((avctx->width * avctx->bits_per_coded_sample + 31) / 32);
193 if (!(s->uncomp_buf = av_malloc(s->uncomp_size)))
194 return AVERROR(ENOMEM);
195
196 s->zstream.zalloc = Z_NULL;
197 s->zstream.zfree = Z_NULL;
198 s->zstream.opaque = Z_NULL;
199 zret = inflateInit(&s->zstream);
200 if (zret != Z_OK) {
201 av_log(avctx, AV_LOG_ERROR, "Inflate init error: %d\n", zret);
202 return AVERROR_UNKNOWN;
203 }
204
205 return 0;
206}
207
208static av_cold int decode_close(AVCodecContext *avctx)
209{
210 MSCCContext *s = avctx->priv_data;
211
212 av_freep(&s->decomp_buf);
213 s->decomp_size = 0;
214 av_freep(&s->uncomp_buf);
215 s->uncomp_size = 0;
216 inflateEnd(&s->zstream);
217
218 return 0;
219}
220
221AVCodec ff_mscc_decoder = {
222 .name = "mscc",
223 .long_name = NULL_IF_CONFIG_SMALL("Mandsoft Screen Capture Codec"),
224 .type = AVMEDIA_TYPE_VIDEO,
225 .id = AV_CODEC_ID_MSCC,
226 .priv_data_size = sizeof(MSCCContext),
227 .init = decode_init,
228 .close = decode_close,
229 .decode = decode_frame,
230 .capabilities = AV_CODEC_CAP_DR1,
231};
libavformat/riff.c+1−0
@@ -452,6 +452,7 @@ const AVCodecTag ff_codec_bmp_tags[] = { · 451 unmodified lines
452 { AV_CODEC_ID_SCPR, MKTAG('S', 'C', 'P', 'R') },452 { AV_CODEC_ID_SCPR, MKTAG('S', 'C', 'P', 'R') },
453 { AV_CODEC_ID_CLEARVIDEO, MKTAG('U', 'C', 'O', 'D') },453 { AV_CODEC_ID_CLEARVIDEO, MKTAG('U', 'C', 'O', 'D') },
454 { AV_CODEC_ID_AV1, MKTAG('A', 'V', '0', '1') },454 { AV_CODEC_ID_AV1, MKTAG('A', 'V', '0', '1') },
455 { AV_CODEC_ID_MSCC, MKTAG('M', 'S', 'C', 'C') },
455 { AV_CODEC_ID_NONE, 0 }456 { AV_CODEC_ID_NONE, 0 }
456};457};
457 458

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t