Commit 834e368f authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

rename variable for consistency

parent 9eb40ae3

lib_dec/ivas_binRenderer_internal.c

+6 −6
Original line number Diff line number Diff line
@@ -209,7 +209,7 @@ static ivas_error ivas_binRenderer_convModuleOpen( 
        else

        {

#ifdef FIX_1123_FASTCONV_16BIT_ROM

            hBinRenConvModule->numTaps = hHrtf->ntaps_hrir_mc;

            hBinRenConvModule->numTaps = hHrtf->ntaps_hrir;

#else

            hBinRenConvModule->numTaps = BINAURAL_NTAPS;

#endif
@@ -690,19 +690,19 @@ ivas_error ivas_allocate_binaural_hrtf( 
        if ( ( HrtfFastConv->leftHRIRReal == NULL ) && ( HrtfFastConv->leftHRIRImag == NULL ) && ( HrtfFastConv->rightHRIRReal == NULL ) && ( HrtfFastConv->rightHRIRImag == NULL ) )

        {

#ifdef FIX_1123_FASTCONV_16BIT_ROM

            if ( IVAS_ERR_OK != ivas_alloc_pppMem( &HrtfFastConv->leftHRIRReal, BINAURAL_CONVBANDS, HRTF_LS_CHANNELS, HrtfFastConv->ntaps_hrir_mc, allocate_init_flag ) )

            if ( IVAS_ERR_OK != ivas_alloc_pppMem( &HrtfFastConv->leftHRIRReal, BINAURAL_CONVBANDS, HRTF_LS_CHANNELS, HrtfFastConv->ntaps_hrir, allocate_init_flag ) )

            {

                return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for leftHRIRReal" );

            }

            if ( IVAS_ERR_OK != ivas_alloc_pppMem( &HrtfFastConv->leftHRIRImag, BINAURAL_CONVBANDS, HRTF_LS_CHANNELS, HrtfFastConv->ntaps_hrir_mc, allocate_init_flag ) )

            if ( IVAS_ERR_OK != ivas_alloc_pppMem( &HrtfFastConv->leftHRIRImag, BINAURAL_CONVBANDS, HRTF_LS_CHANNELS, HrtfFastConv->ntaps_hrir, allocate_init_flag ) )

            {

                return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for leftHRIRImag" );

            }

            if ( IVAS_ERR_OK != ivas_alloc_pppMem( &HrtfFastConv->rightHRIRReal, BINAURAL_CONVBANDS, HRTF_LS_CHANNELS, HrtfFastConv->ntaps_hrir_mc, allocate_init_flag ) )

            if ( IVAS_ERR_OK != ivas_alloc_pppMem( &HrtfFastConv->rightHRIRReal, BINAURAL_CONVBANDS, HRTF_LS_CHANNELS, HrtfFastConv->ntaps_hrir, allocate_init_flag ) )

            {

                return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for rightHRIRReal" );

            }

            if ( IVAS_ERR_OK != ivas_alloc_pppMem( &HrtfFastConv->rightHRIRImag, BINAURAL_CONVBANDS, HRTF_LS_CHANNELS, HrtfFastConv->ntaps_hrir_mc, allocate_init_flag ) )

            if ( IVAS_ERR_OK != ivas_alloc_pppMem( &HrtfFastConv->rightHRIRImag, BINAURAL_CONVBANDS, HRTF_LS_CHANNELS, HrtfFastConv->ntaps_hrir, allocate_init_flag ) )

            {

                return IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for rightHRIRImag" );

            }
@@ -847,7 +847,7 @@ static ivas_error ivas_binaural_hrtf_open( 
                for ( j = 0; j < HRTF_LS_CHANNELS; j++ )

                {

#ifdef FIX_1123_FASTCONV_16BIT_ROM

                    for ( k = 0; k < HrtfFastConv->ntaps_hrir_mc; k++ )

                    for ( k = 0; k < HrtfFastConv->ntaps_hrir; k++ )

                    {

                        HrtfFastConv->leftHRIRReal[i][j][k] = (float) leftHRIRReal[i][j][k] * powf( 2.f, -1.f * (float) FASTCONV_HRIR_factorQ );

                        HrtfFastConv->leftHRIRImag[i][j][k] = (float) leftHRIRImag[i][j][k] * powf( 2.f, -1.f * (float) FASTCONV_HRIR_factorQ );

lib_rend/ivas_stat_rend.h

+1 −1
Original line number Diff line number Diff line
@@ -1299,7 +1299,7 @@ typedef struct ivas_hrtfs_fastconv_struct 


    int16_t allocate_init_flag; /*Memory allocation flag 0: if the hrtf pointers are allocated at application level , 1: of allocated at ivas_binaural_hrtf_open() */

#ifdef FIX_1123_FASTCONV_16BIT_ROM

    uint16_t ntaps_hrir_mc;

    uint16_t ntaps_hrir;

    uint16_t ntaps_hrir_sba;

    uint16_t ntaps_brir;

#endif

lib_util/hrtf_file_reader.c

+9 −9
Original line number Diff line number Diff line
@@ -1867,7 +1867,7 @@ static ivas_error create_fastconv_HRTF_from_rawdata_fx( 
        hrtf_data_rptr += sizeof( uint16_t );



#ifdef FIX_1123_FASTCONV_16BIT_ROM

        ( *hHRTF )->ntaps_hrir_mc = *( (uint16_t *) ( hrtf_data_rptr ) );

        ( *hHRTF )->ntaps_hrir = *( (uint16_t *) ( hrtf_data_rptr ) );

#else

        if ( BINAURAL_NTAPS != *( (uint16_t *) ( hrtf_data_rptr ) ) )

        {
@@ -1886,7 +1886,7 @@ static ivas_error create_fastconv_HRTF_from_rawdata_fx( 
            {

#ifdef FIX_1123_FASTCONV_16BIT_ROM

                ptW16 = (Word16 *) hrtf_data_rptr;

                for ( k = 0; k < ( *hHRTF )->ntaps_hrir_mc; k++ )

                for ( k = 0; k < ( *hHRTF )->ntaps_hrir; k++ )

#else

                ptW32 = (Word32 *) hrtf_data_rptr;

                for ( k = 0; k < BINAURAL_NTAPS; k++ )
@@ -1899,7 +1899,7 @@ static ivas_error create_fastconv_HRTF_from_rawdata_fx( 
#endif

                }

#ifdef FIX_1123_FASTCONV_16BIT_ROM

                hrtf_data_rptr += ( *hHRTF )->ntaps_hrir_mc * sizeof( Word16 );

                hrtf_data_rptr += ( *hHRTF )->ntaps_hrir * sizeof( Word16 );

#else

                hrtf_data_rptr += BINAURAL_NTAPS * sizeof( int32_t );

#endif
@@ -1911,7 +1911,7 @@ static ivas_error create_fastconv_HRTF_from_rawdata_fx( 
            {

#ifdef FIX_1123_FASTCONV_16BIT_ROM

                ptW16 = (Word16 *) hrtf_data_rptr;

                for ( k = 0; k < ( *hHRTF )->ntaps_hrir_mc; k++ )

                for ( k = 0; k < ( *hHRTF )->ntaps_hrir; k++ )

#else

                ptW32 = (Word32 *) hrtf_data_rptr;

                for ( k = 0; k < BINAURAL_NTAPS; k++ )
@@ -1924,7 +1924,7 @@ static ivas_error create_fastconv_HRTF_from_rawdata_fx( 
#endif

                }

#ifdef FIX_1123_FASTCONV_16BIT_ROM

                hrtf_data_rptr += ( *hHRTF )->ntaps_hrir_mc * sizeof( Word16 );

                hrtf_data_rptr += ( *hHRTF )->ntaps_hrir * sizeof( Word16 );

#else

                hrtf_data_rptr += BINAURAL_NTAPS * sizeof( int32_t );

#endif
@@ -1936,7 +1936,7 @@ static ivas_error create_fastconv_HRTF_from_rawdata_fx( 
            {

#ifdef FIX_1123_FASTCONV_16BIT_ROM

                ptW16 = (Word16 *) hrtf_data_rptr;

                for ( k = 0; k < ( *hHRTF )->ntaps_hrir_mc; k++ )

                for ( k = 0; k < ( *hHRTF )->ntaps_hrir; k++ )

#else

                ptW32 = (Word32 *) hrtf_data_rptr;

                for ( k = 0; k < BINAURAL_NTAPS; k++ )
@@ -1949,7 +1949,7 @@ static ivas_error create_fastconv_HRTF_from_rawdata_fx( 
#endif

                }

#ifdef FIX_1123_FASTCONV_16BIT_ROM

                hrtf_data_rptr += ( *hHRTF )->ntaps_hrir_mc * sizeof( Word16 );

                hrtf_data_rptr += ( *hHRTF )->ntaps_hrir * sizeof( Word16 );

#else

                hrtf_data_rptr += BINAURAL_NTAPS * sizeof( int32_t );

#endif
@@ -1961,7 +1961,7 @@ static ivas_error create_fastconv_HRTF_from_rawdata_fx( 
            {

#ifdef FIX_1123_FASTCONV_16BIT_ROM

                ptW16 = (Word16 *) hrtf_data_rptr;

                for ( k = 0; k < ( *hHRTF )->ntaps_hrir_mc; k++ )

                for ( k = 0; k < ( *hHRTF )->ntaps_hrir; k++ )

#else

                ptW32 = (Word32 *) hrtf_data_rptr;

                for ( k = 0; k < BINAURAL_NTAPS; k++ )
@@ -1974,7 +1974,7 @@ static ivas_error create_fastconv_HRTF_from_rawdata_fx( 
#endif

                }

#ifdef FIX_1123_FASTCONV_16BIT_ROM

                hrtf_data_rptr += ( *hHRTF )->ntaps_hrir_mc * sizeof( Word16 );

                hrtf_data_rptr += ( *hHRTF )->ntaps_hrir * sizeof( Word16 );

#else

                hrtf_data_rptr += BINAURAL_NTAPS * sizeof( int32_t );

#endif