comparison dca.c @ 6577:1b90003d4d60 libavcodec

Only set channels in the stream if previously unset, fixes resampling crash on broken dca frames

6576:5e7c69ebc019

    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);

6577:1b90003d4d60

    if(avctx->request_channels == 2 && s->prim_channels > 2) {
        channels = 2;
        s->output = DCA_STEREO;
    }

    /* There is nothing that prevents a dts frame to change channel configuration
       but FFmpeg doesn't support that so only set the channels if it is previously
       unset. Ideally during the first probe for channels the crc should be checked
       and only set avctx->channels when the crc is ok. Right now the decoder could
       set the channels based on a broken first frame.*/
    if (!avctx->channels)
        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);