*/
/**
- * @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:
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <unistd.h>
+#include "libavutil/intreadwrite.h"
#include "avcodec.h"
#define VMD_HEADER_SIZE 0x330
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,
- const uint8_t *buf, int buf_size)
+ AVPacket *avpkt)
{
+ const uint8_t *buf = avpkt->data;
+ int buf_size = avpkt->size;
VmdVideoContext *s = avctx->priv_data;
s->buf = buf;
* Audio Decoder
*/
+#define BLOCK_TYPE_AUDIO 1
+#define BLOCK_TYPE_INITIAL 2
+#define BLOCK_TYPE_SILENCE 3
+
typedef struct VmdAudioContext {
AVCodecContext *avctx;
int channels;
s->avctx = avctx;
s->channels = avctx->channels;
- s->bits = avctx->bits_per_sample;
+ s->bits = avctx->bits_per_coded_sample;
s->block_align = avctx->block_align;
+ avctx->sample_fmt = AV_SAMPLE_FMT_S16;
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);
}
static void vmdaudio_decode_audio(VmdAudioContext *s, unsigned char *data,
- const uint8_t *buf, int stereo)
+ const uint8_t *buf, int buf_size, int stereo)
{
int i;
int chan = 0;
int16_t *out = (int16_t*)data;
- for(i = 0; i < s->block_align; i++) {
+ for(i = 0; i < buf_size; i++) {
if(buf[i] & 0x80)
s->predictors[chan] -= vmdaudio_table[buf[i] & 0x7F];
else
}
static int vmdaudio_loadsound(VmdAudioContext *s, unsigned char *data,
- const uint8_t *buf, int silence)
+ const uint8_t *buf, int silent_chunks, int data_size)
{
- int bytes_decoded = 0;
int i;
+ int silent_size = s->block_align * silent_chunks * 2;
-// if (silence)
-// av_log(s->avctx, AV_LOG_INFO, "silent block!\n");
- if (s->channels == 2) {
-
- /* stereo handling */
- if (silence) {
- memset(data, 0, s->block_align * 2);
- } else {
- if (s->bits == 16)
- vmdaudio_decode_audio(s, data, buf, 1);
- else {
- /* copy the data but convert it to signed */
- for (i = 0; i < s->block_align; i++){
- *data++ = buf[i] + 0x80;
- *data++ = buf[i] + 0x80;
- }
- }
- }
- } else {
- bytes_decoded = s->block_align * 2;
-
- /* mono handling */
- if (silence) {
- memset(data, 0, s->block_align * 2);
- } else {
- if (s->bits == 16) {
- vmdaudio_decode_audio(s, data, buf, 0);
- } else {
- /* copy the data but convert it to signed */
- for (i = 0; i < s->block_align; i++){
- *data++ = buf[i] + 0x80;
- *data++ = buf[i] + 0x80;
- }
- }
+ if (silent_chunks) {
+ memset(data, 0, silent_size);
+ data += silent_size;
+ }
+ if (s->bits == 16)
+ vmdaudio_decode_audio(s, data, buf, data_size, s->channels == 2);
+ else {
+ /* copy the data but convert it to signed */
+ for (i = 0; i < data_size; i++){
+ *data++ = buf[i] + 0x80;
+ *data++ = buf[i] + 0x80;
}
}
- return s->block_align * 2;
+ return silent_size + data_size * 2;
}
static int vmdaudio_decode_frame(AVCodecContext *avctx,
void *data, int *data_size,
- const uint8_t *buf, int buf_size)
+ AVPacket *avpkt)
{
+ const uint8_t *buf = avpkt->data;
+ int buf_size = avpkt->size;
VmdAudioContext *s = avctx->priv_data;
+ int block_type;
unsigned char *output_samples = (unsigned char *)data;
- /* point to the start of the encoded data */
- const unsigned char *p = buf + 16;
-
- if (buf_size < 16)
+ if (buf_size < 16) {
+ av_log(avctx, AV_LOG_WARNING, "skipping small junk packet\n");
+ *data_size = 0;
return buf_size;
+ }
- if (buf[6] == 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;
+
+ if (block_type == BLOCK_TYPE_AUDIO) {
/* the chunk contains audio */
- *data_size = vmdaudio_loadsound(s, output_samples, p, 0);
- } else if (buf[6] == 2) {
- /* the chunk may contain audio */
- p += 4;
- *data_size = vmdaudio_loadsound(s, output_samples, p, (buf_size == 16));
- output_samples += (s->block_align * s->bits / 8);
- } else if (buf[6] == 3) {
+ *data_size = vmdaudio_loadsound(s, output_samples, buf, 0, buf_size);
+ } else if (block_type == BLOCK_TYPE_INITIAL) {
+ /* initial chunk, may contain audio and silence */
+ uint32_t flags = AV_RB32(buf);
+ int silent_chunks = av_popcount(flags);
+ buf += 4;
+ buf_size -= 4;
+ if(*data_size < (s->block_align*silent_chunks + buf_size) * 2)
+ return -1;
+ *data_size = vmdaudio_loadsound(s, output_samples, buf, silent_chunks, buf_size);
+ } else if (block_type == BLOCK_TYPE_SILENCE) {
/* silent chunk */
- *data_size = vmdaudio_loadsound(s, output_samples, p, 1);
+ *data_size = vmdaudio_loadsound(s, output_samples, buf, 1, 0);
}
- return buf_size;
+ return avpkt->size;
}
* Public Data Structures
*/
-AVCodec vmdvideo_decoder = {
+AVCodec ff_vmdvideo_decoder = {
"vmdvideo",
- CODEC_TYPE_VIDEO,
+ AVMEDIA_TYPE_VIDEO,
CODEC_ID_VMDVIDEO,
sizeof(VmdVideoContext),
vmdvideo_decode_init,
.long_name = NULL_IF_CONFIG_SMALL("Sierra VMD video"),
};
-AVCodec vmdaudio_decoder = {
+AVCodec ff_vmdaudio_decoder = {
"vmdaudio",
- CODEC_TYPE_AUDIO,
+ AVMEDIA_TYPE_AUDIO,
CODEC_ID_VMDAUDIO,
sizeof(VmdAudioContext),
vmdaudio_decode_init,
projects / ffmpeg / blobdiff