comparison amrnbdec.c @ 12485:b42e02e9bf2b libavcodec

Move AMR-NB frame unpacking code to a common file so it can be reused in the AMR-WB decoder. Patch by Marcelo Galv���o P���voa.

12484:01562fcb773d

#include "celp_filters.h"
#include "acelp_filters.h"
#include "acelp_vectors.h"
#include "acelp_pitch_delay.h"
#include "lsp.h"

#include "amrnbdata.h"

#define AMR_BLOCK_SIZE              160   ///< samples per frame
#define AMR_SAMPLE_BOUND        32768.0   ///< threshold for synthesis overflow

    skip_bits(&gb, 1);                        // padding bit
    mode = get_bits(&gb, 4);                  // frame type
    p->bad_frame_indicator = !get_bits1(&gb); // quality bit
    skip_bits(&gb, 2);                        // two padding bits

    if (mode < MODE_DTX) {
        uint16_t *data = (uint16_t *)&p->frame;
        const uint8_t *order = amr_unpacking_bitmaps_per_mode[mode];
        int field_size;

        memset(&p->frame, 0, sizeof(AMRNBFrame));
        buf++;
        while ((field_size = *order++)) {
            int field = 0;
            int field_offset = *order++;
            while (field_size--) {
               int bit = *order++;
               field <<= 1;
               field |= buf[bit >> 3] >> (bit & 7) & 1;
            }
            data[field_offset] = field;
        }
    }

    return mode;
}

12485:b42e02e9bf2b

#include "celp_filters.h"
#include "acelp_filters.h"
#include "acelp_vectors.h"
#include "acelp_pitch_delay.h"
#include "lsp.h"
#include "amr.h"

#include "amrnbdata.h"

#define AMR_BLOCK_SIZE              160   ///< samples per frame
#define AMR_SAMPLE_BOUND        32768.0   ///< threshold for synthesis overflow

    skip_bits(&gb, 1);                        // padding bit
    mode = get_bits(&gb, 4);                  // frame type
    p->bad_frame_indicator = !get_bits1(&gb); // quality bit
    skip_bits(&gb, 2);                        // two padding bits

    if (mode < MODE_DTX)
        ff_amr_bit_reorder((uint16_t *) &p->frame, sizeof(AMRNBFrame), buf + 1,
                           amr_unpacking_bitmaps_per_mode[mode]);

    return mode;
}