comparison vmdav.c @ 1882:5456ab242388 libavcodec

minor VMD system update; still not perfect, but should not crash either

1881:39ad6cd5d4a6

/**
 * @file vmdvideo.c
 * Sierra VMD audio & video decoders
 * by Vladimir "VAG" Gneushev (vagsoft at mail.ru)
 *
 * 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 
 * information record from the VMD file.
 *
 * The audio decoder, like the video decoder, expects each encoded data
 * chunk to be prepended with the approriate 16-byte frame information
 * record from the VMD file. It does not require the 0x330-byte VMD file
 * header, but it does need the audio setup parameters passed in through
 * normal libavcodec API means.
 */

#define printf(...) {} //(f)printf() usage is forbidden in libavcodec, use av_log
#define fprintf(...) {} 

#define VMD_HEADER_SIZE 0x330
#define PALETTE_COUNT 256

#define LE_16(x)  ((((uint8_t*)(x))[1] << 8) | ((uint8_t*)(x))[0])
#define LE_32(x)  ((((uint8_t*)(x))[3] << 24) | \
                   (((uint8_t*)(x))[2] << 16) | \
                   (((uint8_t*)(x))[1] << 8) | \
                    ((uint8_t*)(x))[0])

/*
 * Video Decoder
 */

                do {
                    len = *pb++;
                    if (len & 0x80) {
                        len = (len & 0x7F) + 1;
                        if (*pb++ == 0xFF)
                            len = rle_unpack(pb, dp, len);
                        else
                            memcpy(&dp[ofs], pb, len);
                        pb += len;
                        ofs += len;
                    } else {

    VmdVideoContext *s = (VmdVideoContext *)avctx->priv_data;

    s->buf = buf;
    s->size = buf_size;

    s->frame.reference = 1;
    if (avctx->get_buffer(avctx, &s->frame)) {
        printf ("  VMD Video: get_buffer() failed\n");
        return -1;
    }

    s->channels = avctx->channels;
    s->bits = avctx->bits_per_sample;
    s->block_align = avctx->block_align;

printf ("  %d channels, %d bits/sample, block align = %d\n",
  s->channels, s->bits, s->block_align);

    /* set up the steps8 and steps16 tables */
    for (i = 0; i < 8; i++) {
        if (i < 4)
            s->steps8[i] = i;

static void vmdaudio_decode_audio(VmdAudioContext *s, unsigned char *data,
    uint8_t *buf, int ratio) {

}

static void vmdaudio_loadsound(VmdAudioContext *s, unsigned char *data,
    uint8_t *buf, int silence)
{
    if (s->channels == 2) {
        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);
        }
    } else {
    }
}

static int vmdaudio_decode_frame(AVCodecContext *avctx,
                                 void *data, int *data_size,
                                 uint8_t *buf, int buf_size)

    /* point to the start of the encoded data */
    unsigned char *p = buf + 16;
    unsigned char *p_end = buf + buf_size;

    if (buf[6] == 1) {
        /* the chunk contains audio */
        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)
                /* audio */
                vmdaudio_loadsound(s, output_samples, p, 1);
            else
                /* silence */
                vmdaudio_loadsound(s, output_samples, p, 0);
            p += s->block_align;
            output_samples += (s->block_align * s->bits / 8);
            sound_flags >>= 1;
        }
    } else if (buf[6] == 3) {
        /* silent chunk */
        vmdaudio_loadsound(s, output_samples, p, 1);
    }


//    *datasize = ;
    return buf_size;
}


/*

1882:5456ab242388

/**
 * @file vmdvideo.c
 * Sierra VMD audio & video decoders
 * by Vladimir "VAG" Gneushev (vagsoft at mail.ru)
 * for more information on the Sierra VMD format, visit:
 *   http://www.pcisys.net/~melanson/codecs/
 *
 * 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 
 * information record from the VMD file.
 *
 * The audio decoder, like the video decoder, expects each encoded data
 * chunk to be prepended with the appropriate 16-byte frame information
 * record from the VMD file. It does not require the 0x330-byte VMD file
 * header, but it does need the audio setup parameters passed in through
 * normal libavcodec API means.
 */

#define printf(...) {} //(f)printf() usage is forbidden in libavcodec, use av_log
#define fprintf(...) {} 

#define VMD_HEADER_SIZE 0x330
#define PALETTE_COUNT 256

/*
 * Video Decoder
 */

                do {
                    len = *pb++;
                    if (len & 0x80) {
                        len = (len & 0x7F) + 1;
                        if (*pb++ == 0xFF)
                            len = rle_unpack(pb, &dp[ofs], len);
                        else
                            memcpy(&dp[ofs], pb, len);
                        pb += len;
                        ofs += len;
                    } else {

    VmdVideoContext *s = (VmdVideoContext *)avctx->priv_data;

    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)) {
        printf ("  VMD Video: get_buffer() failed\n");
        return -1;
    }

    s->channels = avctx->channels;
    s->bits = avctx->bits_per_sample;
    s->block_align = avctx->block_align;

printf ("  %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;

static void vmdaudio_decode_audio(VmdAudioContext *s, unsigned char *data,
    uint8_t *buf, int ratio) {

}

static int vmdaudio_loadsound(VmdAudioContext *s, unsigned char *data,
    uint8_t *buf, int silence)
{
    int bytes_decoded = 0;
    int i;

if (silence)
  printf (" 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);
        } else {
            if (silence)
                memset(data, 0, s->block_align * 2);
            else
                vmdaudio_decode_audio(s, data, buf, 1);
        }
    } else {

        /* 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;
            }
        } else {
            if (s->bits == 16) {
            } 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;
}

static int vmdaudio_decode_frame(AVCodecContext *avctx,
                                 void *data, int *data_size,
                                 uint8_t *buf, int buf_size)

    /* point to the start of the encoded data */
    unsigned char *p = buf + 16;
    unsigned char *p_end = buf + buf_size;

printf ("    processing audio frame with %d bytes\n", buf_size);
    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);
    } else if (buf[6] == 2) {
printf ("  hey! audio case #2\n");
        /* 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;
            }
            output_samples += (s->block_align * s->bits / 8);
            sound_flags >>= 1;
        }
    } else if (buf[6] == 3) {
printf ("  hey! audio case #3\n");
        /* silent chunk */
        *data_size = vmdaudio_loadsound(s, output_samples, p, 1);
    }

printf ("      final sample count = %d, byte count = %d\n", (*data_size) / 2,
  *data_size);
    return buf_size;
}


/*