Silicon Graphics Motion Video Compressor 1 & 2 decoder

Signed-off-by: Peter Ross <pross@xvid.org>
This commit is contained in:
Peter Ross 2012-12-17 20:37:54 +11:00
parent afa1617b93
commit 746b1dcc98
7 changed files with 310 additions and 0 deletions

View File

@ -43,6 +43,7 @@ version <next>:
- SOX Resampler support in libswresample
- aselect filter
- SGI RLE 8-bit decoder
- Silicon Graphics Motion Video Compressor 1 & 2 decoder
version 1.0:

View File

@ -667,6 +667,8 @@ following image formats are supported:
@item SGI RLE 8-bit @tab @tab X
@item Sierra VMD video @tab @tab X
@tab Used in Sierra VMD files.
@item Silicon Graphics Motion Video Compressor 1 (MVC1) @tab @tab X
@item Silicon Graphics Motion Video Compressor 2 (MVC2) @tab @tab X
@item Smacker video @tab @tab X
@tab Video encoding used in Smacker.
@item SMPTE VC-1 @tab @tab X

View File

@ -310,6 +310,8 @@ OBJS-$(CONFIG_MSVIDEO1_DECODER) += msvideo1.o
OBJS-$(CONFIG_MSVIDEO1_ENCODER) += msvideo1enc.o elbg.o
OBJS-$(CONFIG_MSZH_DECODER) += lcldec.o
OBJS-$(CONFIG_MTS2_DECODER) += mss4.o mss34dsp.o
OBJS-$(CONFIG_MVC1_DECODER) += mvcdec.o
OBJS-$(CONFIG_MVC2_DECODER) += mvcdec.o
OBJS-$(CONFIG_MXPEG_DECODER) += mxpegdec.o mjpegdec.o mjpeg.o
OBJS-$(CONFIG_NELLYMOSER_DECODER) += nellymoserdec.o nellymoser.o
OBJS-$(CONFIG_NELLYMOSER_ENCODER) += nellymoserenc.o nellymoser.o \

View File

@ -183,6 +183,8 @@ void avcodec_register_all(void)
REGISTER_ENCDEC (MSVIDEO1, msvideo1);
REGISTER_DECODER (MSZH, mszh);
REGISTER_DECODER (MTS2, mts2);
REGISTER_DECODER (MVC1, mvc1);
REGISTER_DECODER (MVC2, mvc2);
REGISTER_DECODER (MXPEG, mxpeg);
REGISTER_DECODER (NUV, nuv);
REGISTER_DECODER (PAF_VIDEO, paf_video);

View File

