comparison dca.c @ 6022:6dd429a5d0be libavcodec

Make DCA decoder honor avctx->request_channels in a more advisory way.

6021:90b36c43c4ef

    //set AVCodec values with parsed data
    avctx->sample_rate = s->sample_rate;
    avctx->bit_rate = s->bit_rate;

    channels = s->prim_channels + !!s->lfe;
    avctx->channels = avctx->request_channels;
    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);

6022:6dd429a5d0be

    //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->request_channels == 2 && s->prim_channels > 2) {
        channels = 2;
        s->output = DCA_STEREO;
    }

    avctx->channels = 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);