comparison dca.c @ 12145:9109a7e48d6e libavcodec

Move XCH parameters into context structure. Patch by Nick Brereton $name AT n$surname DOT net

12144:846779f6b164

    const int8_t* channel_order_tab;                             ///< channel reordering table, lfe and non lfe
    GetBitContext gb;
    /* Current position in DCA frame */
    int current_subframe;
    int current_subsubframe;

    int debug_flag;             ///< used for suppressing repeated error messages output
    DSPContext dsp;
    FFTContext imdct;
    SynthFilterContext synth;

    int buf_size = avpkt->size;

    int lfe_samples;
    int num_core_channels = 0;
    int i;
    int xch_present = 0;
    int16_t *samples = data;
    DCAContext *s = avctx->priv_data;
    int channels;


    s->dca_buffer_size = dca_convert_bitstream(buf, buf_size, s->dca_buffer, DCA_MAX_FRAME_SIZE);
    if (s->dca_buffer_size == -1) {
        av_log(avctx, AV_LOG_ERROR, "Not a valid DCA frame\n");
        return -1;
    }

    while(get_bits_left(&s->gb) >= 32) {
        uint32_t bits = get_bits_long(&s->gb, 32);

        switch(bits) {
        case 0x5a5a5a5a: {
            int ext_base_ch = s->prim_channels;
            int ext_amode, xch_fsize;

            /* validate sync word using XCHFSIZE field */
            xch_fsize = show_bits(&s->gb, 10);
            if((s->frame_size != (get_bits_count(&s->gb) >> 3) - 4 + xch_fsize) &&
               (s->frame_size != (get_bits_count(&s->gb) >> 3) - 4 + xch_fsize + 1))

                       " supported!\n",ext_amode);
                continue;
            }

            /* much like core primary audio coding header */
            dca_parse_audio_coding_header(s, ext_base_ch);

            for (i = 0; i < (s->sample_blocks / 8); i++) {
                dca_decode_block(s, ext_base_ch, i);
            }

            xch_present = 1;
            break;
        }
        case 0x1d95f262:
            av_log(avctx, AV_LOG_DEBUG, "Possible X96 extension found at %d bits\n", get_bits_count(&s->gb));
            av_log(avctx, AV_LOG_DEBUG, "FSIZE96 = %d bytes\n", get_bits(&s->gb, 12)+1);

    channels = s->prim_channels + !!s->lfe;

    if (s->amode<16) {
        avctx->channel_layout = dca_core_channel_layout[s->amode];

        if (xch_present && (!avctx->request_channels ||
                            avctx->request_channels > num_core_channels)) {
            avctx->channel_layout |= CH_BACK_CENTER;
            if (s->lfe) {
                avctx->channel_layout |= CH_LOW_FREQUENCY;
                s->channel_order_tab = dca_channel_reorder_lfe_xch[s->amode];

12145:9109a7e48d6e

    const int8_t* channel_order_tab;                             ///< channel reordering table, lfe and non lfe
    GetBitContext gb;
    /* Current position in DCA frame */
    int current_subframe;
    int current_subsubframe;

    /* XCh extension information */
    int xch_present;
    int xch_base_channel;       ///< index of first (only) channel containing XCH data

    int debug_flag;             ///< used for suppressing repeated error messages output
    DSPContext dsp;
    FFTContext imdct;
    SynthFilterContext synth;

    int buf_size = avpkt->size;

    int lfe_samples;
    int num_core_channels = 0;
    int i;
    int16_t *samples = data;
    DCAContext *s = avctx->priv_data;
    int channels;


    s->xch_present = 0;
    s->dca_buffer_size = dca_convert_bitstream(buf, buf_size, s->dca_buffer, DCA_MAX_FRAME_SIZE);
    if (s->dca_buffer_size == -1) {
        av_log(avctx, AV_LOG_ERROR, "Not a valid DCA frame\n");
        return -1;
    }

    while(get_bits_left(&s->gb) >= 32) {
        uint32_t bits = get_bits_long(&s->gb, 32);

        switch(bits) {
        case 0x5a5a5a5a: {
            int ext_amode, xch_fsize;

            s->xch_base_channel = s->prim_channels;

            /* validate sync word using XCHFSIZE field */
            xch_fsize = show_bits(&s->gb, 10);
            if((s->frame_size != (get_bits_count(&s->gb) >> 3) - 4 + xch_fsize) &&
               (s->frame_size != (get_bits_count(&s->gb) >> 3) - 4 + xch_fsize + 1))

                       " supported!\n",ext_amode);
                continue;
            }

            /* much like core primary audio coding header */
            dca_parse_audio_coding_header(s, s->xch_base_channel);

            for (i = 0; i < (s->sample_blocks / 8); i++) {
                dca_decode_block(s, s->xch_base_channel, i);
            }

            s->xch_present = 1;
            break;
        }
        case 0x1d95f262:
            av_log(avctx, AV_LOG_DEBUG, "Possible X96 extension found at %d bits\n", get_bits_count(&s->gb));
            av_log(avctx, AV_LOG_DEBUG, "FSIZE96 = %d bytes\n", get_bits(&s->gb, 12)+1);

    channels = s->prim_channels + !!s->lfe;

    if (s->amode<16) {
        avctx->channel_layout = dca_core_channel_layout[s->amode];

        if (s->xch_present && (!avctx->request_channels ||
                            avctx->request_channels > num_core_channels)) {
            avctx->channel_layout |= CH_BACK_CENTER;
            if (s->lfe) {
                avctx->channel_layout |= CH_LOW_FREQUENCY;
                s->channel_order_tab = dca_channel_reorder_lfe_xch[s->amode];