comparison dca.c @ 4893:2b3fbf807734 libavcodec

enable multichannel output in dca decoder. reference: Subject: [Ffmpeg-devel] [PATCH] DTS multichannel Date: Wed, 25 Apr 2007 16:25:18 -0400

4892:bfb1c49171b6

    s->front_sum         = get_bits(&s->gb, 1);
    s->surround_sum      = get_bits(&s->gb, 1);
    s->dialog_norm       = get_bits(&s->gb, 4);

    /* FIXME: channels mixing levels */
    s->output = DCA_STEREO;

#ifdef TRACE
    av_log(s->avctx, AV_LOG_DEBUG, "frame type: %i\n", s->frame_type);
    av_log(s->avctx, AV_LOG_DEBUG, "samples deficit: %i\n", s->samples_deficit);
    av_log(s->avctx, AV_LOG_DEBUG, "crc present: %i\n", s->crc_present);

        //seems like the frame is corrupt, try with the next one
        return buf_size;
    }
    //set AVCodec values with parsed data
    avctx->sample_rate = s->sample_rate;
    avctx->channels = 2; //FIXME
    avctx->bit_rate = s->bit_rate;

    channels = dca_channels[s->output];
    if(*data_size < (s->sample_blocks / 8) * 256 * sizeof(int16_t) * channels)
        return -1;
    *data_size = 0;
    for (i = 0; i < (s->sample_blocks / 8); i++) {
        dca_decode_block(s);

4893:2b3fbf807734

    s->front_sum         = get_bits(&s->gb, 1);
    s->surround_sum      = get_bits(&s->gb, 1);
    s->dialog_norm       = get_bits(&s->gb, 4);

    /* FIXME: channels mixing levels */
    s->output = s->amode;
    if(s->lfe) s->output |= DCA_LFE;

#ifdef TRACE
    av_log(s->avctx, AV_LOG_DEBUG, "frame type: %i\n", s->frame_type);
    av_log(s->avctx, AV_LOG_DEBUG, "samples deficit: %i\n", s->samples_deficit);
    av_log(s->avctx, AV_LOG_DEBUG, "crc present: %i\n", s->crc_present);

        //seems like the frame is corrupt, try with the next one
        return buf_size;
    }
    //set AVCodec values with parsed data
    avctx->sample_rate = s->sample_rate;
    avctx->bit_rate = s->bit_rate;

    channels = s->prim_channels + !!s->lfe;
    if(avctx->channels == 0) {
        avctx->channels = channels;
    } else if(channels < avctx->channels) {
        av_log(avctx, AV_LOG_WARNING, "DTS source channels are less than "
               "specified: output to %d channels.\n", channels);
        avctx->channels = channels;
    }
    if(avctx->channels == 2) {
        s->output = DCA_STEREO;
    } else if(avctx->channels != channels) {
        av_log(avctx, AV_LOG_ERROR, "Cannot downmix DTS to %d channels.\n",
               avctx->channels);
        return -1;
    }

    channels = avctx->channels;
    if(*data_size < (s->sample_blocks / 8) * 256 * sizeof(int16_t) * channels)
        return -1;
    *data_size = 0;
    for (i = 0; i < (s->sample_blocks / 8); i++) {
        dca_decode_block(s);