comparison wmaprodec.c @ 10126:6ff9347c8042 libavcodec

store packet GetBitContext in the decoder context

10125:67b0747c4192

    int16_t          sfb_offsets[WMAPRO_BLOCK_SIZES][MAX_BANDS];                    ///< scale factor band offsets (multiples of 4)
    int8_t           sf_offsets[WMAPRO_BLOCK_SIZES][WMAPRO_BLOCK_SIZES][MAX_BANDS]; ///< scale factor resample matrix
    int16_t          subwoofer_cutoffs[WMAPRO_BLOCK_SIZES]; ///< subwoofer cutoff values

    /* packet decode state */
    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

 *@return number of bytes that were read from the input buffer
 */
static int decode_packet(AVCodecContext *avctx,
                         void *data, int *data_size, AVPacket* avpkt)
{
    GetBitContext gb;
    WMAProDecodeCtx *s = avctx->priv_data;
    const uint8_t* buf   = avpkt->data;
    int buf_size         = avpkt->size;
    int more_frames      = 1;
    int num_bits_prev_frame;
    int packet_sequence_number;

        return 0;

    buf_size = avctx->block_align;

    /** parse packet header */
    init_get_bits(&gb, buf, s->buf_bit_size);
    packet_sequence_number = get_bits(&gb, 4);
    skip_bits(&gb, 2);

    /** get number of bits that need to be added to the previous frame */
    num_bits_prev_frame = get_bits(&gb, s->log2_frame_size);
    dprintf(avctx, "packet[%d]: nbpf %x\n", avctx->frame_number,
            num_bits_prev_frame);

    /** check for packet loss */
    if (!s->packet_loss &&

    s->packet_sequence_number = packet_sequence_number;

    if (num_bits_prev_frame > 0) {
        /** append the previous frame data to the remaining data from the
            previous packet to create a full frame */
        save_bits(s, &gb, num_bits_prev_frame, 1);
        dprintf(avctx, "accumulated %x bits of frame data\n",
                s->num_saved_bits - s->frame_offset);

        /** decode the cross packet frame if it is valid */
        if (!s->packet_loss)

    }

    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) {
            save_bits(s, &gb, frame_size, 0);

            /** decode the frame */
            more_frames = decode_frame(s);

            if (!more_frames) {

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

10126:6ff9347c8042

    int16_t          sfb_offsets[WMAPRO_BLOCK_SIZES][MAX_BANDS];                    ///< scale factor band offsets (multiples of 4)
    int8_t           sf_offsets[WMAPRO_BLOCK_SIZES][WMAPRO_BLOCK_SIZES][MAX_BANDS]; ///< scale factor resample matrix
    int16_t          subwoofer_cutoffs[WMAPRO_BLOCK_SIZES]; ///< subwoofer cutoff values

    /* packet decode state */
    GetBitContext    pgb;                           ///< bitstream reader context for the packet
    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

 *@return number of bytes that were read from the input buffer
 */
static int decode_packet(AVCodecContext *avctx,
                         void *data, int *data_size, AVPacket* avpkt)
{
    WMAProDecodeCtx *s = avctx->priv_data;
    GetBitContext* gb    = &s->pgb;
    const uint8_t* buf   = avpkt->data;
    int buf_size         = avpkt->size;
    int more_frames      = 1;
    int num_bits_prev_frame;
    int packet_sequence_number;

        return 0;

    buf_size = avctx->block_align;

    /** parse packet header */
    init_get_bits(gb, buf, s->buf_bit_size);
    packet_sequence_number = get_bits(gb, 4);
    skip_bits(gb, 2);

    /** get number of bits that need to be added to the previous frame */
    num_bits_prev_frame = get_bits(gb, s->log2_frame_size);
    dprintf(avctx, "packet[%d]: nbpf %x\n", avctx->frame_number,
            num_bits_prev_frame);

    /** check for packet loss */
    if (!s->packet_loss &&

    s->packet_sequence_number = packet_sequence_number;

    if (num_bits_prev_frame > 0) {
        /** append the previous frame data to the remaining data from the
            previous packet to create a full frame */
        save_bits(s, gb, num_bits_prev_frame, 1);
        dprintf(avctx, "accumulated %x bits of frame data\n",
                s->num_saved_bits - s->frame_offset);

        /** decode the cross packet frame if it is valid */
        if (!s->packet_loss)

    }

    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) {
            save_bits(s, gb, frame_size, 0);

            /** decode the frame */
            more_frames = decode_frame(s);

            if (!more_frames) {

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