comparison alac.c @ 2544:8c426f5a09ae libavcodec

decoder works fine now, when fed properly-sized chunks by the demuxer; cleaned up some cruft for this commit

2543:e8f1f57215ad

{
    uint32_t result;
    int new_accumulator;

    if (alac->input_buffer_index + 2 >= alac->input_buffer_size) {
        av_log(NULL, AV_LOG_INFO, "alac: input buffer went out of bounds (%d >= %d)\n",
            alac->input_buffer_index + 2, alac->input_buffer_size);
//        exit (0);
    }
    result = (alac->input_buffer[alac->input_buffer_index + 0] << 16) |
             (alac->input_buffer[alac->input_buffer_index + 1] << 8) |

{
    int result;
    int new_accumulator;

    if (alac->input_buffer_index >= alac->input_buffer_size) {
        av_log(NULL, AV_LOG_INFO, "alac: input buffer went out of bounds (%d >= %d)\n",
            alac->input_buffer_index + 2, alac->input_buffer_size);
//        exit (0);
    }

    result = alac->input_buffer[alac->input_buffer_index];

    result = result << alac->input_buffer_bitaccumulator;

            right = midright - ((difference * interlacing_leftweight) >> interlacing_shift);
            left = (midright - ((difference * interlacing_leftweight) >> interlacing_shift))
                 + difference;

            /* output is always little endian */
/*
            if (host_bigendian) {
                be2me_16(left);
                be2me_16(right);
            }
*/

            buffer_out[i*numchannels] = left;
            buffer_out[i*numchannels + 1] = right;
        }

        return;

        int16_t left, right;

        left = buffer_a[i];
        right = buffer_b[i];

        /* output is always little endian */
/*
        if (host_bigendian) {
            be2me_16(left);
            be2me_16(right);
        }
*/

        buffer_out[i*numchannels] = left;
        buffer_out[i*numchannels + 1] = right;
    }
}

int decode_frame(ALACContext *s, alac_file *alac,
                  unsigned char *inbuffer,
                  int input_buffer_size,
                  void *outbuffer, int *outputsize)
{
    int channels;
    int32_t outputsamples;

    /* initialize from the extradata */
    if (!s->context_initialized) {
        if (s->avctx->extradata_size != ALAC_EXTRADATA_SIZE) {
            av_log(NULL, AV_LOG_ERROR, "alac: expected %d extradata bytes\n", 

        break;
    }
    }

av_log(NULL, AV_LOG_INFO, "buf size = %d, consumed %d\n",
  input_buffer_size, alac->input_buffer_index);

    /* avoid infinite loop: if decoder consumed 0 bytes; report all bytes
     * consumed */
//    if (alac->input_buffer_index)
//        return alac->input_buffer_index;
//    else
        return input_buffer_size;
}

static int alac_decode_init(AVCodecContext * avctx)
{
    ALACContext *s = avctx->priv_data;

    s->alac->samplesize = s->avctx->bits_per_sample;
    s->alac->numchannels = s->avctx->channels;
    s->alac->bytespersample = (s->alac->samplesize / 8) * s->alac->numchannels;

    return 0;
}

static int alac_decode_frame(AVCodecContext *avctx,
                             void *data, int *data_size,
                             uint8_t *buf, int buf_size)
{
    ALACContext *s = avctx->priv_data;
    int bytes_consumed = buf_size;

    if (buf)
        bytes_consumed = decode_frame(s, s->alac, buf, buf_size, 
            data, data_size);

    return bytes_consumed;
}

static int alac_decode_close(AVCodecContext *avctx)
{
    ALACContext *s = avctx->priv_data;

2544:8c426f5a09ae

{
    uint32_t result;
    int new_accumulator;

    if (alac->input_buffer_index + 2 >= alac->input_buffer_size) {
        av_log(NULL, AV_LOG_ERROR, "alac: input buffer went out of bounds (%d >= %d)\n",
            alac->input_buffer_index + 2, alac->input_buffer_size);
//        exit (0);
    }
    result = (alac->input_buffer[alac->input_buffer_index + 0] << 16) |
             (alac->input_buffer[alac->input_buffer_index + 1] << 8) |

{
    int result;
    int new_accumulator;

    if (alac->input_buffer_index >= alac->input_buffer_size) {
        av_log(NULL, AV_LOG_ERROR, "alac: input buffer went out of bounds (%d >= %d)\n",
            alac->input_buffer_index + 2, alac->input_buffer_size);
        exit (0);
    }

    result = alac->input_buffer[alac->input_buffer_index];

    result = result << alac->input_buffer_bitaccumulator;

            right = midright - ((difference * interlacing_leftweight) >> interlacing_shift);
            left = (midright - ((difference * interlacing_leftweight) >> interlacing_shift))
                 + difference;

            buffer_out[i*numchannels] = left;
            buffer_out[i*numchannels + 1] = right;
        }

        return;

        int16_t left, right;

        left = buffer_a[i];
        right = buffer_b[i];

        buffer_out[i*numchannels] = left;
        buffer_out[i*numchannels + 1] = right;
    }
}

static int alac_decode_frame(AVCodecContext *avctx,
                             void *outbuffer, int *outputsize,
                             uint8_t *inbuffer, int input_buffer_size)
{
    ALACContext *s = avctx->priv_data;
    alac_file *alac = s->alac;

    int channels;
    int32_t outputsamples;

    /* short-circuit null buffers */
    if (!inbuffer || !input_buffer_size)
        return input_buffer_size;

    /* initialize from the extradata */
    if (!s->context_initialized) {
        if (s->avctx->extradata_size != ALAC_EXTRADATA_SIZE) {
            av_log(NULL, AV_LOG_ERROR, "alac: expected %d extradata bytes\n", 

        break;
    }
    }

    return input_buffer_size;
}

static int alac_decode_init(AVCodecContext * avctx)
{
    ALACContext *s = avctx->priv_data;

    s->alac->samplesize = s->avctx->bits_per_sample;
    s->alac->numchannels = s->avctx->channels;
    s->alac->bytespersample = (s->alac->samplesize / 8) * s->alac->numchannels;

    return 0;
}

static int alac_decode_close(AVCodecContext *avctx)
{
    ALACContext *s = avctx->priv_data;