* Sierra VMD Audio & Video Decoders
* Copyright (C) 2004 the ffmpeg project
*
- * This library is free software; you can redistribute it and/or
+ * This file is part of Libav.
+ *
+ * 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 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
- * This library 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 this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
/**
- * @file vmdvideo.c
+ * @file
* Sierra VMD audio & video decoders
* by Vladimir "VAG" Gneushev (vagsoft at mail.ru)
* for more information on the Sierra VMD format, visit:
* The video decoder outputs PAL8 colorspace data. The decoder expects
* a 0x330-byte VMD file header to be transmitted via extradata during
* codec initialization. Each encoded frame that is sent to this decoder
- * is expected to be prepended with the appropriate 16-byte frame
+ * is expected to be prepended with the appropriate 16-byte frame
* information record from the VMD file.
*
* The audio decoder, like the video decoder, expects each encoded data
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <unistd.h>
-#include "common.h"
+#include "libavutil/channel_layout.h"
+#include "libavutil/common.h"
+#include "libavutil/intreadwrite.h"
#include "avcodec.h"
-#include "dsputil.h"
+#include "internal.h"
+#include "bytestream.h"
#define VMD_HEADER_SIZE 0x330
#define PALETTE_COUNT 256
typedef struct VmdVideoContext {
AVCodecContext *avctx;
- DSPContext dsp;
- AVFrame frame;
AVFrame prev_frame;
- unsigned char *buf;
+ const unsigned char *buf;
int size;
unsigned char palette[PALETTE_COUNT * 4];
unsigned char *unpack_buffer;
int unpack_buffer_size;
+ int x_off, y_off;
} VmdVideoContext;
#define QUEUE_SIZE 0x1000
#define QUEUE_MASK 0x0FFF
-static void lz_unpack(unsigned char *src, unsigned char *dest, int dest_len)
+static void lz_unpack(const unsigned char *src, int src_len,
+ unsigned char *dest, int dest_len)
{
- unsigned char *s;
unsigned char *d;
unsigned char *d_end;
unsigned char queue[QUEUE_SIZE];
unsigned int speclen;
unsigned char tag;
unsigned int i, j;
+ GetByteContext gb;
- s = src;
+ bytestream2_init(&gb, src, src_len);
d = dest;
d_end = d + dest_len;
- dataleft = LE_32(s);
- s += 4;
- memset(queue, QUEUE_SIZE, 0x20);
- if (LE_32(s) == 0x56781234) {
- s += 4;
+ dataleft = bytestream2_get_le32(&gb);
+ memset(queue, 0x20, QUEUE_SIZE);
+ if (bytestream2_get_bytes_left(&gb) < 4)
+ return;
+ if (bytestream2_peek_le32(&gb) == 0x56781234) {
+ bytestream2_get_le32(&gb);
qpos = 0x111;
speclen = 0xF + 3;
} else {
speclen = 100; /* no speclen */
}
- while (dataleft > 0) {
- tag = *s++;
+ while (dataleft > 0 && bytestream2_get_bytes_left(&gb) > 0) {
+ tag = bytestream2_get_byteu(&gb);
if ((tag == 0xFF) && (dataleft > 8)) {
- if (d + 8 > d_end)
+ if (d + 8 > d_end || bytestream2_get_bytes_left(&gb) < 8)
return;
for (i = 0; i < 8; i++) {
- queue[qpos++] = *d++ = *s++;
+ queue[qpos++] = *d++ = bytestream2_get_byteu(&gb);
qpos &= QUEUE_MASK;
}
dataleft -= 8;
if (dataleft == 0)
break;
if (tag & 0x01) {
- if (d + 1 > d_end)
+ if (d + 1 > d_end || bytestream2_get_bytes_left(&gb) < 1)
return;
- queue[qpos++] = *d++ = *s++;
+ queue[qpos++] = *d++ = bytestream2_get_byte(&gb);
qpos &= QUEUE_MASK;
dataleft--;
} else {
- chainofs = *s++;
- chainofs |= ((*s & 0xF0) << 4);
- chainlen = (*s++ & 0x0F) + 3;
- if (chainlen == speclen)
- chainlen = *s++ + 0xF + 3;
+ chainofs = bytestream2_get_byte(&gb);
+ chainofs |= ((bytestream2_peek_byte(&gb) & 0xF0) << 4);
+ chainlen = (bytestream2_get_byte(&gb) & 0x0F) + 3;
+ if (chainlen == speclen) {
+ chainlen = bytestream2_get_byte(&gb) + 0xF + 3;
+ }
if (d + chainlen > d_end)
return;
for (j = 0; j < chainlen; j++) {
}
}
-static int rle_unpack(unsigned char *src, unsigned char *dest,
- int src_len, int dest_len)
+static int rle_unpack(const unsigned char *src, unsigned char *dest,
+ int src_count, int src_size, int dest_len)
{
- unsigned char *ps;
unsigned char *pd;
int i, l;
unsigned char *dest_end = dest + dest_len;
+ GetByteContext gb;
- ps = src;
+ bytestream2_init(&gb, src, src_size);
pd = dest;
- if (src_len & 1)
- *pd++ = *ps++;
+ if (src_count & 1) {
+ if (bytestream2_get_bytes_left(&gb) < 1)
+ return 0;
+ *pd++ = bytestream2_get_byteu(&gb);
+ }
- src_len >>= 1;
+ src_count >>= 1;
i = 0;
do {
- l = *ps++;
+ if (bytestream2_get_bytes_left(&gb) < 1)
+ break;
+ l = bytestream2_get_byteu(&gb);
if (l & 0x80) {
l = (l & 0x7F) * 2;
- if (pd + l > dest_end)
- return (ps - src);
- memcpy(pd, ps, l);
- ps += l;
+ if (pd + l > dest_end || bytestream2_get_bytes_left(&gb) < l)
+ return bytestream2_tell(&gb);
+ bytestream2_get_buffer(&gb, pd, l);
pd += l;
} else {
- if (pd + i > dest_end)
- return (ps - src);
+ if (pd + i > dest_end || bytestream2_get_bytes_left(&gb) < 2)
+ return bytestream2_tell(&gb);
for (i = 0; i < l; i++) {
- *pd++ = ps[0];
- *pd++ = ps[1];
+ *pd++ = bytestream2_get_byteu(&gb);
+ *pd++ = bytestream2_get_byteu(&gb);
}
- ps += 2;
+ bytestream2_skip(&gb, 2);
}
i += l;
- } while (i < src_len);
+ } while (i < src_count);
- return (ps - src);
+ return bytestream2_tell(&gb);
}
-static void vmd_decode(VmdVideoContext *s)
+static void vmd_decode(VmdVideoContext *s, AVFrame *frame)
{
int i;
unsigned int *palette32;
unsigned char r, g, b;
- /* point to the start of the encoded data */
- unsigned char *p = s->buf + 16;
+ GetByteContext gb;
- unsigned char *pb;
unsigned char meth;
unsigned char *dp; /* pointer to current frame */
unsigned char *pp; /* pointer to previous frame */
int frame_x, frame_y;
int frame_width, frame_height;
- int dp_size;
- frame_x = LE_16(&s->buf[6]);
- frame_y = LE_16(&s->buf[8]);
- frame_width = LE_16(&s->buf[10]) - frame_x + 1;
- frame_height = LE_16(&s->buf[12]) - frame_y + 1;
+ frame_x = AV_RL16(&s->buf[6]);
+ frame_y = AV_RL16(&s->buf[8]);
+ frame_width = AV_RL16(&s->buf[10]) - frame_x + 1;
+ frame_height = AV_RL16(&s->buf[12]) - frame_y + 1;
+ if (frame_x < 0 || frame_width < 0 ||
+ frame_x >= s->avctx->width ||
+ frame_width > s->avctx->width ||
+ frame_x + frame_width > s->avctx->width)
+ return;
+ if (frame_y < 0 || frame_height < 0 ||
+ frame_y >= s->avctx->height ||
+ frame_height > s->avctx->height ||
+ frame_y + frame_height > s->avctx->height)
+ return;
+
+ if ((frame_width == s->avctx->width && frame_height == s->avctx->height) &&
+ (frame_x || frame_y)) {
+
+ s->x_off = frame_x;
+ s->y_off = frame_y;
+ }
+ frame_x -= s->x_off;
+ frame_y -= s->y_off;
/* if only a certain region will be updated, copy the entire previous
* frame before the decode */
- if (frame_x || frame_y || (frame_width != s->avctx->width) ||
- (frame_height != s->avctx->height)) {
+ if (s->prev_frame.data[0] &&
+ (frame_x || frame_y || (frame_width != s->avctx->width) ||
+ (frame_height != s->avctx->height))) {
- memcpy(s->frame.data[0], s->prev_frame.data[0],
- s->avctx->height * s->frame.linesize[0]);
+ memcpy(frame->data[0], s->prev_frame.data[0],
+ s->avctx->height * frame->linesize[0]);
}
/* check if there is a new palette */
+ bytestream2_init(&gb, s->buf + 16, s->size - 16);
if (s->buf[15] & 0x02) {
- p += 2;
+ bytestream2_skip(&gb, 2);
palette32 = (unsigned int *)s->palette;
- for (i = 0; i < PALETTE_COUNT; i++) {
- r = *p++ * 4;
- g = *p++ * 4;
- b = *p++ * 4;
- palette32[i] = (r << 16) | (g << 8) | (b);
+ if (bytestream2_get_bytes_left(&gb) >= PALETTE_COUNT * 3) {
+ for (i = 0; i < PALETTE_COUNT; i++) {
+ r = bytestream2_get_byteu(&gb) * 4;
+ g = bytestream2_get_byteu(&gb) * 4;
+ b = bytestream2_get_byteu(&gb) * 4;
+ palette32[i] = (r << 16) | (g << 8) | (b);
+ }
}
s->size -= (256 * 3 + 2);
}
- if (s->size >= 0) {
+ if (s->size > 0) {
/* originally UnpackFrame in VAG's code */
- pb = p;
- meth = *pb++;
+ bytestream2_init(&gb, gb.buffer, s->buf + s->size - gb.buffer);
+ if (bytestream2_get_bytes_left(&gb) < 1)
+ return;
+ meth = bytestream2_get_byteu(&gb);
if (meth & 0x80) {
- lz_unpack(pb, s->unpack_buffer, s->unpack_buffer_size);
+ lz_unpack(gb.buffer, bytestream2_get_bytes_left(&gb),
+ s->unpack_buffer, s->unpack_buffer_size);
meth &= 0x7F;
- pb = s->unpack_buffer;
+ bytestream2_init(&gb, s->unpack_buffer, s->unpack_buffer_size);
}
- dp = &s->frame.data[0][frame_y * s->frame.linesize[0] + frame_x];
- dp_size = s->frame.linesize[0] * s->avctx->height;
+ dp = &frame->data[0][frame_y * frame->linesize[0] + frame_x];
pp = &s->prev_frame.data[0][frame_y * s->prev_frame.linesize[0] + frame_x];
switch (meth) {
case 1:
for (i = 0; i < frame_height; i++) {
ofs = 0;
do {
- len = *pb++;
+ len = bytestream2_get_byte(&gb);
if (len & 0x80) {
len = (len & 0x7F) + 1;
- if (ofs + len > frame_width)
+ if (ofs + len > frame_width || bytestream2_get_bytes_left(&gb) < len)
return;
- memcpy(&dp[ofs], pb, len);
- pb += len;
+ bytestream2_get_buffer(&gb, &dp[ofs], len);
ofs += len;
} else {
/* interframe pixel copy */
- if (ofs + len + 1 > frame_width)
+ if (ofs + len + 1 > frame_width || !s->prev_frame.data[0])
return;
memcpy(&dp[ofs], &pp[ofs], len + 1);
ofs += len + 1;
ofs, frame_width);
break;
}
- dp += s->frame.linesize[0];
+ dp += frame->linesize[0];
pp += s->prev_frame.linesize[0];
}
break;
case 2:
for (i = 0; i < frame_height; i++) {
- memcpy(dp, pb, frame_width);
- pb += frame_width;
- dp += s->frame.linesize[0];
+ bytestream2_get_buffer(&gb, dp, frame_width);
+ dp += frame->linesize[0];
pp += s->prev_frame.linesize[0];
}
break;
for (i = 0; i < frame_height; i++) {
ofs = 0;
do {
- len = *pb++;
+ len = bytestream2_get_byte(&gb);
if (len & 0x80) {
len = (len & 0x7F) + 1;
- if (*pb++ == 0xFF)
- len = rle_unpack(pb, &dp[ofs], len, frame_width - ofs);
+ if (bytestream2_get_byte(&gb) == 0xFF)
+ len = rle_unpack(gb.buffer, &dp[ofs],
+ len, bytestream2_get_bytes_left(&gb),
+ frame_width - ofs);
else
- memcpy(&dp[ofs], pb, len);
- pb += len;
- ofs += len;
+ bytestream2_get_buffer(&gb, &dp[ofs], len);
+ bytestream2_skip(&gb, len);
} else {
/* interframe pixel copy */
- if (ofs + len + 1 > frame_width)
+ if (ofs + len + 1 > frame_width || !s->prev_frame.data[0])
return;
memcpy(&dp[ofs], &pp[ofs], len + 1);
ofs += len + 1;
av_log(s->avctx, AV_LOG_ERROR, "VMD video: offset > width (%d > %d)\n",
ofs, frame_width);
}
- dp += s->frame.linesize[0];
+ dp += frame->linesize[0];
pp += s->prev_frame.linesize[0];
}
break;
}
}
-static int vmdvideo_decode_init(AVCodecContext *avctx)
+static av_cold int vmdvideo_decode_init(AVCodecContext *avctx)
{
- VmdVideoContext *s = (VmdVideoContext *)avctx->priv_data;
+ VmdVideoContext *s = avctx->priv_data;
int i;
unsigned int *palette32;
int palette_index = 0;
unsigned char *raw_palette;
s->avctx = avctx;
- avctx->pix_fmt = PIX_FMT_PAL8;
- avctx->has_b_frames = 0;
- dsputil_init(&s->dsp, avctx);
+ avctx->pix_fmt = AV_PIX_FMT_PAL8;
/* make sure the VMD header made it */
if (s->avctx->extradata_size != VMD_HEADER_SIZE) {
- av_log(s->avctx, AV_LOG_ERROR, "VMD video: expected extradata size of %d\n",
+ av_log(s->avctx, AV_LOG_ERROR, "VMD video: expected extradata size of %d\n",
VMD_HEADER_SIZE);
return -1;
}
vmd_header = (unsigned char *)avctx->extradata;
- s->unpack_buffer_size = LE_32(&vmd_header[800]);
+ s->unpack_buffer_size = AV_RL32(&vmd_header[800]);
s->unpack_buffer = av_malloc(s->unpack_buffer_size);
if (!s->unpack_buffer)
return -1;
palette32[i] = (r << 16) | (g << 8) | (b);
}
- s->frame.data[0] = s->prev_frame.data[0] = NULL;
-
return 0;
}
static int vmdvideo_decode_frame(AVCodecContext *avctx,
- void *data, int *data_size,
- uint8_t *buf, int buf_size)
+ void *data, int *got_frame,
+ AVPacket *avpkt)
{
- VmdVideoContext *s = (VmdVideoContext *)avctx->priv_data;
+ const uint8_t *buf = avpkt->data;
+ int buf_size = avpkt->size;
+ VmdVideoContext *s = avctx->priv_data;
+ AVFrame *frame = data;
+ int ret;
s->buf = buf;
s->size = buf_size;
if (buf_size < 16)
return buf_size;
- s->frame.reference = 1;
- if (avctx->get_buffer(avctx, &s->frame)) {
+ if ((ret = ff_get_buffer(avctx, frame, AV_GET_BUFFER_FLAG_REF)) < 0) {
av_log(s->avctx, AV_LOG_ERROR, "VMD Video: get_buffer() failed\n");
- return -1;
+ return ret;
}
- vmd_decode(s);
+ vmd_decode(s, frame);
/* make the palette available on the way out */
- memcpy(s->frame.data[1], s->palette, PALETTE_COUNT * 4);
-
- if (s->prev_frame.data[0])
- avctx->release_buffer(avctx, &s->prev_frame);
+ memcpy(frame->data[1], s->palette, PALETTE_COUNT * 4);
/* shuffle frames */
- s->prev_frame = s->frame;
+ av_frame_unref(&s->prev_frame);
+ if ((ret = av_frame_ref(&s->prev_frame, frame)) < 0)
+ return ret;
- *data_size = sizeof(AVFrame);
- *(AVFrame*)data = s->frame;
+ *got_frame = 1;
/* report that the buffer was completely consumed */
return buf_size;
}
-static int vmdvideo_decode_end(AVCodecContext *avctx)
+static av_cold int vmdvideo_decode_end(AVCodecContext *avctx)
{
- VmdVideoContext *s = (VmdVideoContext *)avctx->priv_data;
+ VmdVideoContext *s = avctx->priv_data;
- if (s->prev_frame.data[0])
- avctx->release_buffer(avctx, &s->prev_frame);
+ av_frame_unref(&s->prev_frame);
av_free(s->unpack_buffer);
return 0;
* Audio Decoder
*/
+#define BLOCK_TYPE_AUDIO 1
+#define BLOCK_TYPE_INITIAL 2
+#define BLOCK_TYPE_SILENCE 3
+
typedef struct VmdAudioContext {
- AVCodecContext *avctx;
- int channels;
- int bits;
- int block_align;
- unsigned char steps8[16];
- unsigned short steps16[16];
- unsigned short steps128[256];
- short predictors[2];
+ int out_bps;
+ int chunk_size;
} VmdAudioContext;
-static int vmdaudio_decode_init(AVCodecContext *avctx)
+static const uint16_t vmdaudio_table[128] = {
+ 0x000, 0x008, 0x010, 0x020, 0x030, 0x040, 0x050, 0x060, 0x070, 0x080,
+ 0x090, 0x0A0, 0x0B0, 0x0C0, 0x0D0, 0x0E0, 0x0F0, 0x100, 0x110, 0x120,
+ 0x130, 0x140, 0x150, 0x160, 0x170, 0x180, 0x190, 0x1A0, 0x1B0, 0x1C0,
+ 0x1D0, 0x1E0, 0x1F0, 0x200, 0x208, 0x210, 0x218, 0x220, 0x228, 0x230,
+ 0x238, 0x240, 0x248, 0x250, 0x258, 0x260, 0x268, 0x270, 0x278, 0x280,
+ 0x288, 0x290, 0x298, 0x2A0, 0x2A8, 0x2B0, 0x2B8, 0x2C0, 0x2C8, 0x2D0,
+ 0x2D8, 0x2E0, 0x2E8, 0x2F0, 0x2F8, 0x300, 0x308, 0x310, 0x318, 0x320,
+ 0x328, 0x330, 0x338, 0x340, 0x348, 0x350, 0x358, 0x360, 0x368, 0x370,
+ 0x378, 0x380, 0x388, 0x390, 0x398, 0x3A0, 0x3A8, 0x3B0, 0x3B8, 0x3C0,
+ 0x3C8, 0x3D0, 0x3D8, 0x3E0, 0x3E8, 0x3F0, 0x3F8, 0x400, 0x440, 0x480,
+ 0x4C0, 0x500, 0x540, 0x580, 0x5C0, 0x600, 0x640, 0x680, 0x6C0, 0x700,
+ 0x740, 0x780, 0x7C0, 0x800, 0x900, 0xA00, 0xB00, 0xC00, 0xD00, 0xE00,
+ 0xF00, 0x1000, 0x1400, 0x1800, 0x1C00, 0x2000, 0x3000, 0x4000
+};
+
+static av_cold int vmdaudio_decode_init(AVCodecContext *avctx)
{
- VmdAudioContext *s = (VmdAudioContext *)avctx->priv_data;
- int i;
+ VmdAudioContext *s = avctx->priv_data;
- s->avctx = avctx;
- s->channels = avctx->channels;
- s->bits = avctx->bits_per_sample;
- s->block_align = avctx->block_align;
+ if (avctx->channels < 1 || avctx->channels > 2) {
+ av_log(avctx, AV_LOG_ERROR, "invalid number of channels\n");
+ return AVERROR(EINVAL);
+ }
+ if (avctx->block_align < 1) {
+ av_log(avctx, AV_LOG_ERROR, "invalid block align\n");
+ return AVERROR(EINVAL);
+ }
- av_log(s->avctx, AV_LOG_DEBUG, "%d channels, %d bits/sample, block align = %d, sample rate = %d\n",
- s->channels, s->bits, s->block_align, avctx->sample_rate);
+ avctx->channel_layout = avctx->channels == 1 ? AV_CH_LAYOUT_MONO :
+ AV_CH_LAYOUT_STEREO;
- /* set up the steps8 and steps16 tables */
- for (i = 0; i < 8; i++) {
- if (i < 4)
- s->steps8[i] = i;
- else
- s->steps8[i] = s->steps8[i - 1] + i - 1;
-
- if (i == 0)
- s->steps16[i] = 0;
- else if (i == 1)
- s->steps16[i] = 4;
- else if (i == 2)
- s->steps16[i] = 16;
- else
- s->steps16[i] = 1 << (i + 4);
- }
+ if (avctx->bits_per_coded_sample == 16)
+ avctx->sample_fmt = AV_SAMPLE_FMT_S16;
+ else
+ avctx->sample_fmt = AV_SAMPLE_FMT_U8;
+ s->out_bps = av_get_bytes_per_sample(avctx->sample_fmt);
- /* set up the step128 table */
- s->steps128[0] = 0;
- s->steps128[1] = 8;
- for (i = 0x02; i <= 0x20; i++)
- s->steps128[i] = (i - 1) << 4;
- for (i = 0x21; i <= 0x60; i++)
- s->steps128[i] = (i + 0x1F) << 3;
- for (i = 0x61; i <= 0x70; i++)
- s->steps128[i] = (i - 0x51) << 6;
- for (i = 0x71; i <= 0x78; i++)
- s->steps128[i] = (i - 0x69) << 8;
- for (i = 0x79; i <= 0x7D; i++)
- s->steps128[i] = (i - 0x75) << 10;
- s->steps128[0x7E] = 0x3000;
- s->steps128[0x7F] = 0x4000;
-
- /* set up the negative half of each table */
- for (i = 0; i < 8; i++) {
- s->steps8[i + 8] = -s->steps8[i];
- s->steps16[i + 8] = -s->steps16[i];
- }
- for (i = 0; i < 128; i++)
- s->steps128[i + 128] = -s->steps128[i];
+ s->chunk_size = avctx->block_align + avctx->channels * (s->out_bps == 2);
+
+ av_log(avctx, AV_LOG_DEBUG, "%d channels, %d bits/sample, "
+ "block align = %d, sample rate = %d\n",
+ avctx->channels, avctx->bits_per_coded_sample, avctx->block_align,
+ avctx->sample_rate);
return 0;
}
-static void vmdaudio_decode_audio(VmdAudioContext *s, unsigned char *data,
- uint8_t *buf, int ratio) {
+static void decode_audio_s16(int16_t *out, const uint8_t *buf, int buf_size,
+ int channels)
+{
+ int ch;
+ const uint8_t *buf_end = buf + buf_size;
+ int predictor[2];
+ int st = channels - 1;
+
+ /* decode initial raw sample */
+ for (ch = 0; ch < channels; ch++) {
+ predictor[ch] = (int16_t)AV_RL16(buf);
+ buf += 2;
+ *out++ = predictor[ch];
+ }
+ /* decode DPCM samples */
+ ch = 0;
+ while (buf < buf_end) {
+ uint8_t b = *buf++;
+ if (b & 0x80)
+ predictor[ch] -= vmdaudio_table[b & 0x7F];
+ else
+ predictor[ch] += vmdaudio_table[b];
+ predictor[ch] = av_clip_int16(predictor[ch]);
+ *out++ = predictor[ch];
+ ch ^= st;
+ }
}
-static int vmdaudio_loadsound(VmdAudioContext *s, unsigned char *data,
- uint8_t *buf, int silence)
+static int vmdaudio_decode_frame(AVCodecContext *avctx, void *data,
+ int *got_frame_ptr, AVPacket *avpkt)
{
- int bytes_decoded = 0;
- int i;
-
- if (silence)
- av_log(s->avctx, AV_LOG_INFO, "silent block!\n");
- if (s->channels == 2) {
+ AVFrame *frame = data;
+ const uint8_t *buf = avpkt->data;
+ const uint8_t *buf_end;
+ int buf_size = avpkt->size;
+ VmdAudioContext *s = avctx->priv_data;
+ int block_type, silent_chunks, audio_chunks;
+ int ret;
+ uint8_t *output_samples_u8;
+ int16_t *output_samples_s16;
+
+ if (buf_size < 16) {
+ av_log(avctx, AV_LOG_WARNING, "skipping small junk packet\n");
+ *got_frame_ptr = 0;
+ return buf_size;
+ }
- /* stereo handling */
- if ((s->block_align & 0x01) == 0) {
- if (silence)
- memset(data, 0, s->block_align * 2);
- else
- vmdaudio_decode_audio(s, data, buf, 1);
- } else {
- if (silence)
- memset(data, 0, s->block_align * 2);
- else
- vmdaudio_decode_audio(s, data, buf, 1);
+ block_type = buf[6];
+ if (block_type < BLOCK_TYPE_AUDIO || block_type > BLOCK_TYPE_SILENCE) {
+ av_log(avctx, AV_LOG_ERROR, "unknown block type: %d\n", block_type);
+ return AVERROR(EINVAL);
+ }
+ buf += 16;
+ buf_size -= 16;
+
+ /* get number of silent chunks */
+ silent_chunks = 0;
+ if (block_type == BLOCK_TYPE_INITIAL) {
+ uint32_t flags;
+ if (buf_size < 4) {
+ av_log(avctx, AV_LOG_ERROR, "packet is too small\n");
+ return AVERROR(EINVAL);
}
- } else {
+ flags = AV_RB32(buf);
+ silent_chunks = av_popcount(flags);
+ buf += 4;
+ buf_size -= 4;
+ } else if (block_type == BLOCK_TYPE_SILENCE) {
+ silent_chunks = 1;
+ buf_size = 0; // should already be zero but set it just to be sure
+ }
- /* mono handling */
- if (silence) {
- if (s->bits == 16) {
- memset(data, 0, s->block_align * 2);
- bytes_decoded = s->block_align * 2;
- } else {
-// memset(data, 0x00, s->block_align);
-// bytes_decoded = s->block_align;
-memset(data, 0x00, s->block_align * 2);
-bytes_decoded = s->block_align * 2;
- }
+ /* ensure output buffer is large enough */
+ audio_chunks = buf_size / s->chunk_size;
+
+ /* get output buffer */
+ frame->nb_samples = ((silent_chunks + audio_chunks) * avctx->block_align) /
+ avctx->channels;
+ if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) {
+ av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
+ return ret;
+ }
+ output_samples_u8 = frame->data[0];
+ output_samples_s16 = (int16_t *)frame->data[0];
+
+ /* decode silent chunks */
+ if (silent_chunks > 0) {
+ int silent_size = avctx->block_align * silent_chunks;
+ if (s->out_bps == 2) {
+ memset(output_samples_s16, 0x00, silent_size * 2);
+ output_samples_s16 += silent_size;
} else {
- /* copy the data but convert it to signed */
- for (i = 0; i < s->block_align; i++)
- data[i * 2 + 1] = buf[i] + 0x80;
- bytes_decoded = s->block_align * 2;
+ memset(output_samples_u8, 0x80, silent_size);
+ output_samples_u8 += silent_size;
}
}
- return bytes_decoded;
-}
-
-static int vmdaudio_decode_frame(AVCodecContext *avctx,
- void *data, int *data_size,
- uint8_t *buf, int buf_size)
-{
- VmdAudioContext *s = (VmdAudioContext *)avctx->priv_data;
- unsigned int sound_flags;
- unsigned char *output_samples = (unsigned char *)data;
-
- /* point to the start of the encoded data */
- unsigned char *p = buf + 16;
- unsigned char *p_end = buf + buf_size;
-
- if (buf_size < 16)
- return buf_size;
-
- if (buf[6] == 1) {
- /* the chunk contains audio */
- *data_size = vmdaudio_loadsound(s, output_samples, p, 0);
- } else if (buf[6] == 2) {
- /* the chunk contains audio and silence mixed together */
- sound_flags = LE_32(p);
- p += 4;
-
- /* do something with extrabufs here? */
-
- while (p < p_end) {
- if (sound_flags & 0x01)
- /* silence */
- *data_size += vmdaudio_loadsound(s, output_samples, p, 1);
- else {
- /* audio */
- *data_size += vmdaudio_loadsound(s, output_samples, p, 0);
- p += s->block_align;
+ /* decode audio chunks */
+ if (audio_chunks > 0) {
+ buf_end = buf + buf_size;
+ while (buf + s->chunk_size <= buf_end) {
+ if (s->out_bps == 2) {
+ decode_audio_s16(output_samples_s16, buf, s->chunk_size,
+ avctx->channels);
+ output_samples_s16 += avctx->block_align;
+ } else {
+ memcpy(output_samples_u8, buf, s->chunk_size);
+ output_samples_u8 += avctx->block_align;
}
- output_samples += (s->block_align * s->bits / 8);
- sound_flags >>= 1;
+ buf += s->chunk_size;
}
- } else if (buf[6] == 3) {
- /* silent chunk */
- *data_size = vmdaudio_loadsound(s, output_samples, p, 1);
}
- return buf_size;
+ *got_frame_ptr = 1;
+
+ return avpkt->size;
}
* Public Data Structures
*/
-AVCodec vmdvideo_decoder = {
- "vmdvideo",
- CODEC_TYPE_VIDEO,
- CODEC_ID_VMDVIDEO,
- sizeof(VmdVideoContext),
- vmdvideo_decode_init,
- NULL,
- vmdvideo_decode_end,
- vmdvideo_decode_frame,
- CODEC_CAP_DR1,
+AVCodec ff_vmdvideo_decoder = {
+ .name = "vmdvideo",
+ .type = AVMEDIA_TYPE_VIDEO,
+ .id = AV_CODEC_ID_VMDVIDEO,
+ .priv_data_size = sizeof(VmdVideoContext),
+ .init = vmdvideo_decode_init,
+ .close = vmdvideo_decode_end,
+ .decode = vmdvideo_decode_frame,
+ .capabilities = CODEC_CAP_DR1,
+ .long_name = NULL_IF_CONFIG_SMALL("Sierra VMD video"),
};
-AVCodec vmdaudio_decoder = {
- "vmdaudio",
- CODEC_TYPE_AUDIO,
- CODEC_ID_VMDAUDIO,
- sizeof(VmdAudioContext),
- vmdaudio_decode_init,
- NULL,
- NULL,
- vmdaudio_decode_frame,
+AVCodec ff_vmdaudio_decoder = {
+ .name = "vmdaudio",
+ .type = AVMEDIA_TYPE_AUDIO,
+ .id = AV_CODEC_ID_VMDAUDIO,
+ .priv_data_size = sizeof(VmdAudioContext),
+ .init = vmdaudio_decode_init,
+ .decode = vmdaudio_decode_frame,
+ .capabilities = CODEC_CAP_DR1,
+ .long_name = NULL_IF_CONFIG_SMALL("Sierra VMD audio"),
};