comparison wmaprodec.c @ 10127:b17566dcfcc9 libavcodec

reduce output buffer needs (fixes playback of some multichannel files)

10126:6ff9347c8042

    uint8_t          packet_sequence_number;        ///< current packet number
    int              num_saved_bits;                ///< saved number of bits
    int              frame_offset;                  ///< frame offset in the bit reservoir
    int              subframe_offset;               ///< subframe offset in the bit reservoir
    uint8_t          packet_loss;                   ///< set in case of bitstream error

    /* frame decode state */
    uint32_t         frame_num;                     ///< current frame number (not used for decoding)
    GetBitContext    gb;                            ///< bitstream reader context
    int              buf_bit_size;                  ///< buffer size in bits
    float*           samples;                       ///< current samplebuffer pointer
    float*           samples_end;                   ///< maximum samplebuffer pointer
    uint8_t          drc_gain;                      ///< gain for the DRC tool
    int8_t           skip_frame;                    ///< skip output step
    int8_t           parsed_all_subframes;          ///< all subframes decoded?

    int len = 0;
    int i;

    /** check for potential output buffer overflow */
    if (s->num_channels * s->samples_per_frame > s->samples_end - s->samples) {
        av_log(s->avctx, AV_LOG_ERROR,
               "not enough space for the output samples\n");
        s->packet_loss = 1;
        return 0;
    }

    /** get frame length */
    if (s->len_prefix)

    int more_frames      = 1;
    int num_bits_prev_frame;
    int packet_sequence_number;

    s->samples      = data;
    s->samples_end  = (float*)((int8_t*)data + *data_size);
    s->buf_bit_size = buf_size << 3;


    *data_size = 0;

    /** sanity check for the buffer length */
    if (buf_size < avctx->block_align)
        return 0;

        dprintf(avctx, "ignoring %x previously saved bits\n",
                s->num_saved_bits - s->frame_offset);
    }

    s->packet_loss = 0;
    /** decode the rest of the packet */
    while (!s->packet_loss && more_frames &&
           remaining_bits(s, gb) > s->log2_frame_size) {
        int frame_size = show_bits(gb, s->log2_frame_size);

        /** there is enough data for a full frame */
        if (remaining_bits(s, gb) >= frame_size && frame_size > 0) {

            }
        } else
            more_frames = 0;
    }

    if (!s->packet_loss && remaining_bits(s, gb) > 0) {
        /** save the rest of the data so that it can be decoded
            with the next packet */
        save_bits(s, gb, remaining_bits(s, gb), 0);
    }

    *data_size = (int8_t *)s->samples - (int8_t *)data;

    return avctx->block_align;
}

/**
 *@brief Clear decoder buffers (for seeking).
 *@param avctx codec context

10127:b17566dcfcc9

    uint8_t          packet_sequence_number;        ///< current packet number
    int              num_saved_bits;                ///< saved number of bits
    int              frame_offset;                  ///< frame offset in the bit reservoir
    int              subframe_offset;               ///< subframe offset in the bit reservoir
    uint8_t          packet_loss;                   ///< set in case of bitstream error
    uint8_t          output_buffer_full;            ///< flag indicating that the output buffer is full

    /* frame decode state */
    uint32_t         frame_num;                     ///< current frame number (not used for decoding)
    GetBitContext    gb;                            ///< bitstream reader context
    int              buf_bit_size;                  ///< buffer size in bits
    float*           samples_start;                 ///< start samplebuffer pointer
    float*           samples;                       ///< current samplebuffer pointer
    float*           samples_end;                   ///< maximum samplebuffer pointer
    uint8_t          drc_gain;                      ///< gain for the DRC tool
    int8_t           skip_frame;                    ///< skip output step
    int8_t           parsed_all_subframes;          ///< all subframes decoded?

    int len = 0;
    int i;

    /** check for potential output buffer overflow */
    if (s->num_channels * s->samples_per_frame > s->samples_end - s->samples) {
        /** return an error if no frame could be decoded at all */
        if (s->samples_start == s->samples) {
            av_log(s->avctx, AV_LOG_ERROR,
                   "not enough space for the output samples\n");
            s->packet_loss = 1;
        } else
            s->output_buffer_full = 1;
        return 0;
    }

    /** get frame length */
    if (s->len_prefix)

    int more_frames      = 1;
    int num_bits_prev_frame;
    int packet_sequence_number;

    s->samples      = data;
    s->samples_start = data;
    s->samples_end  = (float*)((int8_t*)data + *data_size);
    *data_size = 0;

    if (!s->output_buffer_full) {
    s->buf_bit_size = buf_size << 3;

    /** sanity check for the buffer length */
    if (buf_size < avctx->block_align)
        return 0;

        dprintf(avctx, "ignoring %x previously saved bits\n",
                s->num_saved_bits - s->frame_offset);
    }

    s->packet_loss = 0;

    } else {
        /** continue decoding */
        s->output_buffer_full = 0;
        more_frames = decode_frame(s);
    }

    /** decode the rest of the packet */
    while (!s->packet_loss && !s->output_buffer_full && more_frames &&
           remaining_bits(s, gb) > s->log2_frame_size) {
        int frame_size = show_bits(gb, s->log2_frame_size);

        /** there is enough data for a full frame */
        if (remaining_bits(s, gb) >= frame_size && frame_size > 0) {

            }
        } else
            more_frames = 0;
    }

    if (!s->output_buffer_full && !s->packet_loss &&
        remaining_bits(s, gb) > 0) {
        /** save the rest of the data so that it can be decoded
            with the next packet */
        save_bits(s, gb, remaining_bits(s, gb), 0);
    }

    *data_size = (int8_t *)s->samples - (int8_t *)data;

    return (s->output_buffer_full)?0: avctx->block_align;
}

/**
 *@brief Clear decoder buffers (for seeking).
 *@param avctx codec context