*
* 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*/
* 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
unsigned char palette[PALETTE_COUNT * 4];
unsigned char *unpack_buffer;
+ int unpack_buffer_size;
} VmdVideoContext;
#define QUEUE_SIZE 0x1000
#define QUEUE_MASK 0x0FFF
-static void lz_unpack(unsigned char *src, unsigned char *dest)
+static void lz_unpack(unsigned char *src, unsigned char *dest, int dest_len)
{
unsigned char *s;
unsigned char *d;
+ unsigned char *d_end;
unsigned char queue[QUEUE_SIZE];
unsigned int qpos;
unsigned int dataleft;
s = src;
d = dest;
+ d_end = d + dest_len;
dataleft = LE_32(s);
s += 4;
memset(queue, QUEUE_SIZE, 0x20);
while (dataleft > 0) {
tag = *s++;
if ((tag == 0xFF) && (dataleft > 8)) {
+ if (d + 8 > d_end)
+ return;
for (i = 0; i < 8; i++) {
queue[qpos++] = *d++ = *s++;
qpos &= QUEUE_MASK;
if (dataleft == 0)
break;
if (tag & 0x01) {
+ if (d + 1 > d_end)
+ return;
queue[qpos++] = *d++ = *s++;
qpos &= QUEUE_MASK;
dataleft--;
chainlen = (*s++ & 0x0F) + 3;
if (chainlen == speclen)
chainlen = *s++ + 0xF + 3;
+ if (d + chainlen > d_end)
+ return;
for (j = 0; j < chainlen; j++) {
*d = queue[chainofs++ & QUEUE_MASK];
queue[qpos++] = *d++;
}
}
-static int rle_unpack(unsigned char *src, unsigned char *dest, int len)
+static int rle_unpack(unsigned char *src, unsigned char *dest,
+ int src_len, int dest_len)
{
unsigned char *ps;
unsigned char *pd;
int i, l;
+ unsigned char *dest_end = dest + dest_len;
ps = src;
pd = dest;
- if (len & 1)
+ if (src_len & 1)
*pd++ = *ps++;
- len >>= 1;
+ src_len >>= 1;
i = 0;
do {
l = *ps++;
if (l & 0x80) {
l = (l & 0x7F) * 2;
+ if (pd + l > dest_end)
+ return (ps - src);
memcpy(pd, ps, l);
ps += l;
pd += l;
} else {
+ if (pd + i > dest_end)
+ return (ps - src);
for (i = 0; i < l; i++) {
*pd++ = ps[0];
*pd++ = ps[1];
ps += 2;
}
i += l;
- } while (i < len);
+ } while (i < src_len);
return (ps - src);
}
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]);
if (frame_x || frame_y || (frame_width != s->avctx->width) ||
(frame_height != s->avctx->height)) {
- memcpy(s->frame.data[0], s->prev_frame.data[0],
+ memcpy(s->frame.data[0], s->prev_frame.data[0],
s->avctx->height * s->frame.linesize[0]);
}
pb = p;
meth = *pb++;
if (meth & 0x80) {
- lz_unpack(pb, s->unpack_buffer);
+ lz_unpack(pb, s->unpack_buffer, s->unpack_buffer_size);
meth &= 0x7F;
pb = s->unpack_buffer;
}
dp = &s->frame.data[0][frame_y * s->frame.linesize[0] + frame_x];
+ dp_size = s->frame.linesize[0] * s->avctx->height;
pp = &s->prev_frame.data[0][frame_y * s->prev_frame.linesize[0] + frame_x];
switch (meth) {
case 1:
len = *pb++;
if (len & 0x80) {
len = (len & 0x7F) + 1;
+ if (ofs + len > frame_width)
+ return;
memcpy(&dp[ofs], pb, len);
pb += len;
ofs += len;
} else {
/* interframe pixel copy */
+ if (ofs + len + 1 > frame_width)
+ return;
memcpy(&dp[ofs], &pp[ofs], len + 1);
ofs += len + 1;
}
if (len & 0x80) {
len = (len & 0x7F) + 1;
if (*pb++ == 0xFF)
- len = rle_unpack(pb, &dp[ofs], len);
+ len = rle_unpack(pb, &dp[ofs], len, frame_width - ofs);
else
memcpy(&dp[ofs], pb, len);
pb += len;
ofs += len;
} else {
/* interframe pixel copy */
+ if (ofs + len + 1 > frame_width)
+ return;
memcpy(&dp[ofs], &pp[ofs], len + 1);
ofs += len + 1;
}
/* 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 = av_malloc(LE_32(&vmd_header[800]));
+ s->unpack_buffer_size = LE_32(&vmd_header[800]);
+ s->unpack_buffer = av_malloc(s->unpack_buffer_size);
if (!s->unpack_buffer)
return -1;
int channels;
int bits;
int block_align;
- unsigned char steps8[16];
- unsigned short steps16[16];
- unsigned short steps128[256];
- short predictors[2];
+ int predictors[2];
} VmdAudioContext;
+static 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 int vmdaudio_decode_init(AVCodecContext *avctx)
{
VmdAudioContext *s = (VmdAudioContext *)avctx->priv_data;
- int i;
s->avctx = avctx;
s->channels = avctx->channels;
s->block_align = avctx->block_align;
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);
-
- /* 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);
- }
-
- /* 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->channels, s->bits, s->block_align, avctx->sample_rate);
return 0;
}
static void vmdaudio_decode_audio(VmdAudioContext *s, unsigned char *data,
- uint8_t *buf, int ratio) {
+ uint8_t *buf, int stereo)
+{
+ int i;
+ int chan = 0;
+ int16_t *out = (int16_t*)data;
+ for(i = 0; i < s->block_align; i++) {
+ if(buf[i] & 0x80)
+ s->predictors[chan] -= vmdaudio_table[buf[i] & 0x7F];
+ else
+ s->predictors[chan] += vmdaudio_table[buf[i]];
+ s->predictors[chan] = clip(s->predictors[chan], -32768, 32767);
+ out[i] = s->predictors[chan];
+ chan ^= stereo;
+ }
}
static int vmdaudio_loadsound(VmdAudioContext *s, unsigned char *data,
int bytes_decoded = 0;
int i;
- if (silence)
- av_log(s->avctx, AV_LOG_INFO, "silent block!\n");
+// if (silence)
+// av_log(s->avctx, AV_LOG_INFO, "silent block!\n");
if (s->channels == 2) {
/* 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);
+ if (silence) {
+ memset(data, 0, s->block_align * 2);
} else {
- 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[i * 2 + 1] = buf[i] + 0x80;
}
} else {
+ bytes_decoded = s->block_align * 2;
/* 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;
- }
+ 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[i * 2 + 1] = buf[i] + 0x80;
- bytes_decoded = s->block_align * 2;
}
}
}
- return bytes_decoded;
+ return s->block_align * 2;
}
static int vmdaudio_decode_frame(AVCodecContext *avctx,
if (buf_size < 16)
return buf_size;
- *data_size = 0;
if (buf[6] == 1) {
/* the chunk contains audio */
*data_size = vmdaudio_loadsound(s, output_samples, p, 0);
projects / ffmpeg / blobdiff