@ -286,6 +286,8 @@ enum AVCodecID {
AV_CODEC_ID_CPIA = MKBETAG('C','P','I','A'),
AV_CODEC_ID_XFACE = MKBETAG('X','F','A','C'),
AV_CODEC_ID_SGIRLE = MKBETAG('S','G','I','R'),
AV_CODEC_ID_MVC1 = MKBETAG('M','V','C','1'),
AV_CODEC_ID_MVC2 = MKBETAG('M','V','C','2'),
/* various PCM "codecs" */
AV_CODEC_ID_FIRST_AUDIO = 0x10000, ///< A dummy id pointing at the start of audio codecs

View File

@ -1065,6 +1065,20 @@ static const AVCodecDescriptor codec_descriptors[] = {
.long_name = NULL_IF_CONFIG_SMALL("AJA Kona 10-bit RGB Codec"),
.props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS,
},
{
.id = AV_CODEC_ID_MVC1,
.type = AVMEDIA_TYPE_VIDEO,
.name = "mvc1",
.long_name = NULL_IF_CONFIG_SMALL("Silicon Graphics Motion Video Compressor 1"),
.props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY,
},
{
.id = AV_CODEC_ID_MVC2,
.type = AVMEDIA_TYPE_VIDEO,
.name = "mvc2",
.long_name = NULL_IF_CONFIG_SMALL("Silicon Graphics Motion Video Compressor 2"),
.props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY,
},
{
.id = AV_CODEC_ID_MXPEG,
.type = AVMEDIA_TYPE_VIDEO,

287
libavcodec/mvcdec.c Normal file
View File

@ -0,0 +1,287 @@
/*
* Silicon Graphics Motion Video Compressor 1 & 2 decoder
* Copyright (c) 2012 Peter Ross
*
* 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
* Silicon Graphics Motion Video Compressor 1 & 2 decoder
*/
#include "libavutil/intreadwrite.h"
#include "avcodec.h"
#include "bytestream.h"
typedef struct MvcContext {
int vflip;
} MvcContext;
static av_cold int mvc_decode_init(AVCodecContext *avctx)
{
MvcContext *s = avctx->priv_data;
int width = avctx->width;
int height = avctx->height;
if (avctx->codec_id == AV_CODEC_ID_MVC1) {
width += 3;
height += 3;
}
width &= ~3;
height &= ~3;
if (width != avctx->width || height != avctx->height)
avcodec_set_dimensions(avctx, width, height);
avctx->pix_fmt = (avctx->codec_id == AV_CODEC_ID_MVC1) ? AV_PIX_FMT_RGB555 : AV_PIX_FMT_BGRA;
avctx->coded_frame = avcodec_alloc_frame();
if (!avctx->coded_frame)
return AVERROR(ENOMEM);
s->vflip = avctx->extradata_size >= 9 && !memcmp(avctx->extradata + avctx->extradata_size - 9, "BottomUp", 9);
return 0;
}
static int decode_mvc1(AVCodecContext *avctx, GetByteContext *gb, uint8_t *dst_start, int width, int height, int linesize)
{
uint8_t *dst;
uint16_t v[8];
int mask, x, y, i;
x = y= 0;
while (bytestream2_get_bytes_left(gb) >= 6) {
mask = bytestream2_get_be16u(gb);
v[0] = bytestream2_get_be16u(gb);
v[1] = bytestream2_get_be16u(gb);
if ((v[0] & 0x8000)) {
if (bytestream2_get_bytes_left(gb) < 12) {
av_log(avctx, AV_LOG_WARNING, "buffer overflow\n");
return AVERROR_INVALIDDATA;
}
for (i = 2; i < 8; i++)
v[i] = bytestream2_get_be16u(gb);
} else {
v[2] = v[4] = v[6] = v[0];
v[3] = v[5] = v[7] = v[1];
}
#define PIX16(target, true, false) \
i = (mask & target) ? true : false; \
AV_WN16A(dst, (v[i] & 0x7C00) | (v[i] & 0x3E0) | (v[i] & 0x1F)); \
dst += 2;
#define ROW16(row, a1, a0, b1, b0) \
dst = dst_start + (y + row) * linesize + x * 2; \
PIX16(1 << (row * 4), a1, a0) \
PIX16(1 << (row * 4 + 1), a1, a0) \
PIX16(1 << (row * 4 + 2), b1, b0) \
PIX16(1 << (row * 4 + 3), b1, b0)
ROW16(0, 0, 1, 2, 3);
ROW16(1, 0, 1, 2, 3);
ROW16(2, 4, 5, 6, 7);
ROW16(3, 4, 5, 6, 7);
x += 4;
if (x >= width) {
y += 4;
if (y >= height) {
break;
}
x = 0;
}
}
return 0;
}
static void set_4x4_block(uint8_t *dst, int linesize, uint32_t pixel)
{
int i, j;
for (j = 0; j < 4; j++)
for (i = 0; i < 4; i++)
AV_WN32A(dst + j * linesize + i * 4, pixel);
}
#define PIX32(target, true, false) \
AV_WN32A(dst, (mask & target) ? v[true] : v[false]); \
dst += 4;
#define ROW32(row, a1, a0, b1, b0) \
dst = dst_start + (y + row) * linesize + x * 4; \
PIX32(1 << (row * 4), a1, a0) \
PIX32(1 << (row * 4 + 1), a1, a0) \
PIX32(1 << (row * 4 + 2), b1, b0) \
PIX32(1 << (row * 4 + 3), b1, b0)
#define MVC2_BLOCK \
ROW32(0, 1, 0, 3, 2); \
ROW32(1, 1, 0, 3, 2); \
ROW32(2, 5, 4, 7, 6); \
ROW32(3, 5, 4, 7, 6);
static int decode_mvc2(AVCodecContext *avctx, GetByteContext *gb, uint8_t *dst_start, int width, int height, int linesize, int vflip)
{
uint8_t *dst;
uint32_t color[128], v[8];
int w, h, nb_colors, i, x, y, p0, p1, mask;
if (bytestream2_get_bytes_left(gb) < 6)
return AVERROR_INVALIDDATA;
w = bytestream2_get_be16u(gb);
h = bytestream2_get_be16u(gb);
if ((w & ~3) != width || (h & ~3) != height)
av_log(avctx, AV_LOG_WARNING, "dimension mismatch\n");
if (bytestream2_get_byteu(gb)) {
av_log_ask_for_sample(avctx, "bitmap feature\n");
return AVERROR_PATCHWELCOME;
}
nb_colors = bytestream2_get_byteu(gb);
if (bytestream2_get_bytes_left(gb) < nb_colors * 3)
return AVERROR_INVALIDDATA;
for (i = 0; i < FFMIN(nb_colors, 128); i++)
color[i] = 0xFF000000 | bytestream2_get_be24u(gb);
if (nb_colors > 128)
bytestream2_skip(gb, (nb_colors - 128) * 3);
if (vflip) {
dst_start += (height - 1) * linesize;
linesize = -linesize;
}
x = y = 0;
while (bytestream2_get_bytes_left(gb) >= 1) {
p0 = bytestream2_get_byteu(gb);
if ((p0 & 0x80)) {
if ((p0 & 0x40)) {
p0 &= 0x3F;
p0 = (p0 << 2) | (p0 >> 4);
set_4x4_block(dst_start + y * linesize + x * 4, linesize, 0xFF000000 | (p0 << 16) | (p0 << 8) | p0);
} else {
int g, r;
p0 &= 0x3F;
p0 = (p0 << 2) | (p0 >> 4);
if (bytestream2_get_bytes_left(gb) < 2)
return AVERROR_INVALIDDATA;
g = bytestream2_get_byteu(gb);
r = bytestream2_get_byteu(gb);
set_4x4_block(dst_start + y * linesize + x * 4, linesize, 0xFF000000 | (r << 16) | (g << 8) | p0);
}
} else {
if (bytestream2_get_bytes_left(gb) < 1)
return AVERROR_INVALIDDATA;
p1 = bytestream2_get_byteu(gb);
if ((p1 & 0x80)) {
if ((p0 & 0x7F) == (p1 & 0x7F)) {
set_4x4_block(dst_start + y * linesize + x * 4, linesize, color[p0 & 0x7F]);
} else {
if (bytestream2_get_bytes_left(gb) < 2)
return AVERROR_INVALIDDATA;
v[0] = v[2] = v[4] = v[6] = color[p0 & 0x7F];
v[1] = v[3] = v[5] = v[7] = color[p1 & 0x7F];
mask = bytestream2_get_le16u(gb);
MVC2_BLOCK
}
} else {
if (bytestream2_get_bytes_left(gb) < 8)
return AVERROR_INVALIDDATA;
v[0] = color[p0 & 0x7F];
v[1] = color[p1 & 0x7F];
for (i = 2; i < 8; i++)
v[i] = color[bytestream2_get_byteu(gb) & 0x7F];
mask = bytestream2_get_le16u(gb);
MVC2_BLOCK
}
}
x += 4;
if (x >= width) {
y += 4;
if (y >= height)
break;
x = 0;
}
}
return 0;
}
static int mvc_decode_frame(AVCodecContext *avctx,
void *data, int *got_frame,
AVPacket *avpkt)
{
MvcContext *s = avctx->priv_data;
GetByteContext gb;
int ret;
avctx->coded_frame->reference = 3;
avctx->coded_frame->buffer_hints = FF_BUFFER_HINTS_VALID | FF_BUFFER_HINTS_PRESERVE |
FF_BUFFER_HINTS_REUSABLE | FF_BUFFER_HINTS_READABLE;
ret = avctx->reget_buffer(avctx, avctx->coded_frame);
if (ret < 0) {
av_log (avctx, AV_LOG_ERROR, "reget_buffer() failed\n");
return AVERROR(ENOMEM);
}
bytestream2_init(&gb, avpkt->data, avpkt->size);
if (avctx->codec_id == AV_CODEC_ID_MVC1)
ret = decode_mvc1(avctx, &gb, avctx->coded_frame->data[0], avctx->width, avctx->height, avctx->coded_frame->linesize[0]);
else
ret = decode_mvc2(avctx, &gb, avctx->coded_frame->data[0], avctx->width, avctx->height, avctx->coded_frame->linesize[0], s->vflip);
if (ret < 0)
return ret;
*got_frame = 1;
*(AVFrame*)data = *avctx->coded_frame;
return avpkt->size;
}
static av_cold int mvc_decode_end(AVCodecContext *avctx)
{
if (avctx->coded_frame->data[0])
avctx->release_buffer(avctx, avctx->coded_frame);
av_freep(&avctx->coded_frame);
return 0;
}
#if CONFIG_MVC1_DECODER
AVCodec ff_mvc1_decoder = {
.name = "mvc1",
.type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_MVC1,
.priv_data_size = sizeof(MvcContext),
.init = mvc_decode_init,
.close = mvc_decode_end,
.decode = mvc_decode_frame,
.capabilities = CODEC_CAP_DR1,
.long_name = NULL_IF_CONFIG_SMALL("Silicon Graphics Motion Video Compressor 1"),
};
#endif
#if CONFIG_MVC1_DECODER
AVCodec ff_mvc2_decoder = {
.name = "mvc2",
.type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_MVC2,
.priv_data_size = sizeof(MvcContext),
.init = mvc_decode_init,
.close = mvc_decode_end,
.decode = mvc_decode_frame,
.capabilities = CODEC_CAP_DR1,
.long_name = NULL_IF_CONFIG_SMALL("Silicon Graphics Motion Video Compressor 2"),
};
#endif