comparison src/madplug/decoder.c @ 793:98cdc39031f9 trunk

[svn] - add sanity check for open audio parameters.

792:2b2313fc1ddc

        memcpy(buffer, stream.this_frame, remainder);
        len = input_get_data(info, buffer + remainder,
                             BUFFER_SIZE - remainder);

        if (len <= 0) {
            g_message("scan_file: len <= 0! len = %d\n", len);
            break;
        }

        mad_stream_buffer(&stream, buffer, len + remainder);

    }

#ifdef DEBUG
    g_message("decode: fmt = %d freq = %d channels = %d", info->fmt, info->freq, info->channels);
#endif
    if (!info->playback->output->open_audio(info->fmt, info->freq, info->channels)) {
        g_mutex_lock(pb_mutex);
        info->playback->error = TRUE;
        info->playback->eof = 1;
        g_mutex_unlock(pb_mutex);        

793:98cdc39031f9

        memcpy(buffer, stream.this_frame, remainder);
        len = input_get_data(info, buffer + remainder,
                             BUFFER_SIZE - remainder);

        if (len <= 0) {
#ifdef DEBUG
            g_message("scan_file: len <= 0! len = %d", len);
#endif
            break;
        }

        mad_stream_buffer(&stream, buffer, len + remainder);

    }

#ifdef DEBUG
    g_message("decode: fmt = %d freq = %d channels = %d", info->fmt, info->freq, info->channels);
#endif
    // sanity check.
    if(info->fmt < FMT_U8 || info->fmt > FMT_S16_NE)
        return NULL;
    if(info->freq < 0) // not sure about maximum frequency. --yaz
        return NULL;
    if(info->channels < 1 || info->channels > 2)
        return NULL;
    
    if (!info->playback->output->open_audio(info->fmt, info->freq, info->channels)) {
        g_mutex_lock(pb_mutex);
        info->playback->error = TRUE;
        info->playback->eof = 1;
        g_mutex_unlock(pb_mutex);