Commit 76eaae3b authored by multrus's avatar multrus
Browse files

remove remaining instances of BASOP_Util_Divide3232_Scale_cadence()

parent bce6e1fb

lib_isar/isar_splitRendererPre.c

+16 −0
Original line number Diff line number Diff line
@@ -2964,7 +2964,11 @@ ivas_error isar_renderMultiTDBinToSplitBinaural( 
        // target_md_bits = isar_get_split_rend_md_target_brate( SplitRendBitRate, pcm_out_flag ) * L_FRAME48k / 48000;

        target_md_bits = W_extract_l( W_mult0_32_32( isar_get_split_rend_md_target_brate( SplitRendBitRate, pcm_out_flag ), L_FRAME48k ) );

        tmp_e = 0;

#ifndef REMOVE_BASOP_Util_Divide3232_Scale_cadence

        tmp_32 = BASOP_Util_Divide3232_Scale_cadence( target_md_bits, 48000, &tmp_e );

#else

        tmp_32 = BASOP_Util_Divide3232_Scale_newton( target_md_bits, 48000, &tmp_e );

#endif

        target_md_bits = L_shr( tmp_32, sub( 31, tmp_e ) ); // Q0



        /*scaling to max Q*/
@@ -3002,7 +3006,11 @@ ivas_error isar_renderMultiTDBinToSplitBinaural( 
            // available_bits = ( SplitRendBitRate * hSplitBin->hSplitBinLCLDEnc->iNumBlocks * hSplitBin->hSplitBinLCLDEnc->iNumIterations ) / ( 16 * FRAMES_PER_SEC );

            available_bits = W_extract_l( W_mult0_32_32( SplitRendBitRate, L_mult0( hSplitBin->hSplitBinLCLDEnc->iNumBlocks, hSplitBin->hSplitBinLCLDEnc->iNumIterations ) ) );

            tmp_e = 0;

#ifndef REMOVE_BASOP_Util_Divide3232_Scale_cadence

            tmp_32 = BASOP_Util_Divide3232_Scale_cadence( available_bits, L_mult0( 16, FRAMES_PER_SEC ), &tmp_e );

#else

            tmp_32 = BASOP_Util_Divide3232_Scale_newton( available_bits, L_mult0( 16, FRAMES_PER_SEC ), &tmp_e );

#endif

            available_bits = L_shr( tmp_32, sub( 31, tmp_e ) ); // Q0

            available_bits = L_sub( available_bits, pBits->bits_written );

            pBits->codec_frame_size_ms = codec_frame_size_ms;
@@ -3050,7 +3058,11 @@ ivas_error isar_renderMultiTDBinToSplitBinaural( 


            bit_len = W_extract_l( W_mult0_32_32( SplitRendBitRate, L_mult0( hSplitBin->hSplitBinLCLDEnc->iNumBlocks, hSplitBin->hSplitBinLCLDEnc->iNumIterations ) ) );

            tmp_e = 0;

#ifndef REMOVE_BASOP_Util_Divide3232_Scale_cadence

            tmp_32 = BASOP_Util_Divide3232_Scale_cadence( bit_len, L_mult0( 16, FRAMES_PER_SEC ), &tmp_e );

#else

            tmp_32 = BASOP_Util_Divide3232_Scale_newton( bit_len, L_mult0( 16, FRAMES_PER_SEC ), &tmp_e );

#endif

            bit_len = L_shr( tmp_32, sub( 31, tmp_e ) ); // Q0

        }

        ELSE
@@ -3061,7 +3073,11 @@ ivas_error isar_renderMultiTDBinToSplitBinaural( 
                                                                   // bit_len = hSplitBin->hLc3plusEnc->config.ivas_frame_duration_us / 1000;

                                                                   // bit_len = SplitRendBitRate * bit_len / 1000;

            tmp_e = 0;

#ifndef REMOVE_BASOP_Util_Divide3232_Scale_cadence

            tmp_32 = BASOP_Util_Divide3232_Scale_cadence( W_extract_l( W_mult0_32_32( SplitRendBitRate, bit_len ) ), 1000, &tmp_e );

#else

            tmp_32 = BASOP_Util_Divide3232_Scale_newton( W_extract_l( W_mult0_32_32( SplitRendBitRate, bit_len ) ), 1000, &tmp_e );

#endif

            bit_len = L_shr( tmp_32, sub( 31, tmp_e ) ); // Q0

        }

    }

lib_isar/lib_isar_pre_rend.c

+12 −0
Original line number Diff line number Diff line
@@ -376,7 +376,11 @@ ivas_error ISAR_PRE_REND_MultiBinToSplitBinaural( 
            // available_bits = ( SplitRendBitRate * hSplitBin->hSplitBinLCLDEnc->iNumBlocks * hSplitBin->hSplitBinLCLDEnc->iNumIterations ) / ( 16 * FRAMES_PER_SEC );

            available_bits = W_extract_l( W_mult0_32_32( SplitRendBitRate, L_mult0( hSplitBin->hSplitBinLCLDEnc->iNumBlocks, hSplitBin->hSplitBinLCLDEnc->iNumIterations ) ) );

            tmp_e = 0;

#ifndef REMOVE_BASOP_Util_Divide3232_Scale_cadence

            tmp_32 = BASOP_Util_Divide3232_Scale_cadence( available_bits, L_mult0( 16, FRAMES_PER_SEC ), &tmp_e );

#else

            tmp_32 = BASOP_Util_Divide3232_Scale_newton( available_bits, L_mult0( 16, FRAMES_PER_SEC ), &tmp_e );

#endif

            available_bits = L_shr( tmp_32, sub( 31, tmp_e ) ); // Q0

            available_bits = L_sub( available_bits, pBits->bits_written );

            pBits->codec_frame_size_ms = codec_frame_size_ms;
@@ -543,7 +547,11 @@ ivas_error ISAR_PRE_REND_MultiBinToSplitBinaural( 


            bit_len = W_extract_l( W_mult0_32_32( SplitRendBitRate, L_mult0( hSplitBin->hSplitBinLCLDEnc->iNumBlocks, hSplitBin->hSplitBinLCLDEnc->iNumIterations ) ) );

            tmp_e = 0;

#ifndef REMOVE_BASOP_Util_Divide3232_Scale_cadence

            tmp_32 = BASOP_Util_Divide3232_Scale_cadence( bit_len, L_mult0( 16, FRAMES_PER_SEC ), &tmp_e );

#else

            tmp_32 = BASOP_Util_Divide3232_Scale_newton( bit_len, L_mult0( 16, FRAMES_PER_SEC ), &tmp_e );

#endif

            bit_len = L_shr( tmp_32, sub( 31, tmp_e ) ); // Q0

        }

        ELSE
@@ -554,7 +562,11 @@ ivas_error ISAR_PRE_REND_MultiBinToSplitBinaural( 
                                                                   // bit_len = hSplitBin->hLc3plusEnc->config.ivas_frame_duration_us / 1000;

                                                                   // bit_len = SplitRendBitRate * bit_len / 1000;

            tmp_e = 0;

#ifndef REMOVE_BASOP_Util_Divide3232_Scale_cadence

            tmp_32 = BASOP_Util_Divide3232_Scale_cadence( W_extract_l( W_mult0_32_32( SplitRendBitRate, bit_len ) ), 1000, &tmp_e );

#else

            tmp_32 = BASOP_Util_Divide3232_Scale_newton( W_extract_l( W_mult0_32_32( SplitRendBitRate, bit_len ) ), 1000, &tmp_e );

#endif

            bit_len = L_shr( tmp_32, sub( 31, tmp_e ) ); // Q0

        }

    }

lib_rend/ivas_dirac_dec_binaural_functions_fx.c

+8 −0
Original line number Diff line number Diff line
@@ -1500,7 +1500,11 @@ static void ivas_dirac_dec_binaural_formulate_input_covariance_matrices_fx( 
        move16();

        den = BASOP_Util_Add_Mant32Exp( hDiracDecBin->ChEnePrev_fx[0][bin], hDiracDecBin->ChEnePrev_e[0][bin], hDiracDecBin->ChEnePrev_fx[1][bin], hDiracDecBin->ChEnePrev_e[1][bin], &den_e );

        den = L_max( 1, den );

#ifndef REMOVE_BASOP_Util_Divide3232_Scale_cadence

        IIReneLimiter_fx[bin] = BASOP_Util_Divide3232_Scale_cadence( num, den, &exp );

#else

        IIReneLimiter_fx[bin] = BASOP_Util_Divide3232_Scale_newton( num, den, &exp );

#endif

        exp = add( sub( num_e, den_e ), add( 5, exp ) );

        IF( L_shr_sat( IIReneLimiter_fx[bin], sub( 31, exp ) ) > 0 )

        {
@@ -2002,7 +2006,11 @@ static void ivas_dirac_dec_binaural_formulate_target_covariance_matrices_fx( 
        move32();



        /* Formulate average diffuseness over frame */

#ifndef REMOVE_BASOP_Util_Divide3232_Scale_cadence

        frameMeanDiffuseness = BASOP_Util_Divide3232_Scale_cadence( frameMeanDiffuseness, L_max( EPSILLON_FX, frameMeanDiffusenessEneWeight_fx[bin] ), &exp ); // exp = exp + 31 - q_meanEnePerCh - exp1

#else

        frameMeanDiffuseness = BASOP_Util_Divide3232_Scale_newton( frameMeanDiffuseness, L_max( EPSILLON_FX, frameMeanDiffusenessEneWeight_fx[bin] ), &exp ); // exp = exp + 31 - q_meanEnePerCh - exp1

#endif

        exp = sub( exp, sub( sub( 31, q_meanEnePerCh ), exp1 ) );

        hDiracDecBin->frameMeanDiffuseness_fx[bin] = L_shl( frameMeanDiffuseness, sub( exp, 2 ) ); // Q29

        move32();