Commit 9affc823 authored by Jouni Paulus's avatar Jouni Paulus
Browse files

Merge remote-tracking branch 'origin/main' into... 

Merge remote-tracking branch 'origin/main' into 502-masa-hits-assert-in-check_ind_list_limits-at-bitrates-160k-256k

# Conflicts:
#	lib_com/options.h
parents 24f08b26 343bb6a7

apps/decoder.c

+9 −1
Original line number Diff line number Diff line
@@ -388,12 +388,20 @@ int main( 
    /*------------------------------------------------------------------------------------------*

     * Configure the decoder

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



#ifdef FIX_356_ISM_METADATA_SYNC

#ifdef FIX_439_OTR_PARAMS

    if ( ( error = IVAS_DEC_Configure( hIvasDec, arg.output_Fs, arg.outputFormat, arg.customLsOutputEnabled, arg.hrtfReaderEnabled, arg.enableHeadRotation, arg.orientation_tracking, arg.renderConfigEnabled, arg.Opt_non_diegetic_pan, arg.non_diegetic_pan_gain, arg.delayCompensationEnabled ) ) != IVAS_ERR_OK )

#else

    if ( ( error = IVAS_DEC_Configure( hIvasDec, arg.output_Fs, arg.outputFormat, arg.customLsOutputEnabled, arg.hrtfReaderEnabled, arg.enableHeadRotation, arg.renderConfigEnabled, arg.Opt_non_diegetic_pan, arg.non_diegetic_pan_gain, arg.delayCompensationEnabled ) ) != IVAS_ERR_OK )

#endif

#else

#ifdef FIX_439_OTR_PARAMS

    if ( ( error = IVAS_DEC_Configure( hIvasDec, arg.output_Fs, arg.outputFormat, arg.customLsOutputEnabled, arg.hrtfReaderEnabled, arg.enableHeadRotation, arg.orientation_tracking, arg.renderConfigEnabled, arg.Opt_non_diegetic_pan, arg.non_diegetic_pan_gain ) ) != IVAS_ERR_OK )

#else

    if ( ( error = IVAS_DEC_Configure( hIvasDec, arg.output_Fs, arg.outputFormat, arg.customLsOutputEnabled, arg.hrtfReaderEnabled, arg.enableHeadRotation, arg.renderConfigEnabled, arg.Opt_non_diegetic_pan, arg.non_diegetic_pan_gain ) ) != IVAS_ERR_OK )

#endif

#endif



    {

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

        goto cleanup;

lib_com/delay_comp.c

+0 −14
Original line number Diff line number Diff line
@@ -69,17 +69,10 @@ int32_t get_delay( 
        {

            delay = IVAS_ENC_DELAY_NS;



#ifdef FIX_356_ISM_METADATA_SYNC

            if ( ivas_format == ISM_FORMAT || ivas_format == MASA_FORMAT )

            {

                delay = 0; /* All delay is compensated in the decoder with MASA/ISM */

            }

#else

            if ( ivas_format == MASA_FORMAT )

            {

                delay = 0; /* All delay is compensated in the decoder with MASA */

            }

#endif

        }



        if ( ivas_format == SBA_FORMAT )
@@ -111,17 +104,10 @@ int32_t get_delay( 
                delay += IVAS_FB_DEC_DELAY_NS;

            }



#ifdef FIX_356_ISM_METADATA_SYNC

            if ( ivas_format == ISM_FORMAT || ivas_format == MASA_FORMAT )

            {

                delay += IVAS_ENC_DELAY_NS; /* Compensate also the encoder delay in the decoder with ISM/MASA */

            }

#else

            if ( ivas_format == MASA_FORMAT )

            {

                delay += IVAS_ENC_DELAY_NS; /* Compensate also the encoder delay in the decoder with MASA */

            }

#endif

        }

    }

lib_com/options.h

+5 −1
Original line number Diff line number Diff line
@@ -208,9 +208,13 @@ 


#define FIX_485_STATIC_BUFFERS                          /* FhG: move static buffers in DirAC parameter estimator to the DirAC struct */

#define FIX_I503_ASAN_ERROR_IND_LIST                    /* VA: fix issue #503: address sanitizer error with IND_LIST_DYN */

#define FIX_473_JITTER_NONDIEGETIC_PANNING              /* FhG,Orange: add missing non-diegetic panning to JITTER */



#define FIX_502_IND_LIST_SIZE                           /* Fix issue #502: insufficient index buffer sizes */



#ifdef HR_METADATA

#define FIX_505_MASA_SPHGRID_REUSE                      /* Nokia: Fix issue #505: MASA spherical grid reuse fix */

#endif

                                                        /* ################## End DEVELOPMENT switches ######################### */

/* clang-format on */

lib_dec/ivas_dec.c

+1 −0
Original line number Diff line number Diff line
@@ -268,6 +268,7 @@ ivas_error ivas_dec( 
            /* Binaural rendering */

            if ( st_ivas->renderer_type == RENDERER_BINAURAL_OBJECTS_TD )

            {



#ifdef JBM_TSM_ON_TCS

                if ( ( ivas_td_binaural_renderer( st_ivas, p_output, output_frame ) ) != IVAS_ERR_OK )

#else

lib_dec/ivas_ism_renderer.c

+4 −0
Original line number Diff line number Diff line
@@ -269,7 +269,11 @@ void ivas_ism_render_sf( 
    {



        /* Head rotation: rotate the object positions depending the head's orientation */

#ifdef FIX_473_JITTER_NONDIEGETIC_PANNING

        if ( st_ivas->hHeadTrackData != NULL && st_ivas->hHeadTrackData->num_quaternions >= 0 && !st_ivas->hIsmMetaData[i]->non_diegetic_flag )

#else

        if ( st_ivas->hHeadTrackData != NULL && st_ivas->hHeadTrackData->num_quaternions >= 0 )

#endif

        {

            rotateAziEle( st_ivas->hIsmMetaData[i]->azimuth, st_ivas->hIsmMetaData[i]->elevation, &azimuth, &elevation, Rmat, st_ivas->hIntSetup.is_planar_setup );

            if ( st_ivas->hEFAPdata != NULL )