Commit 438bf483 authored by Sandesh Venkatesh's avatar Sandesh Venkatesh
Browse files

Merge branch 'basop_instrumentation_decoder_4' into 'main'

BASOP and instrumentation changes added for swb_*, ivas-ism files

See merge request !415
parents 74eaf8c6 6eb0e7e5
Loading
Loading
Loading
Loading
Loading
+7 −1
Original line number Diff line number Diff line
@@ -932,11 +932,13 @@ void dtx_read_padding_bits(
    const int16_t num_bits 
);

#ifndef IVAS_FLOAT_FIXED
void ivas_apply_non_diegetic_panning(
    float *output_f[],                                          /* i/o: core-coder transport mono channel/stereo output             */
    const float non_diegetic_pan_gain,                          /* i  : non-diegetic panning gain                                   */
    const int16_t output_frame                                  /* i  : output frame length per channel                             */
);
#endif


/*----------------------------------------------------------------------------------*
@@ -7014,11 +7016,13 @@ void ivas_mono_downmix_render_passive(
    const int16_t output_frame                                  /* i  : output frame length                                   */
);

#ifndef IVAS_FLOAT_FIXED
void ivas_mono_stereo_downmix_mcmasa(
    Decoder_Struct *st_ivas,                                    /* i/o: IVAS decoder structure                                          */
    float *output_f[],                                          /* i/o: synthesized core-coder transport channels/mono or stereo output */
    int16_t output_frame                                        /* i  : output frame length per channel                                 */
);
#endif
#ifdef IVAS_FLOAT_FIXED
void ivas_lfe_synth_with_filters_fx(
    MCMASA_LFE_SYNTH_DATA_HANDLE hMasaLfeSynth, /* i/o: LFE synthesis structure for McMASA  */
@@ -7393,11 +7397,13 @@ ivas_error ivas_omasa_dirac_td_binaural_jbm(
    float *output_f[]                                           /* o  : rendered time signal                    */
);
#endif
#ifndef IVAS_FLOAT_FIXED
void ivas_omasa_rearrange_channels(
    float *output[],                                            /* o  : output synthesis signal                 */
    const int16_t nchan_transport_ism,                          /* i  : number of ISM TCs                       */
    const int16_t output_frame                                  /* i  : output frame length per channel         */
);
#endif
#ifndef IVAS_FLOAT_FIXED
void ivas_omasa_dirac_rend_jbm(
    Decoder_Struct *st_ivas,                                    /* i/o: IVAS decoder handle                     */
+62 −18
Original line number Diff line number Diff line
@@ -66,14 +66,16 @@ static void ivas_arith_decode_array(
    Word16 *pCum_freq = NULL;
    Tastat as;
    Word16 extra_bits_read = 0;
    move16();

    IF( GT_16( in_len, 0 ) && GT_16( pArith->range, 1 ) )
    test();
    IF( ( in_len > 0 ) && GT_16( pArith->range, 1 ) )
    {
        IF( GT_16( pArith->dyn_model_bits, 0 ) )
        IF( pArith->dyn_model_bits > 0 )
        {
            model_idx = get_next_indice( st0, pArith->dyn_model_bits );

            IF( GT_16( model_idx, 0 ) )
            IF( model_idx > 0 )
            {
                pCum_freq = pArith->cum_freq[model_idx];
            }
@@ -94,15 +96,18 @@ static void ivas_arith_decode_array(
            ind = ivas_ari_decode_14bits_bit_ext_1_lfe( st0, &as, (const UWord16 *) pCum_freq, &extra_bits_read );

            pSymbols[i] = pArith->vals[ind];
            move16();
        }

        ivas_ari_done_decoding_14bits_ext_1_lfe( st0, extra_bits_read );
    }
    ELSE
    {

        FOR( i = 0; i < in_len; i++ )
        {
            pSymbols[i] = 0;
            move16();
        }
    }

@@ -126,8 +131,9 @@ static void ivas_arithCoder_decode_array_diff(
{
    Word16 n;
    Word16 offset = pArith->vals[0];
    move16();

    IF( GT_16( length, 0 ) )
    IF( length > 0 )
    {
        ivas_arith_decode_array( pArith_diff, st0, length, pOutput_arr );
    }
@@ -135,6 +141,7 @@ static void ivas_arithCoder_decode_array_diff(
    FOR( n = 0; n < length; n++ )
    {
        pOutput_arr[n] = add( sub( pSymbol_old[n], offset ), pOutput_arr[n] );
        move16();
    }

#ifndef IVAS_FLOAT_FIXED
@@ -146,6 +153,7 @@ static void ivas_arithCoder_decode_array_diff(
    FOR( n = 0; n < length; n++ )
    {
        pOutput_arr[n] = pArith->vals[pOutput_arr[n]];
        move16();
    }

    return;
@@ -166,19 +174,25 @@ static Word16 ivas_huffman_code_bits_present(
{
    Word16 index = add( len, 1 );
    Word16 i = 0;
    move16();
    Word16 ind_t, code_t, bits_t;

    WHILE( LT_16( i, len ) )
    {
        ind_t = codebook[0];
        move16();
        bits_t = codebook[1];
        move16();
        code_t = codebook[2];
        move16();

        test();
        IF( ( EQ_16( code, code_t ) ) && ( EQ_16( bits, bits_t ) ) )
        {
            return ind_t;
        }
        codebook = codebook + 3;
        i++;
        i = add( i, 1 );
    }

    return index;
@@ -200,6 +214,7 @@ ivas_error ivas_huffman_decode(

    code = get_next_indice( st0, huff_cfg->min_len );
    num_bits_read = huff_cfg->min_len;
    move16();

    ind = ivas_huffman_code_bits_present( huff_cfg->codebook, code, num_bits_read, huff_cfg->sym_len );

@@ -207,7 +222,7 @@ ivas_error ivas_huffman_decode(
    {
        bit = get_next_indice( st0, 1 );
        num_bits_read = add( num_bits_read, 1 );
        code = code << 1 | bit;
        code = s_or( shl( code, 1 ), bit );
        ind = ivas_huffman_code_bits_present( huff_cfg->codebook, code, num_bits_read, huff_cfg->sym_len );
        IF( GT_16( num_bits_read, huff_cfg->max_len ) )
        {
@@ -215,6 +230,7 @@ ivas_error ivas_huffman_decode(
        }
    }
    *dec_out = ind;
    move16();

    return IVAS_ERR_OK;
}
@@ -234,11 +250,12 @@ static void arith_decode_cell_array(
    Word16 *pSymbol )
{
    Word16 total_symbol_len = 0;
    move16();
    Word16 i;

    FOR( i = 0; i < num_bands; i++ )
    {
        total_symbol_len += ( pCell_dims[i].dim1 * pCell_dims[i].dim2 );
        total_symbol_len = add( total_symbol_len, imult1616( pCell_dims[i].dim1, pCell_dims[i].dim2 ) );
    }

    assert( LE_16( total_symbol_len, IVAS_MAX_INPUT_LEN ) );
@@ -265,11 +282,12 @@ static void arith_decode_cell_array_diff(
    Word16 *pSymbol_old )
{
    Word16 total_symbol_len = 0;
    move16();
    Word16 i;

    FOR( i = 0; i < num_bands; i++ )
    {
        total_symbol_len += ( pCell_dims[i].dim1 * pCell_dims[i].dim2 );
        total_symbol_len = add( total_symbol_len, imult1616( pCell_dims[i].dim1, pCell_dims[i].dim2 ) );
    }

    assert( LE_16( total_symbol_len, IVAS_MAX_INPUT_LEN ) );
@@ -300,16 +318,19 @@ void ivas_arith_decode_cmplx_cell_array(
    Word16 cell_arr_no_diff[IVAS_MAX_INPUT_LEN];
    Word16 cell_arr_diff_out[IVAS_MAX_INPUT_LEN];
    Word16 idx2 = 0;
    move16();

    FOR( i = 0; i < num_bands; i++ )
    {
        IF( NE_16( pDo_diff[i], 0 ) )
        IF( pDo_diff[i] != 0 )
        {
            any_diff = 1;
            move16();
        }
        ELSE
        {
            all_diff = 0;
            move16();
        }
    }

@@ -324,35 +345,49 @@ void ivas_arith_decode_cmplx_cell_array(
            ivas_cell_dim_t cell_dims[IVAS_MAX_NUM_BANDS];
            ivas_cell_dim_t cell_dims_diff[IVAS_MAX_NUM_BANDS];
            Word16 idx1 = 0, idx = 0;
            move16();
            move16();

            FOR( i = 0; i < num_bands; i++ )
            {
                len = pCell_dims[i].dim1 * pCell_dims[i].dim2;
                IF( NE_16( pDo_diff[i], 0 ) )
                len = imult1616( pCell_dims[i].dim1, pCell_dims[i].dim2 );
                IF( pDo_diff[i] != 0 )
                {
                    cell_dims[i].dim1 = 0;
                    move16();
                    cell_dims[i].dim2 = 0;
                    move16();

                    FOR( j = 0; j < len; j++ )
                    {
                        cell_arr_diff[idx++] = pSymbol_re_old[idx1++];
                        cell_arr_diff[idx] = pSymbol_re_old[idx1];
                        move16();
                        idx = add( idx, 1 );
                        idx1 = add( idx1, 1 );
                    }

                    cell_dims_diff[i].dim1 = pCell_dims[i].dim1;
                    move16();
                    cell_dims_diff[i].dim2 = pCell_dims[i].dim2;
                    move16();
                }
                ELSE
                {
                    FOR( j = 0; j < len; j++ )
                    {
                        cell_arr_diff[idx] = 0;
                        idx1++;
                        move16();
                        idx1 = add( idx1, 1 );
                    }

                    cell_dims[i].dim1 = pCell_dims[i].dim1;
                    move16();
                    cell_dims[i].dim2 = pCell_dims[i].dim2;
                    move16();
                    cell_dims_diff[i].dim1 = 0;
                    move16();
                    cell_dims_diff[i].dim2 = 0;
                    move16();
                }
            }

@@ -361,21 +396,30 @@ void ivas_arith_decode_cmplx_cell_array(
            arith_decode_cell_array_diff( cell_dims_diff, st0, num_bands, pArith_re, pArith_re_diff, cell_arr_diff_out, cell_arr_diff );

            idx = 0;
            move16();
            idx1 = 0;
            move16();

            FOR( i = 0; i < num_bands; i++ )
            {
                IF( NE_16( pDo_diff[i], 0 ) )
                IF( pDo_diff[i] != 0 )
                {
                    FOR( j = 0; j < cell_dims_diff[i].dim1 * cell_dims_diff[i].dim2; j++ )
                    FOR( j = 0; j < imult1616( cell_dims_diff[i].dim1, cell_dims_diff[i].dim2 ); j++ )
                    {
                        pSymbol_re[idx++] = cell_arr_diff_out[idx2++];
                        pSymbol_re[idx] = cell_arr_diff_out[idx2];
                        move16();
                        idx = add( idx, 1 );
                        idx2 = add( idx2, 1 );
                    }
                }
                ELSE
                {
                    FOR( j = 0; j < cell_dims[i].dim1 * cell_dims[i].dim2; j++ )
                    FOR( j = 0; j < imult1616( cell_dims[i].dim1, cell_dims[i].dim2 ); j++ )
                    {
                        pSymbol_re[idx++] = cell_arr_no_diff[idx1++];
                        pSymbol_re[idx] = cell_arr_no_diff[idx1];
                        move16();
                        idx = add( idx, 1 );
                        idx1 = add( idx1, 1 );
                    }
                }
            }
+758 −375

File changed.

Preview size limit exceeded, changes collapsed.

+82 −26
Original line number Diff line number Diff line
@@ -8,12 +8,17 @@ void ivas_init_dec_get_num_cldfb_instances_ivas_fx(
{
    IVAS_FORMAT ivas_format;
    *numCldfbAnalyses = st_ivas->nchan_transport;
    move16();
    *numCldfbSyntheses = st_ivas->hDecoderConfig->nchan_out;

    move16();
    ivas_format = st_ivas->ivas_format;
    move32();

    test();
    IF( EQ_16( st_ivas->ivas_format, SBA_ISM_FORMAT ) && EQ_16( st_ivas->ism_mode, ISM_MODE_NONE ) )
    {
        ivas_format = SBA_FORMAT; /* treat ISM_SBA_MODE_NONE just like SBA_FORMAT */
        move32();
    }

    SWITCH( st_ivas->renderer_type )
@@ -24,73 +29,94 @@ void ivas_init_dec_get_num_cldfb_instances_ivas_fx(
            IF( EQ_16( st_ivas->nchan_transport, 1 ) )
            {
                *numCldfbAnalyses = add( st_ivas->nchan_transport, 1 );
                move16();
            }

            test();
            IF( EQ_16( st_ivas->mc_mode, MC_MODE_MCMASA ) && st_ivas->hOutSetup.separateChannelEnabled )
            {
                *numCldfbAnalyses = add( st_ivas->nchan_transport, 1 );
                move16();
            }

            IF( EQ_16( ivas_format, SBA_ISM_FORMAT ) )
            IF( EQ_32( ivas_format, SBA_ISM_FORMAT ) )
            {
                IF( EQ_16( st_ivas->ism_mode, ISM_SBA_MODE_DISC ) )
                IF( EQ_32( st_ivas->ism_mode, ISM_SBA_MODE_DISC ) )
                {
                    *numCldfbAnalyses = add( *numCldfbAnalyses, st_ivas->nchan_ism );
                    move16();
                }
            }

            IF( EQ_16( ivas_format, MASA_ISM_FORMAT ) )
            IF( EQ_32( ivas_format, MASA_ISM_FORMAT ) )
            {
                IF( EQ_16( st_ivas->ism_mode, ISM_MASA_MODE_DISC ) )
                test();
                test();
                IF( EQ_32( st_ivas->ism_mode, ISM_MASA_MODE_DISC ) )
                {
                    *numCldfbAnalyses = add( *numCldfbAnalyses, st_ivas->nchan_ism );
                    move16();
                }
                ELSE IF( EQ_16( st_ivas->ism_mode, ISM_MASA_MODE_MASA_ONE_OBJ ) || EQ_16( st_ivas->ism_mode, ISM_MASA_MODE_PARAM_ONE_OBJ ) )
                ELSE IF( EQ_32( st_ivas->ism_mode, ISM_MASA_MODE_MASA_ONE_OBJ ) || EQ_32( st_ivas->ism_mode, ISM_MASA_MODE_PARAM_ONE_OBJ ) )
                {
                    *numCldfbAnalyses = add( st_ivas->nchan_transport, 1 );
                    move16();
                }
            }
            IF( st_ivas->hDiracDecBin->useTdDecorr )
            {
                *numCldfbAnalyses = add( *numCldfbAnalyses, 2 );
                move16();
            }
            BREAK;
        case RENDERER_NON_DIEGETIC_DOWNMIX:
        case RENDERER_MONO_DOWNMIX:
            IF( EQ_16( ivas_format, ISM_FORMAT ) || EQ_16( ivas_format, MASA_ISM_FORMAT ) || EQ_16( ivas_format, SBA_ISM_FORMAT ) )
            test();
            test();
            test();
            IF( EQ_32( ivas_format, ISM_FORMAT ) || EQ_32( ivas_format, MASA_ISM_FORMAT ) || EQ_32( ivas_format, SBA_ISM_FORMAT ) )
            {
                /* CLDFB not used in rendering */
                *numCldfbAnalyses = 0;
                move16();
                *numCldfbSyntheses = 0;
                move16();
            }
            BREAK;
        case RENDERER_DIRAC:
            IF( EQ_16( ivas_format, SBA_FORMAT ) )
            IF( EQ_32( ivas_format, SBA_FORMAT ) )
            {
                *numCldfbAnalyses = st_ivas->hSpar->hFbMixer->fb_cfg->num_in_chans;

                IF( st_ivas->hOutSetup.is_loudspeaker_setup && EQ_16( st_ivas->renderer_type, RENDERER_DIRAC ) )
                move16();
                test();
                IF( st_ivas->hOutSetup.is_loudspeaker_setup && EQ_32( st_ivas->renderer_type, RENDERER_DIRAC ) )
                {
                    *numCldfbSyntheses = st_ivas->hOutSetup.nchan_out_woLFE;
                    move16();
                }
                ELSE IF( EQ_16( st_ivas->hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_FOA ) )
                ELSE IF( EQ_32( st_ivas->hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_FOA ) )
                {
                    *numCldfbSyntheses = st_ivas->hSpar->hFbMixer->fb_cfg->num_out_chans;
                    move16();
                }
                ELSE
                {
                    *numCldfbSyntheses = MAX_OUTPUT_CHANNELS;
                    move16();
                }
            }
            IF( NE_16( ivas_format, SBA_FORMAT ) )
            IF( NE_32( ivas_format, SBA_FORMAT ) )
            {
                IF( GT_16( st_ivas->nchan_transport, 2 ) && NE_16( st_ivas->sba_planar, 0 ) )
                test();
                test();
                IF( GT_16( st_ivas->nchan_transport, 2 ) && ( st_ivas->sba_planar != 0 ) )
                {
                    *numCldfbAnalyses = add( st_ivas->nchan_transport, 1 );
                    move16();
                }
                ELSE IF( EQ_16( st_ivas->nchan_transport, 1 ) && EQ_16( st_ivas->hDirACRend->synthesisConf, DIRAC_SYNTHESIS_GAIN_SHD ) )
                ELSE IF( EQ_16( st_ivas->nchan_transport, 1 ) && EQ_32( st_ivas->hDirACRend->synthesisConf, DIRAC_SYNTHESIS_GAIN_SHD ) )
                {
                    *numCldfbAnalyses = add( st_ivas->nchan_transport, 1 );
                    move16();
                }
            }
            BREAK;
@@ -99,11 +125,14 @@ void ivas_init_dec_get_num_cldfb_instances_ivas_fx(
            {
                /* CLDFB not used in rendering */
                *numCldfbAnalyses = 0;
                move16();
                *numCldfbSyntheses = 0;
                move16();
            }
            ELSE
            {
                *numCldfbSyntheses = param_mc_get_num_cldfb_syntheses_ivas_fx( st_ivas );
                move16();
            }
            BREAK;
        case RENDERER_PARAM_ISM:
@@ -112,7 +141,9 @@ void ivas_init_dec_get_num_cldfb_instances_ivas_fx(
        case RENDERER_DISABLE:
            /* CLDFB not used */
            *numCldfbAnalyses = 0;
            move16();
            *numCldfbSyntheses = 0;
            move16();
            BREAK;
        case RENDERER_MC:
        case RENDERER_SBA_LINEAR_DEC:
@@ -126,37 +157,47 @@ void ivas_init_dec_get_num_cldfb_instances_ivas_fx(
        case RENDERER_OSBA_STEREO:
        case RENDERER_OSBA_AMBI:
        case RENDERER_OSBA_LS:
            IF( EQ_16( ivas_format, SBA_FORMAT ) || EQ_16( ivas_format, SBA_ISM_FORMAT ) )
            test();
            IF( EQ_32( ivas_format, SBA_FORMAT ) || EQ_32( ivas_format, SBA_ISM_FORMAT ) )
            {
                IF( NE_16( st_ivas->sba_dirac_stereo_flag, 0 ) )
                IF( st_ivas->sba_dirac_stereo_flag != 0 )
                {
                    *numCldfbAnalyses = 0;
                    move16();
                    *numCldfbSyntheses = 0;
                    move16();
                }
                ELSE
                {
                    *numCldfbAnalyses = st_ivas->hSpar->hFbMixer->fb_cfg->num_in_chans;
                    move16();

                    IF( st_ivas->hOutSetup.is_loudspeaker_setup && EQ_16( st_ivas->renderer_type, RENDERER_DIRAC ) )
                    test();
                    IF( st_ivas->hOutSetup.is_loudspeaker_setup && EQ_32( st_ivas->renderer_type, RENDERER_DIRAC ) )
                    {
                        *numCldfbSyntheses = st_ivas->hOutSetup.nchan_out_woLFE;
                        move16();
                    }
                    ELSE IF( EQ_16( st_ivas->hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_FOA ) )
                    ELSE IF( EQ_32( st_ivas->hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_FOA ) )
                    {
                        *numCldfbSyntheses = st_ivas->hSpar->hFbMixer->fb_cfg->num_out_chans;
                        move16();
                    }
                    ELSE
                    {
                        *numCldfbSyntheses = MAX_OUTPUT_CHANNELS;
                        move16();
                    }

                    IF( EQ_16( st_ivas->ivas_format, SBA_ISM_FORMAT ) && EQ_16( st_ivas->renderer_type, RENDERER_BINAURAL_FASTCONV_ROOM ) )
                    test();
                    IF( EQ_32( st_ivas->ivas_format, SBA_ISM_FORMAT ) && EQ_32( st_ivas->renderer_type, RENDERER_BINAURAL_FASTCONV_ROOM ) )
                    {
                        *numCldfbAnalyses = add( st_ivas->nchan_ism, st_ivas->hSpar->hFbMixer->fb_cfg->num_in_chans );
                        move16();
                    }
                }
            }
            ELSE IF( EQ_16( st_ivas->mc_mode, MC_MODE_PARAMMC ) )
            ELSE IF( EQ_32( st_ivas->mc_mode, MC_MODE_PARAMMC ) )
            {
                /* do nothing for ParamMC */
            }
@@ -164,45 +205,60 @@ void ivas_init_dec_get_num_cldfb_instances_ivas_fx(
            {
                /* CLDFB not used in rendering */
                *numCldfbAnalyses = 0;
                move16();
                *numCldfbSyntheses = 0;
                move16();
            }
            BREAK;
        case RENDERER_SBA_LINEAR_ENC:
            IF( EQ_16( st_ivas->mc_mode, MC_MODE_PARAMMC ) )
            IF( EQ_32( st_ivas->mc_mode, MC_MODE_PARAMMC ) )
            {
                *numCldfbSyntheses = param_mc_get_num_cldfb_syntheses_ivas_fx( st_ivas );
                move16();
            }
            ELSE IF( EQ_16( st_ivas->ism_mode, ISM_MODE_PARAM ) )
            ELSE IF( EQ_32( st_ivas->ism_mode, ISM_MODE_PARAM ) )
            {
                *numCldfbSyntheses = add( st_ivas->hIntSetup.nchan_out_woLFE, st_ivas->hIntSetup.num_lfe );
                move16();
            }
            ELSE IF( EQ_16( st_ivas->mc_mode, MC_MODE_MCMASA ) )
            ELSE IF( EQ_32( st_ivas->mc_mode, MC_MODE_MCMASA ) )
            {
                *numCldfbAnalyses = st_ivas->nchan_transport;
                move16();
                *numCldfbSyntheses = add( st_ivas->hIntSetup.nchan_out_woLFE, st_ivas->hIntSetup.num_lfe );
                move16();
            }
            ELSE
            {
                /* CLDFB not used in rendering */
                *numCldfbAnalyses = 0;
                move16();
                *numCldfbSyntheses = 0;
                move16();
            }
            BREAK;
        default:
            assert( 0 && "Renderer not handled for CLDFB reservation." );
    }

    IF( EQ_16( st_ivas->mc_mode, MC_MODE_PARAMUPMIX ) && NE_16( st_ivas->hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_MONO ) && NE_16( st_ivas->hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_STEREO ) )
    test();
    test();
    IF( EQ_32( st_ivas->mc_mode, MC_MODE_PARAMUPMIX ) && NE_32( st_ivas->hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_MONO ) && NE_32( st_ivas->hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_STEREO ) )
    {
        IF( EQ_16( st_ivas->renderer_type, RENDERER_BINAURAL_FASTCONV ) || EQ_16( st_ivas->renderer_type, RENDERER_BINAURAL_FASTCONV_ROOM ) || EQ_16( st_ivas->renderer_type, RENDERER_STEREO_PARAMETRIC ) )
        test();
        test();
        IF( EQ_32( st_ivas->renderer_type, RENDERER_BINAURAL_FASTCONV ) || EQ_32( st_ivas->renderer_type, RENDERER_BINAURAL_FASTCONV_ROOM ) || EQ_32( st_ivas->renderer_type, RENDERER_STEREO_PARAMETRIC ) )
        {
            *numCldfbAnalyses = s_max( MC_PARAMUPMIX_MAX_INPUT_CHANS, *numCldfbAnalyses );
            move16();
        }
        ELSE
        {
            *numCldfbAnalyses = s_max( MC_PARAMUPMIX_MIN_CLDFB, *numCldfbAnalyses );
            move16();
        }
        *numCldfbSyntheses = s_max( MC_PARAMUPMIX_MIN_CLDFB, *numCldfbSyntheses );
        move16();
    }

    return;
+62 −31

File changed.

Preview size limit exceeded, changes collapsed.

Loading