comparison dpcm.c @ 1477:afc7baa19b62 libavcodec

fix Interplay DPCM (frames are intracoded, predictors do not carry forward to next block, initial predictors go to the output)

1476:72e115e94673

#include "avcodec.h"

typedef struct DPCMContext {
    int channels;
    short roq_square_array[256];
    int last_delta[2];
} DPCMContext;

#define SATURATE_S16(x)  if (x < -32768) x = -32768; \
  else if (x > 32767) x = 32767;
#define SE_16BIT(x)  if (x & 0x8000) x -= 0x10000;

                             void *data, int *data_size,
                             uint8_t *buf, int buf_size)
{
    DPCMContext *s = avctx->priv_data;
    int in, out = 0;
    int i;
    int predictor[2];
    int channel_number = 0;
    short *output_samples = data;
    int sequence_number;
    int shift[2];
    unsigned char byte;
    short diff;

    switch(avctx->codec->id) {

            channel_number ^= s->channels - 1;
        }
        break;

    case CODEC_ID_INTERPLAY_DPCM:
        in = 0;
        sequence_number = LE_16(&buf[in]);
        in += 6;  /* skip over the stream mask and stream length */
        if (sequence_number == 1) {
            predictor[0] = LE_16(&buf[in]);
            in += 2;
            SE_16BIT(predictor[0])
            if (s->channels == 2) {
                predictor[1] = LE_16(&buf[in]);
                SE_16BIT(predictor[1])
                in += 2;
            }
        } else {
            for (i = 0; i < s->channels; i++)
                predictor[i] = s->last_delta[i];
        }

        while (in < buf_size) {
            predictor[channel_number] += interplay_delta_table[buf[in++]];
            SATURATE_S16(predictor[channel_number]);
            output_samples[out++] = predictor[channel_number];

            /* toggle channel */
            channel_number ^= s->channels - 1;
        }

        /* save predictors for next round */
        for (i = 0; i < s->channels; i++)
            s->last_delta[i] = predictor[i];

        break;

    case CODEC_ID_XAN_DPCM:
        in = 0;

1477:afc7baa19b62

#include "avcodec.h"

typedef struct DPCMContext {
    int channels;
    short roq_square_array[256];
} DPCMContext;

#define SATURATE_S16(x)  if (x < -32768) x = -32768; \
  else if (x > 32767) x = 32767;
#define SE_16BIT(x)  if (x & 0x8000) x -= 0x10000;

                             void *data, int *data_size,
                             uint8_t *buf, int buf_size)
{
    DPCMContext *s = avctx->priv_data;
    int in, out = 0;
    int predictor[2];
    int channel_number = 0;
    short *output_samples = data;
    int shift[2];
    unsigned char byte;
    short diff;

    switch(avctx->codec->id) {

            channel_number ^= s->channels - 1;
        }
        break;

    case CODEC_ID_INTERPLAY_DPCM:
        in = 6;  /* skip over the stream mask and stream length */
        predictor[0] = LE_16(&buf[in]);
        in += 2;
        SE_16BIT(predictor[0])
        output_samples[out++] = predictor[0];
        if (s->channels == 2) {
            predictor[1] = LE_16(&buf[in]);
            in += 2;
            SE_16BIT(predictor[1])
            output_samples[out++] = predictor[1];
        }

        while (in < buf_size) {
            predictor[channel_number] += interplay_delta_table[buf[in++]];
            SATURATE_S16(predictor[channel_number]);
            output_samples[out++] = predictor[channel_number];

            /* toggle channel */
            channel_number ^= s->channels - 1;
        }

        break;

    case CODEC_ID_XAN_DPCM:
        in = 0;