Commit 84771eb5 authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

Merge branch 'main-pc' of ssh://forge.3gpp.org:29419/sa4/audio/ivas-basop into... 

Merge branch 'main-pc' of ssh://forge.3gpp.org:29419/sa4/audio/ivas-basop into 1616_basop_port_fl1422
parents 4cbbeb81 15560d74

.gitlab-ci.yml

+1 −0
Original line number Diff line number Diff line
@@ -273,6 +273,7 @@ stages: 
  - sed -i '/fetch/d' .git/config # Remove all fetch lines to clean out dead links

  - git remote set-branches --add origin $BASOP_CI_BRANCH_PC_REPO # Add currently used branch

  - git fetch

  - git restore --staged . # Needed if HRTF model files were updated.

  - git restore . # Just as a precaution

  - git checkout $BASOP_CI_BRANCH_PC_REPO

  - git pull origin $BASOP_CI_BRANCH_PC_REPO

Workspace_msvc/lib_com.vcxproj.filters

+40 −12
Original line number Diff line number Diff line
@@ -508,6 +508,12 @@ 
    <ClCompile Include="..\lib_com\tec_com_fx.c">

      <Filter>common_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_com\ivas_limiter_fx.c">

      <Filter>common_ivas_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_com\ivas_rotation_com.c">

      <Filter>common_ivas_c</Filter>

    </ClCompile>

  </ItemGroup>

  <ItemGroup>

    <ClInclude Include="..\lib_com\basop_proto_func.h">
@@ -588,17 +594,39 @@ 
    <ClInclude Include="..\lib_com\prot_fx.h">

      <Filter>common_h</Filter>

    </ClInclude>

    <ClInclude Include="..\lib_com\complex_basop.h" />

    <ClInclude Include="..\lib_com\enh32.h" />

    <ClInclude Include="..\lib_com\enh64.h" />

    <ClInclude Include="..\lib_com\ivas_rom_com_fx.h" />

    <ClInclude Include="..\lib_com\log2.h" />

    <ClInclude Include="..\lib_com\math_32.h" />

    <ClInclude Include="..\lib_com\math_op.h" />

    <ClInclude Include="..\lib_com\mime.h" />

    <ClInclude Include="..\lib_com\oper_32b.h" />

    <ClInclude Include="..\lib_com\rom_basic_math.h" />

    <ClInclude Include="..\lib_com\typedefs.h" />

    <ClInclude Include="..\lib_com\complex_basop.h">

      <Filter>common_h</Filter>

    </ClInclude>

    <ClInclude Include="..\lib_com\enh32.h">

      <Filter>common_h</Filter>

    </ClInclude>

    <ClInclude Include="..\lib_com\enh64.h">

      <Filter>common_h</Filter>

    </ClInclude>

    <ClInclude Include="..\lib_com\ivas_rom_com_fx.h">

      <Filter>common_h</Filter>

    </ClInclude>

    <ClInclude Include="..\lib_com\log2.h">

      <Filter>common_h</Filter>

    </ClInclude>

    <ClInclude Include="..\lib_com\math_32.h">

      <Filter>common_h</Filter>

    </ClInclude>

    <ClInclude Include="..\lib_com\math_op.h">

      <Filter>common_h</Filter>

    </ClInclude>

    <ClInclude Include="..\lib_com\mime.h">

      <Filter>common_h</Filter>

    </ClInclude>

    <ClInclude Include="..\lib_com\oper_32b.h">

      <Filter>common_h</Filter>

    </ClInclude>

    <ClInclude Include="..\lib_com\rom_basic_math.h">

      <Filter>common_h</Filter>

    </ClInclude>

    <ClInclude Include="..\lib_com\typedefs.h">

      <Filter>common_h</Filter>

    </ClInclude>

  </ItemGroup>

  <ItemGroup>

    <Filter Include="common_evs_c">

apps/decoder.c

+32 −0
Original line number Diff line number Diff line
@@ -176,6 +176,9 @@ int main( 
    IVAS_RENDER_FRAMESIZE asked_frame_size;

    IVAS_DEC_HRTF_HANDLE *hHrtfTD = NULL;

    IVAS_DEC_HRTF_CREND_HANDLE *hSetOfHRTF = NULL;

#ifdef NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES

    IVAS_DEC_HRTF_STATISTICS_HANDLE *hHrtfStatistics = NULL;

#endif



#ifdef WMOPS

    reset_wmops();
@@ -644,6 +647,7 @@ int main( 
            }

        }



#ifndef NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES

#ifdef FIX_638_ENERGIE_IAC_ROM_TABLES

        if ( ( *hHrtfTD != NULL ) && ( error = load_reverb_binary( *hHrtfTD, hrtfReader ) ) != IVAS_ERR_OK )

        {
@@ -653,6 +657,7 @@ int main( 
                goto cleanup;

            }

        }

#endif

#endif

        if ( ( error = IVAS_DEC_GetHrtfCRendHandle( hIvasDec, &hSetOfHRTF ) ) != IVAS_ERR_OK )

        {
@@ -736,6 +741,33 @@ int main( 
                destroy_parambin_hrtf( hHrtfParambin );

            }

        }

