Commit 0f139e40 authored by Dominik Weckbecker's avatar Dominik Weckbecker 💬
Browse files

port float MR 1347

parent 2e16c4e3

Workspace_msvc/lib_com.vcxproj

+1 −0
Original line number Diff line number Diff line
@@ -212,6 +212,7 @@ 
    <ClCompile Include="..\lib_com\ivas_mdct_imdct_fx.c" />

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

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

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

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

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

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

Workspace_msvc/lib_com.vcxproj.filters

+1 −0
Original line number Diff line number Diff line
@@ -512,6 +512,7 @@ 
      <Filter>common_ivas_c</Filter>

    </ClCompile>

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

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

      <Filter>common_ivas_c</Filter>

    </ClCompile>

  </ItemGroup>

lib_com/ivas_prot_fx.h

+6 −0
Original line number Diff line number Diff line
@@ -3850,6 +3850,12 @@ void ivas_osba_data_close_fx( 
    SBA_ISM_DATA_HANDLE *hSbaIsmData /* i/o: OSBA rendering handle                   */

);



ISM_MODE ivas_osba_ism_mode_select(

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

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

);





void ivas_set_ism_importance_interformat_fx(

    const Word32 ism_total_brate,   /* i/o: ISms total bitrate                  */

    const Word16 nchan_transport,   /* i  : number of transported channels      */

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -131,6 +131,7 @@ 
#define NONBE_FIX_1006_PAST_DMX_NRG_ERROR               /* Eri/FhG: Issue 1006: Bug fix in ivas_stereo_dft_dec not replicated in ivas_stereo_dft_dec_dmx */

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

#define NONBE_FIX_SBA_SIGNALING_BITS_B                  /* FhG: issue 1061: option B: signal sba order additionally in OSBA */

#define NONBE_FIX_ISM_XOVER_BR                          /* FhG: issue 1072: select OSBA coding method depending on number of object and bitrate */



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

lib_dec/ivas_corecoder_dec_reconfig_fx.c

+11 −3
Original line number Diff line number Diff line
@@ -342,7 +342,11 @@ ivas_error ivas_corecoder_dec_reconfig_fx( 
        }

        ELSE IF( st_ivas->hMCT != NULL && GT_16( st_ivas->nCPE, 1 ) )

        {

#ifdef NONBE_FIX_ISM_XOVER_BR

			IF( NE_32( ( error = mct_dec_reconfigure_fx(st_ivas, (UWord16) NE_16( nchan_transport_real, nchan_transport_old))), IVAS_ERR_OK))

#else

            IF( NE_32( ( error = mct_dec_reconfigure_fx( st_ivas, (UWord16) NE_16( st_ivas->nchan_transport, nchan_transport_old ) ) ), IVAS_ERR_OK ) )

#endif

			{

                return error;

            }
@@ -444,7 +448,11 @@ ivas_error ivas_corecoder_dec_reconfig_fx( 
     *-----------------------------------------------------------------*/



    test();

    IF( EQ_16( st_ivas->ivas_format, SBA_FORMAT ) || EQ_16( st_ivas->ivas_format, MASA_FORMAT ) )

#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 );

    }