Commit abffaad5 authored by Dominik Weckbecker's avatar Dominik Weckbecker 💬
Browse files

port float MR 1347

parent 7da3628a

Workspace_msvc/lib_com.vcxproj

+2 −1
Original line number Diff line number Diff line
@@ -275,6 +275,7 @@ 
    <ClCompile Include="..\lib_com\window.c" />

    <ClCompile Include="..\lib_com\window_ola.c" />

    <ClCompile Include="..\lib_com\wtda.c" />

    <ClCompile Include="ivas_osba_com.c" />

  </ItemGroup>

  <ItemGroup>

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

Workspace_msvc/lib_com.vcxproj.filters

+5 −0
Original line number Diff line number Diff line
@@ -469,6 +469,11 @@ 
    <ClCompile Include="..\lib_com\ivas_lfe_com.c">

      <Filter>common_ivas_c</Filter>

    </ClCompile>

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

    <ClCompile Include="..\lib_com\ivas_limiter.c" />

    <ClCompile Include="ivas_osba_com.c">

      <Filter>common_ivas_c</Filter>

    </ClCompile>

  </ItemGroup>

  <ItemGroup>

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

lib_com/ivas_prot.h

+4 −0
Original line number Diff line number Diff line
@@ -5662,6 +5662,10 @@ void ivas_osba_data_close( 
    SBA_ISM_DATA_HANDLE *hSbaIsmData                            /* i/o: OSBA rendering handle                   */

);



ISM_MODE ivas_osba_ism_mode_select(

	const int32_t ivas_total_brate,                             /* i  : IVAS total bitrate      */

	const int16_t nchan_ism                                     /* i  : number of input ISM's   */

);



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

* OMASA prototypes

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -210,6 +210,7 @@ 
#define FIX_1001_ARI_HM_OVERFLOW                        /* FhG: fix for undef behaviour in in the harmonic TCX model arithmetic coder */

#define NONBE_FIX_1005_MC_RS_TCBUFFER_UPDATE            /* FhG: issue #1005: fix TC Buffer update at a MC rate switch */





/* #################### End BASOP porting switches ############################ */



/* clang-format on */

lib_dec/ivas_corecoder_dec_reconfig.c

+12 −4
Original line number Diff line number Diff line
@@ -270,7 +270,11 @@ ivas_error ivas_corecoder_dec_reconfig( 
        }

        else if ( st_ivas->hMCT != NULL && st_ivas->nCPE > 1 )

        {

#ifdef NONBE_FIX_ISM_XOVER_BR

			if ((error = mct_dec_reconfigure(st_ivas, nchan_transport_real != nchan_transport_old)) != IVAS_ERR_OK)

#else

			if ((error = mct_dec_reconfigure(st_ivas, st_ivas->nchan_transport != nchan_transport_old)) != IVAS_ERR_OK)

#endif

			{

                return error;

            }
@@ -351,7 +355,11 @@ ivas_error ivas_corecoder_dec_reconfig( 
     * Set CNA/CNG flags

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



#ifdef NONBE_FIX_ISM_XOVER_BR

	if (st_ivas->ivas_format == SBA_FORMAT || st_ivas->ivas_format == MASA_FORMAT || st_ivas->ivas_format == SBA_ISM_FORMAT)

#else

	if (st_ivas->ivas_format == SBA_FORMAT || st_ivas->ivas_format == MASA_FORMAT)

#endif

	{

        ivas_sba_set_cna_cng_flag( st_ivas );

    }