* Delphine Software International CIN Audio/Video Decoders
* Copyright (c) 2006 Gregory Montoir (cyx@users.sourceforge.net)
*
- * This file is part of FFmpeg.
+ * This file is part of Libav.
*
- * FFmpeg is free software; you can redistribute it and/or
+ * Libav 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,
+ * Libav 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
+ * License along with Libav; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
/**
- * @file dsicinav.c
+ * @file
* Delphine Software International CIN audio/video decoders
*/
+#include "libavutil/channel_layout.h"
#include "avcodec.h"
-#include "common.h"
+#include "bytestream.h"
+#include "internal.h"
+#include "mathops.h"
typedef enum CinVideoBitmapIndex {
} CinVideoContext;
typedef struct CinAudioContext {
- AVCodecContext *avctx;
int initial_decode_frame;
int delta;
} CinAudioContext;
};
-static int cinvideo_decode_init(AVCodecContext *avctx)
+static av_cold int cinvideo_decode_init(AVCodecContext *avctx)
{
- CinVideoContext *cin = (CinVideoContext *)avctx->priv_data;
+ CinVideoContext *cin = avctx->priv_data;
unsigned int i;
cin->avctx = avctx;
- avctx->pix_fmt = PIX_FMT_PAL8;
- avctx->has_b_frames = 0;
+ avctx->pix_fmt = AV_PIX_FMT_PAL8;
cin->frame.data[0] = NULL;
unsigned char *dst_end = dst + dst_size;
const unsigned char *src_end = src + src_size;
- memcpy(huff_code_table, src, 15); src += 15; src_size -= 15;
+ memcpy(huff_code_table, src, 15); src += 15;
while (src < src_end) {
huff_code = *src++;
return dst_cur - dst;
}
-static void cin_decode_lzss(const unsigned char *src, int src_size, unsigned char *dst, int dst_size)
+static int cin_decode_lzss(const unsigned char *src, int src_size, unsigned char *dst, int dst_size)
{
uint16_t cmd;
int i, sz, offset, code;
- unsigned char *dst_end = dst + dst_size;
+ unsigned char *dst_end = dst + dst_size, *dst_start = dst;
const unsigned char *src_end = src + src_size;
while (src < src_end && dst < dst_end) {
if (code & (1 << i)) {
*dst++ = *src++;
} else {
- cmd = LE_16(src); src += 2;
+ cmd = AV_RL16(src); src += 2;
offset = cmd >> 4;
+ if ((int) (dst - dst_start) < offset + 1)
+ return AVERROR_INVALIDDATA;
sz = (cmd & 0xF) + 2;
/* don't use memcpy/memmove here as the decoding routine (ab)uses */
/* buffer overlappings to repeat bytes in the destination */
}
}
}
+
+ return 0;
}
static void cin_decode_rle(const unsigned char *src, int src_size, unsigned char *dst, int dst_size)
}
static int cinvideo_decode_frame(AVCodecContext *avctx,
- void *data, int *data_size,
- uint8_t *buf, int buf_size)
+ void *data, int *got_frame,
+ AVPacket *avpkt)
{
- CinVideoContext *cin = (CinVideoContext *)avctx->priv_data;
- int i, y, palette_type, palette_colors_count, bitmap_frame_type, bitmap_frame_size;
-
- cin->frame.buffer_hints = FF_BUFFER_HINTS_VALID | FF_BUFFER_HINTS_PRESERVE | FF_BUFFER_HINTS_REUSABLE;
- if (avctx->reget_buffer(avctx, &cin->frame)) {
- av_log(cin->avctx, AV_LOG_ERROR, "delphinecinvideo: reget_buffer() failed to allocate a frame\n");
- return -1;
- }
+ const uint8_t *buf = avpkt->data;
+ int buf_size = avpkt->size;
+ CinVideoContext *cin = avctx->priv_data;
+ int i, y, palette_type, palette_colors_count, bitmap_frame_type, bitmap_frame_size, res = 0;
palette_type = buf[0];
- palette_colors_count = buf[1] | (buf[2] << 8);
+ palette_colors_count = AV_RL16(buf+1);
bitmap_frame_type = buf[3];
buf += 4;
bitmap_frame_size = buf_size - 4;
/* handle palette */
+ if (bitmap_frame_size < palette_colors_count * (3 + (palette_type != 0)))
+ return AVERROR_INVALIDDATA;
if (palette_type == 0) {
+ if (palette_colors_count > 256)
+ return AVERROR_INVALIDDATA;
for (i = 0; i < palette_colors_count; ++i) {
- cin->palette[i] = (buf[2] << 16) | (buf[1] << 8) | buf[0];
- buf += 3;
+ cin->palette[i] = bytestream_get_le24(&buf);
bitmap_frame_size -= 3;
}
} else {
for (i = 0; i < palette_colors_count; ++i) {
- cin->palette[buf[0]] = (buf[3] << 16) | (buf[2] << 8) | buf[1];
+ cin->palette[buf[0]] = AV_RL24(buf+1);
buf += 4;
bitmap_frame_size -= 4;
}
}
- memcpy(cin->frame.data[1], cin->palette, sizeof(cin->palette));
- cin->frame.palette_has_changed = 1;
/* note: the decoding routines below assumes that surface.width = surface.pitch */
switch (bitmap_frame_type) {
cin->bitmap_table[CIN_CUR_BMP], cin->bitmap_size);
break;
case 38:
- cin_decode_lzss(buf, bitmap_frame_size,
- cin->bitmap_table[CIN_CUR_BMP], cin->bitmap_size);
+ res = cin_decode_lzss(buf, bitmap_frame_size,
+ cin->bitmap_table[CIN_CUR_BMP],
+ cin->bitmap_size);
+ if (res < 0)
+ return res;
break;
case 39:
- cin_decode_lzss(buf, bitmap_frame_size,
- cin->bitmap_table[CIN_CUR_BMP], cin->bitmap_size);
+ res = cin_decode_lzss(buf, bitmap_frame_size,
+ cin->bitmap_table[CIN_CUR_BMP],
+ cin->bitmap_size);
+ if (res < 0)
+ return res;
cin_apply_delta_data(cin->bitmap_table[CIN_PRE_BMP],
cin->bitmap_table[CIN_CUR_BMP], cin->bitmap_size);
break;
}
+ cin->frame.buffer_hints = FF_BUFFER_HINTS_VALID | FF_BUFFER_HINTS_PRESERVE | FF_BUFFER_HINTS_REUSABLE;
+ if (avctx->reget_buffer(avctx, &cin->frame)) {
+ av_log(cin->avctx, AV_LOG_ERROR, "delphinecinvideo: reget_buffer() failed to allocate a frame\n");
+ return -1;
+ }
+
+ memcpy(cin->frame.data[1], cin->palette, sizeof(cin->palette));
+ cin->frame.palette_has_changed = 1;
for (y = 0; y < cin->avctx->height; ++y)
memcpy(cin->frame.data[0] + (cin->avctx->height - 1 - y) * cin->frame.linesize[0],
cin->bitmap_table[CIN_CUR_BMP] + y * cin->avctx->width,
cin->avctx->width);
- SWAP(uint8_t *, cin->bitmap_table[CIN_CUR_BMP], cin->bitmap_table[CIN_PRE_BMP]);
+ FFSWAP(uint8_t *, cin->bitmap_table[CIN_CUR_BMP], cin->bitmap_table[CIN_PRE_BMP]);
- *data_size = sizeof(AVFrame);
+ *got_frame = 1;
*(AVFrame *)data = cin->frame;
return buf_size;
}
-static int cinvideo_decode_end(AVCodecContext *avctx)
+static av_cold int cinvideo_decode_end(AVCodecContext *avctx)
{
- CinVideoContext *cin = (CinVideoContext *)avctx->priv_data;
+ CinVideoContext *cin = avctx->priv_data;
int i;
if (cin->frame.data[0])
return 0;
}
-static int cinaudio_decode_init(AVCodecContext *avctx)
+static av_cold int cinaudio_decode_init(AVCodecContext *avctx)
{
- CinAudioContext *cin = (CinAudioContext *)avctx->priv_data;
+ CinAudioContext *cin = avctx->priv_data;
- cin->avctx = avctx;
cin->initial_decode_frame = 1;
- cin->delta = 0;
+ cin->delta = 0;
+ avctx->sample_fmt = AV_SAMPLE_FMT_S16;
+ avctx->channels = 1;
+ avctx->channel_layout = AV_CH_LAYOUT_MONO;
return 0;
}
-static int cinaudio_decode_frame(AVCodecContext *avctx,
- void *data, int *data_size,
- uint8_t *buf, int buf_size)
+static int cinaudio_decode_frame(AVCodecContext *avctx, void *data,
+ int *got_frame_ptr, AVPacket *avpkt)
{
- CinAudioContext *cin = (CinAudioContext *)avctx->priv_data;
- uint8_t *src = buf;
- int16_t *samples = (int16_t *)data;
+ AVFrame *frame = data;
+ const uint8_t *buf = avpkt->data;
+ CinAudioContext *cin = avctx->priv_data;
+ const uint8_t *buf_end = buf + avpkt->size;
+ int16_t *samples;
+ int delta, ret;
+
+ /* get output buffer */
+ frame->nb_samples = avpkt->size - cin->initial_decode_frame;
+ if ((ret = ff_get_buffer(avctx, frame)) < 0) {
+ av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
+ return ret;
+ }
+ samples = (int16_t *)frame->data[0];
+ delta = cin->delta;
if (cin->initial_decode_frame) {
cin->initial_decode_frame = 0;
- cin->delta = (int16_t)LE_16(src); src += 2;
- *samples++ = cin->delta;
- buf_size -= 2;
+ delta = sign_extend(AV_RL16(buf), 16);
+ buf += 2;
+ *samples++ = delta;
}
- while (buf_size > 0) {
- cin->delta += cinaudio_delta16_table[*src++];
- cin->delta = clip(cin->delta, -32768, 32767);
- *samples++ = cin->delta;
- --buf_size;
+ while (buf < buf_end) {
+ delta += cinaudio_delta16_table[*buf++];
+ delta = av_clip_int16(delta);
+ *samples++ = delta;
}
+ cin->delta = delta;
- *data_size = (uint8_t *)samples - (uint8_t *)data;
+ *got_frame_ptr = 1;
- return src - buf;
+ return avpkt->size;
}
-AVCodec dsicinvideo_decoder = {
- "dsicinvideo",
- CODEC_TYPE_VIDEO,
- CODEC_ID_DSICINVIDEO,
- sizeof(CinVideoContext),
- cinvideo_decode_init,
- NULL,
- cinvideo_decode_end,
- cinvideo_decode_frame,
- CODEC_CAP_DR1,
+AVCodec ff_dsicinvideo_decoder = {
+ .name = "dsicinvideo",
+ .type = AVMEDIA_TYPE_VIDEO,
+ .id = AV_CODEC_ID_DSICINVIDEO,
+ .priv_data_size = sizeof(CinVideoContext),
+ .init = cinvideo_decode_init,
+ .close = cinvideo_decode_end,
+ .decode = cinvideo_decode_frame,
+ .capabilities = CODEC_CAP_DR1,
+ .long_name = NULL_IF_CONFIG_SMALL("Delphine Software International CIN video"),
};
-AVCodec dsicinaudio_decoder = {
- "dsicinaudio",
- CODEC_TYPE_AUDIO,
- CODEC_ID_DSICINAUDIO,
- sizeof(CinAudioContext),
- cinaudio_decode_init,
- NULL,
- NULL,
- cinaudio_decode_frame,
+AVCodec ff_dsicinaudio_decoder = {
+ .name = "dsicinaudio",
+ .type = AVMEDIA_TYPE_AUDIO,
+ .id = AV_CODEC_ID_DSICINAUDIO,
+ .priv_data_size = sizeof(CinAudioContext),
+ .init = cinaudio_decode_init,
+ .decode = cinaudio_decode_frame,
+ .capabilities = CODEC_CAP_DR1,
+ .long_name = NULL_IF_CONFIG_SMALL("Delphine Software International CIN audio"),
};
projects / ffmpeg / blobdiff