Commit 2e632e49 authored by Jan Kiene's avatar Jan Kiene
Browse files

fix conflicts

parent 3559899b

lib_dec/ivas_binRenderer_internal_fx.c

+48 −116
Original line number Diff line number Diff line
@@ -75,15 +75,11 @@ static void ivas_binRenderer_filterModule_fx( 
    const Word32 *filterTapsLeftRealPtr_fx, *filterTapsLeftImagPtr_fx, *filterTapsRightRealPtr_fx, *filterTapsRightImagPtr_fx;

    Word16 shift_q;

#ifdef SPLIT_REND_WITH_HEAD_ROT

#ifdef OPT_BASOP_ADD_v1

    Q_filterStates = hBinRenderer->hBinRenConvModule->Q_filterStates[pos_idx];

    move16();

#endif /* OPT_BASOP_ADD_v1 */

#else

#ifdef OPT_BASOP_ADD_v1

    Q_filterStates = hBinRenderer->hBinRenConvModule->Q_filterStatesLeft;

    move16();

#endif /* OPT_BASOP_ADD_v1 */

#endif



    FOR( bandIdx = 0; bandIdx < hBinRenderer->conv_band; bandIdx++ )
@@ -93,15 +89,9 @@ static void ivas_binRenderer_filterModule_fx( 
#ifdef SPLIT_REND_WITH_HEAD_ROT

            filterStatesLeftRealPtr_fx = (Word32 *) &( hBinRenderer->hBinRenConvModule->filterStatesLeftReal_fx[pos_idx][bandIdx][chIdx][0] );

            filterStatesLeftImagPtr_fx = (Word32 *) &( hBinRenderer->hBinRenConvModule->filterStatesLeftImag_fx[pos_idx][bandIdx][chIdx][0] );

#ifndef OPT_BASOP_ADD_v1

            Q_filterStates = (Word16 *) &( hBinRenderer->hBinRenConvModule->Q_filterStatesLeft[pos_idx][bandIdx][chIdx][0] );

#endif

#else

            filterStatesLeftRealPtr_fx = (Word32 *) &( hBinRenderer->hBinRenConvModule->filterStatesLeftReal_fx[bandIdx][chIdx][0] );

            filterStatesLeftImagPtr_fx = (Word32 *) &( hBinRenderer->hBinRenConvModule->filterStatesLeftImag_fx[bandIdx][chIdx][0] );

#ifndef OPT_BASOP_ADD_v1

            Q_filterStates = (Word16 *) &( hBinRenderer->hBinRenConvModule->Q_filterStatesLeft[bandIdx][chIdx][0] );

#endif /* OPT_BASOP_ADD_v1 */

#endif /* SPLIT_REND_WITH_HEAD_ROT */



            filterTapsLeftRealPtr_fx = hBinRenderer->hBinRenConvModule->filterTapsLeftReal_fx[bandIdx][chIdx];   // Q29
@@ -146,7 +136,6 @@ static void ivas_binRenderer_filterModule_fx( 
                    outImagLeft_fx = W_shr( outImagLeft_fx, shift_q );   // Q_curr

                    outRealRight_fx = W_shr( outRealRight_fx, shift_q ); // Q_curr

                    outImagRight_fx = W_shr( outImagRight_fx, shift_q ); // Q_curr

#ifdef OPT_BASOP_ADD_v1

#ifdef SPLIT_REND_WITH_HEAD_ROT

                    hBinRenderer->hBinRenConvModule->Q_filterStates[pos_idx] = Q_curr;

#else
@@ -353,17 +342,10 @@ static ivas_error ivas_binRenderer_convModuleOpen( 
        return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Convolution Module \n" ) );

    }



#ifdef OPT_BASOP_ADD_v1

    IF( ( hBinRenConvModule->Q_filterStates = (Word16 *) malloc( num_poses * sizeof( Word16 ) ) ) == NULL )

    {

        return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Convolution Module \n" ) );

    }

#else

    IF( ( hBinRenConvModule->Q_filterStatesLeft = (Word16 ****) malloc( num_poses * sizeof( Word16 *** ) ) ) == NULL )

    {

        return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Convolution Module \n" ) );

    }

#endif /* OPT_BASOP_ADD_v1 */



    for ( pos_idx = 0; pos_idx < num_poses; pos_idx++ )

    {
@@ -377,12 +359,6 @@ static ivas_error ivas_binRenderer_convModuleOpen( 
            return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Convolution Module \n" ) );

        }



#ifndef OPT_BASOP_ADD_v1

        IF( ( hBinRenConvModule->Q_filterStatesLeft[pos_idx] = (Word16 ***) malloc( hBinRenderer->conv_band * sizeof( Word16 ** ) ) ) == NULL )

        {

            return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Convolution Module \n" ) );

        }

#endif /* OPT_BASOP_ADD_v1 */



        for ( bandIdx = 0; bandIdx < hBinRenderer->conv_band; bandIdx++ )

        {
@@ -396,12 +372,6 @@ static ivas_error ivas_binRenderer_convModuleOpen( 
                return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Convolution Module \n" ) );

            }



#ifndef OPT_BASOP_ADD_v1

            IF( ( hBinRenConvModule->Q_filterStatesLeft[pos_idx][bandIdx] = (Word16 **) malloc( hBinRenderer->nInChannels * sizeof( Word16 * ) ) ) == NULL )

            {

                return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Convolution Module \n" ) );

            }

#endif /* OPT_BASOP_ADD_v1 */



            for ( chIdx = 0; chIdx < hBinRenderer->nInChannels; chIdx++ )

            {
@@ -414,13 +384,6 @@ static ivas_error ivas_binRenderer_convModuleOpen( 
                {

                    return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Convolution Module \n" ) );

                }



#ifndef OPT_BASOP_ADD_v1

                IF( ( hBinRenConvModule->Q_filterStatesLeft[pos_idx][bandIdx][chIdx] = (Word16 *) malloc( hBinRenConvModule->numTapsArray[bandIdx] * sizeof( Word16 ) ) ) == NULL )

                {

                    return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Convolution Module \n" ) );

                }

#endif /* OPT_BASOP_ADD_v1 */

            }

        }

    }
@@ -509,9 +472,6 @@ static ivas_error ivas_binRenderer_convModuleOpen( 
                set32_fx( hBinRenConvModule->filterStatesLeftImag_fx[bandIdx][chIdx], 0, hBinRenConvModule->numTapsArray[bandIdx] );

                hBinRenConvModule->Q_filterStatesLeft = 31;

                move16();

#else  /* OPT_BASOP_ADD_v1 */

                set16_fx( hBinRenConvModule->Q_filterStatesLeft[bandIdx][chIdx], 31, hBinRenConvModule->numTapsArray[bandIdx] );

#endif /* OPT_BASOP_ADD_v1 */

#endif /* !SPLIT_REND_WITH_HEAD_ROT */

                IF( isLoudspeaker )

                {
@@ -529,9 +489,6 @@ static ivas_error ivas_binRenderer_convModuleOpen( 
                set32_fx( hBinRenConvModule->filterStatesLeftImag_fx[bandIdx][chIdx], 0, hBinRenConvModule->numTaps );

                hBinRenConvModule->Q_filterStatesLeft = 31;

                move16();

#else  /* OPT_BASOP_ADD_v1 */

                    set16_fx( hBinRenConvModule->Q_filterStatesLeft[bandIdx][chIdx], 31, hBinRenConvModule->numTaps );

#endif /* OPT_BASOP_ADD_v1 */

#endif /* SPLIT_REND_WITH_HEAD_ROT */

                IF( isLoudspeaker )

                {
@@ -580,10 +537,8 @@ static ivas_error ivas_binRenderer_convModuleOpen( 
    {

        for ( pos_idx = 0; pos_idx < num_poses; pos_idx++ )

        {

#ifdef OPT_BASOP_ADD_v1

            hBinRenConvModule->Q_filterStates[pos_idx] = 31;

            move16();

#endif

            for ( bandIdx = 0; bandIdx < hBinRenderer->conv_band; bandIdx++ )

            {

                for ( chIdx = 0; chIdx < hBinRenderer->nInChannels; chIdx++ )
@@ -591,9 +546,6 @@ static ivas_error ivas_binRenderer_convModuleOpen( 
                    /* set the memories to zero */

                    set32_fx( hBinRenConvModule->filterStatesLeftReal_fx[pos_idx][bandIdx][chIdx], 0, hBinRenConvModule->numTapsArray[bandIdx] );

                    set32_fx( hBinRenConvModule->filterStatesLeftImag_fx[pos_idx][bandIdx][chIdx], 0, hBinRenConvModule->numTapsArray[bandIdx] );

#ifndef OPT_BASOP_ADD_v1

                    set16_fx( hBinRenConvModule->Q_filterStatesLeft[pos_idx][bandIdx][chIdx], 31, hBinRenConvModule->numTapsArray[bandIdx] );

#endif /* OPT_BASOP_ADD_v1 */

                }

            }

        }
@@ -602,10 +554,8 @@ static ivas_error ivas_binRenderer_convModuleOpen( 
    {

        for ( pos_idx = 0; pos_idx < num_poses; pos_idx++ )

        {

#ifdef OPT_BASOP_ADD_v1

            hBinRenConvModule->Q_filterStates[pos_idx] = 31;

            move16();

#endif

            for ( bandIdx = 0; bandIdx < hBinRenderer->conv_band; bandIdx++ )

            {

                for ( chIdx = 0; chIdx < hBinRenderer->nInChannels; chIdx++ )
@@ -613,9 +563,6 @@ static ivas_error ivas_binRenderer_convModuleOpen( 
                    /* set the memories to zero */

                    set32_fx( hBinRenConvModule->filterStatesLeftReal_fx[pos_idx][bandIdx][chIdx], 0, hBinRenConvModule->numTaps );

                    set32_fx( hBinRenConvModule->filterStatesLeftImag_fx[pos_idx][bandIdx][chIdx], 0, hBinRenConvModule->numTaps );

#ifndef OPT_BASOP_ADD_v1

                    set16_fx( hBinRenConvModule->Q_filterStatesLeft[pos_idx][bandIdx][chIdx], 31, hBinRenConvModule->numTaps );

#endif /* OPT_BASOP_ADD_v1 */

                }

            }

        }
@@ -1605,11 +1552,6 @@ static void ivas_binRenderer_convModuleClose_fx( 


                free( hBinRenConvModule->filterStatesLeftImag_fx[posIdx][bandIdx][chIdx] );

                hBinRenConvModule->filterStatesLeftImag_fx[posIdx][bandIdx][chIdx] = NULL;

#ifndef OPT_BASOP_ADD_v1



                free( hBinRenConvModule->Q_filterStatesLeft[posIdx][bandIdx][chIdx] );

                hBinRenConvModule->Q_filterStatesLeft[posIdx][bandIdx][chIdx] = NULL;

#endif /* OPT_BASOP_ADD_v1 */

            }



            free( hBinRenConvModule->filterStatesLeftReal_fx[posIdx][bandIdx] );
@@ -1617,22 +1559,12 @@ static void ivas_binRenderer_convModuleClose_fx( 


            free( hBinRenConvModule->filterStatesLeftImag_fx[posIdx][bandIdx] );

            hBinRenConvModule->filterStatesLeftImag_fx[posIdx][bandIdx] = NULL;

#ifndef OPT_BASOP_ADD_v1



            free( hBinRenConvModule->Q_filterStatesLeft[posIdx][bandIdx] );

            hBinRenConvModule->Q_filterStatesLeft[posIdx][bandIdx] = NULL;

#endif /* OPT_BASOP_ADD_v1 */

        }

        free( hBinRenConvModule->filterStatesLeftReal_fx[posIdx] );

        hBinRenConvModule->filterStatesLeftReal_fx[posIdx] = NULL;



        free( hBinRenConvModule->filterStatesLeftImag_fx[posIdx] );

        hBinRenConvModule->filterStatesLeftImag_fx[posIdx] = NULL;

#ifndef OPT_BASOP_ADD_v1



        free( hBinRenConvModule->Q_filterStatesLeft[posIdx] );

        hBinRenConvModule->Q_filterStatesLeft[posIdx] = NULL;

#endif /* OPT_BASOP_ADD_v1 */

    }

#else

    FOR( bandIdx = 0; bandIdx < ( *hBinRenderer )->conv_band; bandIdx++ )

lib_dec/ivas_mc_paramupmix_dec_fx.c

+0 −4
Original line number Diff line number Diff line
@@ -718,10 +718,6 @@ static void ivas_mc_paramupmix_dec_sf( 
    Word16 subframeIdx, idx_in, maxBand;

    Word32 Cldfb_RealBuffer_subfr_fx[MAX_INTERN_CHANNELS][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX] = { 0 };

    Word32 Cldfb_ImagBuffer_subfr_fx[MAX_INTERN_CHANNELS][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX] = { 0 };

#else

    Word32 Cldfb_RealBuffer_subfr_fx[MAX_INTERN_CHANNELS][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX];

    Word32 Cldfb_ImagBuffer_subfr_fx[MAX_INTERN_CHANNELS][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX];

#endif // MSAN_FIX



#ifdef SPLIT_REND_WITH_HEAD_ROT

    Word32 Cldfb_RealBuffer_Binaural_fx[MAX_HEAD_ROT_POSES][BINAURAL_CHANNELS][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX];

lib_enc/init_enc_fx.c

+0 −1
Original line number Diff line number Diff line
@@ -2100,7 +2100,6 @@ ivas_error init_encoder_ivas_fx( 
    st->exp_old_inp_12k8 = sub( st->exp_old_inp_12k8, shift );

    move16();

    /* Initialize ACELP */

#endif

    init_coder_ace_plus_ivas_fx( st, st->last_total_brate, igf_brate, 0 );



    IF( st->hLPDmem != NULL )

lib_isar/isar_splitRendererPost.c

+6 −6
Original line number Diff line number Diff line
@@ -2023,10 +2023,10 @@ static void isar_rend_CldfbSplitPostRendProcessTdIn( 
        Q_cldfb = add( scaleFactor, Q_in );

#endif

        Scale_sig32( hBinHrSplitPostRend->cldfbSyn[ch_idx]->cldfb_state_fx, hBinHrSplitPostRend->cldfbSyn[ch_idx]->p_filter_length, sub( sub( Q_cldfb, 1 ), Q11 ) );

#ifdef OPT_SBA_AVOID_SPAR_RESCALE

        cldfbSynthesis_ivas_fx( RealBuffer_fx, ImagBuffer_fx, &( output_fx[ch_idx][0] ), num_cldfb_bands * CLDFB_NO_COL_MAX / MAX_PARAM_SPATIAL_SUBFRAMES, 0, hBinHrSplitPostRend->cldfbSyn[ch_idx] ); // Q_cldfb - 1

#ifdef OPT_AVOID_STATE_BUF_RESCALE

        cldfbSynthesis_ivas_fx( RealBuffer_fx, ImagBuffer_fx, &( output_fx[ch_idx][0] ), num_cldfb_bands * CLDFB_NO_COL_MAX / MAX_PARAM_SPATIAL_SUBFRAMES, 0, 0, hBinHrSplitPostRend->cldfbSyn[ch_idx] ); // Q_cldfb - 1

#else

        cldfbSynthesis_ivas_fx( RealBuffer_fx, ImagBuffer_fx, &( output_fx[ch_idx][0] ), num_cldfb_bands * CLDFB_NO_COL_MAX / MAX_PARAM_SPATIAL_SUBFRAMES, hBinHrSplitPostRend->cldfbSyn[ch_idx] ); // Q_cldfb - 1

        cldfbSynthesis_ivas_fx( RealBuffer_fx, ImagBuffer_fx, &( output_fx[ch_idx][0] ), num_cldfb_bands * CLDFB_NO_COL_MAX / MAX_PARAM_SPATIAL_SUBFRAMES, 0, hBinHrSplitPostRend->cldfbSyn[ch_idx] ); // Q_cldfb - 1

#endif

        Scale_sig32( hBinHrSplitPostRend->cldfbSyn[ch_idx]->cldfb_state_fx, hBinHrSplitPostRend->cldfbSyn[ch_idx]->p_filter_length, sub( Q11, sub( Q_cldfb, 1 ) ) );

        Q_out[ch_idx] = sub( Q_cldfb, 1 );
@@ -2091,10 +2091,10 @@ void isar_rend_CldfbSplitPostRendProcess( 
        }

        Q_cldfb = scaleFactor + Q_cldfb_in;

        Scale_sig32( hBinHrSplitPostRend->cldfbSyn[ch_idx]->cldfb_state_fx, hBinHrSplitPostRend->cldfbSyn[ch_idx]->p_filter_length, sub( sub( Q_cldfb, 1 ), Q11 ) );

#ifdef OPT_SBA_AVOID_SPAR_RESCALE

        cldfbSynthesis_ivas_fx( RealBuffer_fx, ImagBuffer_fx, &( output_fx[ch_idx][0] ), num_cldfb_bands * CLDFB_NO_COL_MAX / MAX_PARAM_SPATIAL_SUBFRAMES, 0, hBinHrSplitPostRend->cldfbSyn[ch_idx] ); // Q_cldfb - 1

#ifdef OPT_AVOID_STATE_BUF_RESCALE

        cldfbSynthesis_ivas_fx( RealBuffer_fx, ImagBuffer_fx, &( output_fx[ch_idx][0] ), num_cldfb_bands * CLDFB_NO_COL_MAX / MAX_PARAM_SPATIAL_SUBFRAMES, 0, 0, hBinHrSplitPostRend->cldfbSyn[ch_idx] ); // Q_cldfb - 1

#else

        cldfbSynthesis_ivas_fx( RealBuffer_fx, ImagBuffer_fx, &( output_fx[ch_idx][0] ), num_cldfb_bands * CLDFB_NO_COL_MAX / MAX_PARAM_SPATIAL_SUBFRAMES, hBinHrSplitPostRend->cldfbSyn[ch_idx] ); // Q_cldfb - 1

        cldfbSynthesis_ivas_fx( RealBuffer_fx, ImagBuffer_fx, &( output_fx[ch_idx][0] ), num_cldfb_bands * CLDFB_NO_COL_MAX / MAX_PARAM_SPATIAL_SUBFRAMES, 0, hBinHrSplitPostRend->cldfbSyn[ch_idx] ); // Q_cldfb - 1

#endif

        Scale_sig32( hBinHrSplitPostRend->cldfbSyn[ch_idx]->cldfb_state_fx, hBinHrSplitPostRend->cldfbSyn[ch_idx]->p_filter_length, sub( Q11, sub( Q_cldfb, 1 ) ) );

        Q_out[ch_idx] = sub( Q_cldfb, 1 );

lib_isar/lib_isar_post_rend.c

+5 −3
Original line number Diff line number Diff line
@@ -1624,18 +1624,20 @@ static ivas_error renderSplitBinauralWithPostRot( 
                    }

                    Q_cldfb = scaleFactor + Q_cldfb_final[sf_idx];

                    Scale_sig32( hSplitBin->hBinHrSplitPostRend->cldfbSyn[ch_idx]->cldfb_state_fx, hSplitBin->hBinHrSplitPostRend->cldfbSyn[ch_idx]->p_filter_length, sub( sub( Q_cldfb, 1 ), Q11 ) );

#ifdef OPT_SBA_AVOID_SPAR_RESCALE

#ifdef OPT_AVOID_STATE_BUF_RESCALE

                    cldfbSynthesis_ivas_fx( RealBuffer_fx,

                                            ImagBuffer_fx,

                                            &( tmpCrendBuffer_fx[ch_idx][sf_idx * outBufNumSamplesPerChannel] ),

                                            hSplitBin->hBinHrSplitPostRend->cldfbSyn[0]->no_channels * CLDFB_NO_COL_MAX / MAX_PARAM_SPATIAL_SUBFRAMES,

                                            0,

                                            0,

                                            hSplitBin->hBinHrSplitPostRend->cldfbSyn[ch_idx] ); // Q_cldfb - 1

#else

                    cldfbSynthesis_ivas_fx( RealBuffer_fx,

                                            ImagBuffer_fx,

                                            &( tmpCrendBuffer_fx[ch_idx][sf_idx * outBufNumSamplesPerChannel] ),

                                            hSplitBin->hBinHrSplitPostRend->cldfbSyn[0]->no_channels * CLDFB_NO_COL_MAX / MAX_PARAM_SPATIAL_SUBFRAMES,

                                            0,

                                            hSplitBin->hBinHrSplitPostRend->cldfbSyn[ch_idx] ); // Q_cldfb - 1

#endif

                    Scale_sig32( hSplitBin->hBinHrSplitPostRend->cldfbSyn[ch_idx]->cldfb_state_fx, hSplitBin->hBinHrSplitPostRend->cldfbSyn[ch_idx]->p_filter_length, sub( Q11, sub( Q_cldfb, 1 ) ) );