Commit 110c0203 authored by vaclav's avatar vaclav
Browse files

port FIX_1043_JBM_MD_BUFFER

parent f34818ef

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -188,6 +188,7 @@ 
#define NONBE_FIX_968_ISM_BRIR_WITH_HEADROTATION_5MS_FIX      /* FhG : issue #968: differences between 5ms and 20ms rendering for discrete ISM with BRIR and head rotation*/

#define FIX_969_USAN_IGF_ARITH                          /* FhG: issue 969: fix USAN error in igf_sce_dec; same issue as #962 */

#define FIX_959_MASA_LINEAR_REND                        /* VA: issue 959: remove unused calling of ivas_sba_linear_renderer() in MASA rendering */

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



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

lib_dec/ivas_init_dec.c

+5 −0
Original line number Diff line number Diff line
@@ -2178,7 +2178,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

+10 −1
Original line number Diff line number Diff line
@@ -408,9 +408,14 @@ ivas_error ivas_jbm_dec_tc( 


            ivas_omasa_rearrange_channels( p_output, nchan_transport_ism, output_frame );



#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;
@@ -811,7 +816,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 );

        }