Commit 9e3657d2 authored by vaillancour's avatar vaillancour
Browse files

Merge branch '1563_ref_PortFlpMR1475' into 'ivas-float-update' 

Port MR 1475 to float-pc

See merge request !1547
parents 5522d6c1 c176ef3e

lib_com/options.h

+2 −0
Original line number Diff line number Diff line
@@ -180,6 +180,8 @@ 
#define NONBE_FIX_1058_DECODER_ERROR_WITH_REVERB_ROOM   /* FhG: issue 1058: do not initialize EFAP when IntSetup is HOA3 */

#ifdef NONBE_FIX_1058_DECODER_ERROR_WITH_REVERB_ROOM

#endif

#define FIX_1043_JBM_MD_BUFFER                          /* VA: issue 1043: JBM MD handle allocation is avoided in non-JBM EXT operations */



#define USE_NEW_HRTF_BINARY_FILE_FORMAT                 /* Orange: to activate when decided to change the hrtf binary file format */

#define FIX_WARNING_RENDER_CONFIG                       /* Orange: fix warning on windows build */

#define NONBE_FIX_991_PARAMBIN_BINARY_HRTF              /* Nokia: issue #991: fix using of binary file HRTF in ParamBin (to actiate when USE_NEW_HRTF_BINARY_FILE_FORMAT and FIX_777_COMBI_RENDER_CONFIG_FILE are on  )*/

lib_dec/ivas_init_dec.c

+5 −0
Original line number Diff line number Diff line
@@ -2201,7 +2201,12 @@ ivas_error ivas_init_decoder( 
        }

    }





#ifdef FIX_1043_JBM_MD_BUFFER

    if ( st_ivas->hJbmMetadata == NULL && st_ivas->hDecoderConfig->Opt_tsm )

#else

    if ( st_ivas->hJbmMetadata == NULL )

#endif

    {

        if ( st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_EXTERNAL )

        {

lib_dec/ivas_jbm_dec.c

+21 −2
Original line number Diff line number Diff line
@@ -214,7 +214,11 @@ ivas_error ivas_jbm_dec_tc( 
                return error;

            }



#ifdef FIX_1043_JBM_MD_BUFFER

            if ( output_config == IVAS_AUDIO_CONFIG_EXTERNAL && st_ivas->hDecoderConfig->Opt_tsm )

#else

            if ( output_config == IVAS_AUDIO_CONFIG_EXTERNAL )

#endif

            {

                ivas_jbm_dec_copy_masa_meta_to_buffer( st_ivas );

            }
@@ -423,9 +427,14 @@ ivas_error ivas_jbm_dec_tc( 


            ivas_omasa_rearrange_channels( p_output, nchan_transport_ism, output_frame );

#endif

#ifdef FIX_1043_JBM_MD_BUFFER

            if ( st_ivas->hDecoderConfig->Opt_tsm )

#endif

            {

                ivas_jbm_dec_copy_masa_meta_to_buffer( st_ivas );

            }

        }

    }

    else if ( st_ivas->ivas_format == SBA_ISM_FORMAT )

    {

        int16_t nchan_ism, sba_ch_idx;
@@ -822,7 +831,11 @@ void ivas_jbm_dec_feed_tc_to_renderer( 
    {

        ivas_jbm_dec_td_renderers_adapt_subframes( st_ivas );



#ifdef FIX_1043_JBM_MD_BUFFER

        if ( ( st_ivas->ivas_format == MASA_FORMAT || st_ivas->ivas_format == MASA_ISM_FORMAT ) && st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_EXTERNAL && st_ivas->hDecoderConfig->Opt_tsm )

#else

        if ( ( st_ivas->ivas_format == MASA_FORMAT || st_ivas->ivas_format == MASA_ISM_FORMAT ) && st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_EXTERNAL )

#endif

        {

            ivas_jbm_masa_sf_to_slot_map( st_ivas, n_render_timeslots );

        }
@@ -902,8 +915,14 @@ void ivas_jbm_dec_feed_tc_to_renderer( 
        if ( st_ivas->renderer_type == RENDERER_OMASA_MIX_EXT || st_ivas->renderer_type == RENDERER_OMASA_OBJECT_EXT )

        {

            ivas_jbm_dec_td_renderers_adapt_subframes( st_ivas );



#ifdef FIX_1043_JBM_MD_BUFFER

            if ( st_ivas->hDecoderConfig->Opt_tsm )

#endif

            {

                ivas_jbm_masa_sf_to_slot_map( st_ivas, n_render_timeslots );

            }

        }

        else

        {

#endif