Commit 4ca65f28 authored by emerit's avatar emerit
Browse files

correct _fx_fx to _fx

parent 4a1c6396

lib_enc/swb_tbe_enc_fx.c

+47 −47
Original line number Diff line number Diff line
@@ -5426,7 +5426,7 @@ static void QuantizeSHBsubgains_ivas_fx( 




/*-------------------------------------------------------------------*

 * Quant_shb_ener_sf_fx_fx()

 * Quant_shb_ener_sf_fx()

 *

 * Quantize SHB subframe energies

 *-------------------------------------------------------------------*/

lib_rend/ivas_crend.c

+22 −22
Original line number Diff line number Diff line
@@ -1359,13 +1359,13 @@ static ivas_error ivas_rend_initCrend_fx( 
            {

                IF( EQ_16( outConfig, IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR ) )

                {

                    hHrtf->latency_s_fx_fx = CRendBin_Combined_BRIR_latency_s_fx;                                  // Q31

                    hHrtf->latency_s_fx = CRendBin_Combined_BRIR_latency_s_fx;                                     // Q31

                    hHrtf->max_num_iterations = CRendBin_Combined_BRIR_max_num_iterations_48kHz;                   // Q0

                    hHrtf->index_frequency_max_diffuse = CRendBin_Combined_BRIR_index_frequency_max_diffuse_48kHz; // Q0

                }

                ELSE

                {

                    hHrtf->latency_s_fx_fx = CRendBin_Combined_HRIR_latency_s_fx;                                  // Q31

                    hHrtf->latency_s_fx = CRendBin_Combined_HRIR_latency_s_fx;                                     // Q31

                    hHrtf->max_num_iterations = CRendBin_Combined_HRIR_max_num_iterations_48kHz;                   // Q0

                    hHrtf->index_frequency_max_diffuse = CRendBin_Combined_HRIR_index_frequency_max_diffuse_48kHz; // Q0

                }
@@ -1401,13 +1401,13 @@ static ivas_error ivas_rend_initCrend_fx( 
            {

                IF( EQ_16( outConfig, IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR ) )

                {

                    hHrtf->latency_s_fx_fx = CRendBin_Combined_BRIR_latency_s_fx;                                  // Q31

                    hHrtf->latency_s_fx = CRendBin_Combined_BRIR_latency_s_fx;                                     // Q31

                    hHrtf->max_num_iterations = CRendBin_Combined_BRIR_max_num_iterations_32kHz;                   // Q0

                    hHrtf->index_frequency_max_diffuse = CRendBin_Combined_BRIR_index_frequency_max_diffuse_32kHz; // Q0

                }

                ELSE

                {

                    hHrtf->latency_s_fx_fx = CRendBin_Combined_HRIR_latency_s_fx;                                  // Q31

                    hHrtf->latency_s_fx = CRendBin_Combined_HRIR_latency_s_fx;                                     // Q31

                    hHrtf->max_num_iterations = CRendBin_Combined_HRIR_max_num_iterations_32kHz;                   // Q0

                    hHrtf->index_frequency_max_diffuse = CRendBin_Combined_HRIR_index_frequency_max_diffuse_32kHz; // Q0

                }
@@ -1443,13 +1443,13 @@ static ivas_error ivas_rend_initCrend_fx( 
            {

                IF( EQ_16( outConfig, IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR ) )

                {

                    hHrtf->latency_s_fx_fx = CRendBin_Combined_BRIR_latency_s_fx; // Q31

                    hHrtf->latency_s_fx = CRendBin_Combined_BRIR_latency_s_fx; // Q31

                    hHrtf->max_num_iterations = CRendBin_Combined_BRIR_max_num_iterations_16kHz;

                    hHrtf->index_frequency_max_diffuse = CRendBin_Combined_BRIR_index_frequency_max_diffuse_16kHz;

                }

                ELSE

                {

                    hHrtf->latency_s_fx_fx = CRendBin_Combined_HRIR_latency_s_fx; // Q31

                    hHrtf->latency_s_fx = CRendBin_Combined_HRIR_latency_s_fx; // Q31

                    hHrtf->max_num_iterations = CRendBin_Combined_HRIR_max_num_iterations_16kHz;

                    hHrtf->index_frequency_max_diffuse = CRendBin_Combined_HRIR_index_frequency_max_diffuse_16kHz;

                }
@@ -1634,7 +1634,7 @@ static ivas_error ivas_rend_initCrend_fx( 
            {

                IF( EQ_32( output_Fs, 48000 ) )

                {

                    hHrtf->latency_s_fx_fx = CRendBin_HOA3_HRIR_latency_s_fx; // Q31

                    hHrtf->latency_s_fx = CRendBin_HOA3_HRIR_latency_s_fx; // Q31

                    hHrtf->max_num_iterations = CRendBin_HOA3_HRIR_max_num_iterations_48kHz;

                    hHrtf->index_frequency_max_diffuse = CRendBin_HOA3_HRIR_index_frequency_max_diffuse_48kHz;

                    move32();
@@ -1674,7 +1674,7 @@ static ivas_error ivas_rend_initCrend_fx( 
                }

                ELSE IF( EQ_32( output_Fs, 32000 ) )

                {

                    hHrtf->latency_s_fx_fx = CRendBin_HOA3_HRIR_latency_s_fx; // Q31

                    hHrtf->latency_s_fx = CRendBin_HOA3_HRIR_latency_s_fx; // Q31

                    hHrtf->max_num_iterations = CRendBin_HOA3_HRIR_max_num_iterations_32kHz;

                    hHrtf->index_frequency_max_diffuse = CRendBin_HOA3_HRIR_index_frequency_max_diffuse_32kHz;

                    move32();
@@ -1715,7 +1715,7 @@ static ivas_error ivas_rend_initCrend_fx( 
                }

                ELSE IF( EQ_32( output_Fs, 16000 ) )

                {

                    hHrtf->latency_s_fx_fx = CRendBin_HOA3_HRIR_latency_s_fx; // Q31

                    hHrtf->latency_s_fx = CRendBin_HOA3_HRIR_latency_s_fx; // Q31

                    hHrtf->max_num_iterations = CRendBin_HOA3_HRIR_max_num_iterations_16kHz;

                    hHrtf->index_frequency_max_diffuse = CRendBin_HOA3_HRIR_index_frequency_max_diffuse_16kHz;

                    move32();
@@ -1763,7 +1763,7 @@ static ivas_error ivas_rend_initCrend_fx( 
            {

                IF( EQ_32( output_Fs, 48000 ) )

                {

                    hHrtf->latency_s_fx_fx = CRendBin_HOA2_HRIR_latency_s_fx; // Q31

                    hHrtf->latency_s_fx = CRendBin_HOA2_HRIR_latency_s_fx; // Q31

                    hHrtf->max_num_iterations = CRendBin_HOA2_HRIR_max_num_iterations_48kHz;

                    hHrtf->index_frequency_max_diffuse = CRendBin_HOA2_HRIR_index_frequency_max_diffuse_48kHz;

                    move32();
@@ -1803,7 +1803,7 @@ static ivas_error ivas_rend_initCrend_fx( 
                }

                ELSE IF( EQ_32( output_Fs, 32000 ) )

                {

                    hHrtf->latency_s_fx_fx = CRendBin_HOA2_HRIR_latency_s_fx; // Q31

                    hHrtf->latency_s_fx = CRendBin_HOA2_HRIR_latency_s_fx; // Q31

                    hHrtf->max_num_iterations = CRendBin_HOA2_HRIR_max_num_iterations_32kHz;

                    hHrtf->index_frequency_max_diffuse = CRendBin_HOA2_HRIR_index_frequency_max_diffuse_32kHz;

                    move32();
@@ -1844,7 +1844,7 @@ static ivas_error ivas_rend_initCrend_fx( 
                }

                ELSE IF( EQ_32( output_Fs, 16000 ) )

                {

                    hHrtf->latency_s_fx_fx = CRendBin_HOA2_HRIR_latency_s_fx; // Q31

                    hHrtf->latency_s_fx = CRendBin_HOA2_HRIR_latency_s_fx; // Q31

                    hHrtf->max_num_iterations = CRendBin_HOA2_HRIR_max_num_iterations_16kHz;

                    hHrtf->index_frequency_max_diffuse = CRendBin_HOA2_HRIR_index_frequency_max_diffuse_16kHz;

                    move32();
@@ -1892,7 +1892,7 @@ static ivas_error ivas_rend_initCrend_fx( 
            {

                IF( EQ_32( output_Fs, 48000 ) )

                {

                    hHrtf->latency_s_fx_fx = CRendBin_FOA_HRIR_latency_s_fx; // Q31

                    hHrtf->latency_s_fx = CRendBin_FOA_HRIR_latency_s_fx; // Q31

                    hHrtf->max_num_iterations = CRendBin_FOA_HRIR_max_num_iterations_48kHz;

                    hHrtf->index_frequency_max_diffuse = CRendBin_FOA_HRIR_index_frequency_max_diffuse_48kHz;

                    move32();
@@ -1932,7 +1932,7 @@ static ivas_error ivas_rend_initCrend_fx( 
                }

                ELSE IF( EQ_32( output_Fs, 32000 ) )

                {

                    hHrtf->latency_s_fx_fx = CRendBin_FOA_HRIR_latency_s_fx; // Q31

                    hHrtf->latency_s_fx = CRendBin_FOA_HRIR_latency_s_fx; // Q31

                    hHrtf->max_num_iterations = CRendBin_FOA_HRIR_max_num_iterations_32kHz;

                    hHrtf->index_frequency_max_diffuse = CRendBin_FOA_HRIR_index_frequency_max_diffuse_32kHz;

                    move32();
@@ -1973,7 +1973,7 @@ static ivas_error ivas_rend_initCrend_fx( 
                }

                ELSE IF( EQ_32( output_Fs, 16000 ) )

                {

                    hHrtf->latency_s_fx_fx = CRendBin_FOA_HRIR_latency_s_fx; // Q31

                    hHrtf->latency_s_fx = CRendBin_FOA_HRIR_latency_s_fx; // Q31

                    hHrtf->max_num_iterations = CRendBin_FOA_HRIR_max_num_iterations_16kHz;

                    hHrtf->index_frequency_max_diffuse = CRendBin_FOA_HRIR_index_frequency_max_diffuse_16kHz;

                    move32();
@@ -2038,13 +2038,13 @@ static ivas_error ivas_rend_initCrend_fx( 


            IF( EQ_16( outConfig, IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR ) )

            {

                hHrtf->latency_s_fx_fx = hSetOfHRTF->hHRTF_brir_combined->latency_s_fx_fx; // Q31

                hHrtf->latency_s_fx = hSetOfHRTF->hHRTF_brir_combined->latency_s_fx; // Q31

                hHrtf->max_num_iterations = hSetOfHRTF->hHRTF_brir_combined->max_num_iterations;

                hHrtf->index_frequency_max_diffuse = hSetOfHRTF->hHRTF_brir_combined->index_frequency_max_diffuse;

            }

            ELSE

            {

                hHrtf->latency_s_fx_fx = hSetOfHRTF->hHRTF_hrir_combined->latency_s_fx_fx; // Q31

                hHrtf->latency_s_fx = hSetOfHRTF->hHRTF_hrir_combined->latency_s_fx; // Q31

                hHrtf->max_num_iterations = hSetOfHRTF->hHRTF_hrir_combined->max_num_iterations;

                hHrtf->index_frequency_max_diffuse = hSetOfHRTF->hHRTF_hrir_combined->index_frequency_max_diffuse;

            }
@@ -2143,7 +2143,7 @@ static ivas_error ivas_rend_initCrend_fx( 
        {

            IF( EQ_16( inConfig, IVAS_AUDIO_CONFIG_HOA3 ) )

            {

                hHrtf->latency_s_fx_fx = hSetOfHRTF->hHRTF_hrir_hoa3->latency_s_fx_fx; // Q31

                hHrtf->latency_s_fx = hSetOfHRTF->hHRTF_hrir_hoa3->latency_s_fx; // Q31

                hHrtf->max_num_iterations = hSetOfHRTF->hHRTF_hrir_hoa3->max_num_iterations;

                hHrtf->index_frequency_max_diffuse = hSetOfHRTF->hHRTF_hrir_hoa3->index_frequency_max_diffuse;

                move32();
@@ -2183,7 +2183,7 @@ static ivas_error ivas_rend_initCrend_fx( 
            }

            ELSE IF( EQ_16( inConfig, IVAS_AUDIO_CONFIG_HOA2 ) )

            {

                hHrtf->latency_s_fx_fx = hSetOfHRTF->hHRTF_hrir_hoa2->latency_s_fx_fx; // Q31

                hHrtf->latency_s_fx = hSetOfHRTF->hHRTF_hrir_hoa2->latency_s_fx; // Q31

                hHrtf->max_num_iterations = hSetOfHRTF->hHRTF_hrir_hoa2->max_num_iterations;

                hHrtf->index_frequency_max_diffuse = hSetOfHRTF->hHRTF_hrir_hoa2->index_frequency_max_diffuse;

                move32();
@@ -2223,7 +2223,7 @@ static ivas_error ivas_rend_initCrend_fx( 
            }

            ELSE IF( EQ_16( inConfig, IVAS_AUDIO_CONFIG_FOA ) )

            {

                hHrtf->latency_s_fx_fx = hSetOfHRTF->hHRTF_hrir_foa->latency_s_fx_fx; // Q31

                hHrtf->latency_s_fx = hSetOfHRTF->hHRTF_hrir_foa->latency_s_fx; // Q31

                hHrtf->max_num_iterations = hSetOfHRTF->hHRTF_hrir_foa->max_num_iterations;

                hHrtf->index_frequency_max_diffuse = hSetOfHRTF->hHRTF_hrir_foa->index_frequency_max_diffuse;

                move32();
@@ -3030,7 +3030,7 @@ ivas_error ivas_rend_openCrend_fx( 
                hCrend->freq_buffer_im_diffuse_fx = NULL;

            }



            max_total_ir_len = add( extract_l( L_shr( L_add( L_shl( Mult_32_32( hHrtf->latency_s_fx_fx, output_Fs ), 1 ), 1 ), 1 ) ), subframe_length ); /*(int16_t) ( hHrtf->latency_s_fx * output_Fs + 0.5f ) + subframe_length;*/

            max_total_ir_len = add( extract_l( L_shr( L_add( L_shl( Mult_32_32( hHrtf->latency_s_fx, output_Fs ), 1 ), 1 ), 1 ) ), subframe_length ); /*(int16_t) ( hHrtf->latency_s_fx * output_Fs + 0.5f ) + subframe_length;*/

            IF( max_total_ir_len > 0 )

            {

                IF( ( hCrend->lfe_delay_line_fx = (Word32 *) malloc( sizeof( Word32 ) * max_total_ir_len ) ) == NULL )
@@ -3114,7 +3114,7 @@ ivas_error ivas_rend_openCrend_fx( 
                hCrend->hReverb = NULL;

            }



            ( *pCrend )->binaural_latency_ns = Mult_32_32( ( *pCrend )->hHrtfCrend->latency_s_fx_fx, (Word32) 1000000000 );

            ( *pCrend )->binaural_latency_ns = Mult_32_32( ( *pCrend )->hHrtfCrend->latency_s_fx, (Word32) 1000000000 );

            move32();

        }