#ifdef NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES

#ifdef FIX_638_ENERGIE_IAC_ROM_TABLES

        if ( ( error = IVAS_DEC_GetHrtfStatisticsHandle( hIvasDec, &hHrtfStatistics ) ) != IVAS_ERR_OK )

        {

            fprintf( stderr, "\nIVAS_DEC_GetHrtfHandle failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );

            goto cleanup;

        }

        if ( ( error = load_reverb_binary( *hHrtfStatistics, arg.output_Fs, hrtfReader ) ) != IVAS_ERR_OK )

        {

            if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )

            {

                fprintf( stderr, "\nError in loading HRTF binary file %s \n\n", arg.hrtfFileName );

                goto cleanup;

            }

            else

            {

                destroy_hrtf_statistics( hHrtfStatistics );

            }

        }

#else

        if ( ( hHrtfTD != NULL ) && ( error = load_reverb_binary( hHrtfTD, hrtfReader ) ) != IVAS_ERR_OK )

        {

            fprintf( stderr, "\nError in loading HRTF binary file %s \n\n", arg.hrtfFileName );

            goto cleanup;

        }

#endif

#endif

    }



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

apps/renderer.c

+30 −0
Original line number Diff line number Diff line
@@ -766,6 +766,9 @@ int main( 
    IVAS_DEC_HRTF_FASTCONV_HANDLE *hHrtfFastConv = NULL;

    IVAS_DEC_HRTF_PARAMBIN_HANDLE *hHrtfParambin = NULL;

    IVAS_DEC_HRTF_HANDLE *hHrtfTD = NULL;

#ifdef NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES

    IVAS_DEC_HRTF_STATISTICS_HANDLE *hHrtfStatistics = NULL;

#endif

    IsmPositionProvider *positionProvider;

    LfeRoutingConfig *lfeRoutingConfigs[RENDERER_MAX_MC_INPUTS];

    RenderConfigReader *renderConfigReader = NULL;
@@ -1054,6 +1057,7 @@ int main( 
                }

            }



#ifndef NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES

#ifdef FIX_638_ENERGIE_IAC_ROM_TABLES

            if ( ( hHrtfTD != NULL ) && ( error = load_reverb_binary( *hHrtfTD, hrtfFileReader ) ) != IVAS_ERR_OK )

            {
@@ -1063,6 +1067,7 @@ int main( 
                    goto cleanup;

                }

            }

#endif

#endif



            if ( ( error = IVAS_REND_GetHrtfCRendHandle( hIvasRend, &hSetOfHRTF ) ) != IVAS_ERR_OK )
@@ -1146,6 +1151,28 @@ int main( 
            }

        }



#ifdef NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES

#ifdef FIX_638_ENERGIE_IAC_ROM_TABLES

        if ( ( error = IVAS_REND_GetHrtfStatisticsHandle( hIvasRend, &hHrtfStatistics ) ) != IVAS_ERR_OK )

        {

            fprintf( stderr, "\nIVAS_REND_GetHrtfStatisticsHandle failed\n\n" );

            goto cleanup;

        }

        if ( ( error = load_reverb_binary( *hHrtfStatistics, args.sampleRate, hrtfFileReader ) ) != IVAS_ERR_OK )

        {

            if ( error != IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA )

            {

                fprintf( stderr, "\nError in loading HRTF binary file %s \n\n", args.customHrtfFilePath );

                goto cleanup;

            }

            else

            {

                destroy_hrtf_statistics( hHrtfStatistics );

            }

        }

#endif

#endif



        hrtfFileReader_close( &hrtfFileReader );

    }
@@ -2258,6 +2285,9 @@ cleanup: 
    {

        destroy_td_hrtf( hHrtfTD );

    }

#ifdef NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES

    destroy_hrtf_statistics( hHrtfStatistics );

#endif

    IVAS_REND_Close( &hIvasRend );

    IsmPositionProvider_close( positionProvider );

    RenderConfigReader_close( &renderConfigReader );

lib_com/common_api_types.h

+3 −0
Original line number Diff line number Diff line
@@ -182,6 +182,9 @@ typedef struct TDREND_HRFILT_FiltSet_struct *IVAS_DEC_HRTF_HANDLE; 
typedef struct ivas_hrtfs_crend_structure *IVAS_DEC_HRTF_CREND_HANDLE;

typedef struct ivas_hrtfs_fastconv_struct *IVAS_DEC_HRTF_FASTCONV_HANDLE;

typedef struct ivas_hrtfs_parambin_struct *IVAS_DEC_HRTF_PARAMBIN_HANDLE;

#ifdef NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES

typedef struct ivas_hrtfs_statistics_struct *IVAS_DEC_HRTF_STATISTICS_HANDLE;

#endif

typedef struct cldfb_filter_bank_struct *IVAS_CLDFB_FILTER_BANK_HANDLE;



typedef struct ivas_LS_setup_custom *IVAS_LSSETUP_CUSTOM_HANDLE;