Commit 838731d2 authored by norvell's avatar norvell
Browse files

Add fixes under FIX_356_ISM_METADATA_SYNC

parent 3f97bd3d

apps/decoder.c

+4 −1
Original line number Diff line number Diff line
@@ -354,8 +354,11 @@ int main( 
    /*------------------------------------------------------------------------------------------*

     * Configure the decoder

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



#ifdef FIX_356_ISM_METADATA_SYNC

    if ( ( error = IVAS_DEC_Configure( hIvasDec, arg.output_Fs, arg.outputFormat, arg.customLsOutputEnabled, arg.hrtfReaderEnabled, arg.enableHeadRotation, arg.renderConfigEnabled, 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 ) ) != IVAS_ERR_OK )

#endif

    {

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

        goto cleanup;

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -179,7 +179,7 @@ 
#define FIX_355_REFACTOR_PARAMBIN_TO_5MS                /* Nokia: Fixes issue 355 by refactoring parametric binauralizer code to 5 ms mode */

#define FIX_411_EVS_BE_TESTS_ON_WINDOWS_FAILING         /* Eri: Fix incorrect use of stack variable used for channel aware config file */

#define COMBINED_FORMAT_SIGNALING                       /* VA: Introduce a signaling bit for combined format coding */



#define FIX_356_ISM_METADATA_SYNC                       /* Eri: issue 356: Metadata out-of-synch for -no_delay_comp */   





#define FIX_440_PARAM_ISM_DIR_NOISE                     /* FhG: Issue 440: Fix directional background noise becoming diffuse in ParamISM */

lib_dec/ivas_objectRenderer_internal.c

+4 −0
Original line number Diff line number Diff line
@@ -75,6 +75,10 @@ ivas_error ivas_td_binaural_renderer( 
        st_ivas->hReverb,

        st_ivas->transport_config,

        st_ivas->hBinRendererTd, st_ivas->nchan_transport, LFE_CHANNEL, st_ivas->ivas_format,

#ifdef FIX_356_ISM_METADATA_SYNC

        st_ivas->hIsmMetaData, st_ivas->hDecoderConfig->Opt_delay_comp, st_ivas->hDecoderConfig->Opt_Headrotation, ( st_ivas->hHeadTrackData != NULL ) ? st_ivas->hHeadTrackData->Quaternions : NULL,

#else

        st_ivas->hIsmMetaData, st_ivas->hDecoderConfig->Opt_Headrotation, ( st_ivas->hHeadTrackData != NULL ) ? st_ivas->hHeadTrackData->Quaternions : NULL,

#endif

        ( st_ivas->hHeadTrackData != NULL ) ? st_ivas->hHeadTrackData->Pos : NULL, output, output_frame );

}

lib_dec/ivas_stat_dec.h

+3 −0
Original line number Diff line number Diff line
@@ -1145,6 +1145,9 @@ typedef struct decoder_config_structure 
    int16_t orientation_tracking;  /* indicates orientation tracking type */

    float no_diegetic_pan;

    int16_t Opt_AMR_WB; /* flag indicating AMR-WB IO mode */

#ifdef FIX_356_ISM_METADATA_SYNC

    int16_t Opt_delay_comp;        /* flag indicating delay compensation active */

#endif



    /* temp. development parameters */

#ifdef DEBUGGING

lib_dec/lib_dec.c

+12 −1
Original line number Diff line number Diff line
@@ -226,6 +226,9 @@ static void init_decoder_config( 
    hDecoderConfig->Opt_RendConfigCustom = 0;

    hDecoderConfig->orientation_tracking = orientation_tracking;

    hDecoderConfig->no_diegetic_pan = no_diegetic_pan;

#ifdef FIX_356_ISM_METADATA_SYNC

    hDecoderConfig->Opt_delay_comp = 0;

#endif



    return;

}
@@ -388,7 +391,12 @@ ivas_error IVAS_DEC_Configure( 
    const int16_t customLsOutputEnabled,      /* i  : enable custom loudspeaker setup handle     */

    const int16_t hrtfReaderEnabled,          /* i  : enable HRTF binary file input              */

    const int16_t enableHeadRotation,         /* i  : enable head rotation for binaural output   */

#ifdef FIX_356_ISM_METADATA_SYNC

    const int16_t renderConfigEnabled,     /* i  : enable Renderer config. file for binaural output */

    const int16_t delayCompensationEnabled /* i  : enable delay compensation                  */

#else

    const int16_t renderConfigEnabled /* i  : enable Renderer config. file for binaural output */

#endif

)

{

    Decoder_Struct *st_ivas;
@@ -438,6 +446,9 @@ ivas_error IVAS_DEC_Configure( 
    hDecoderConfig->Opt_Headrotation = enableHeadRotation;

    hDecoderConfig->Opt_HRTF_binary = hrtfReaderEnabled;

    hDecoderConfig->Opt_RendConfigCustom = renderConfigEnabled;

#ifdef FIX_356_ISM_METADATA_SYNC

    hDecoderConfig->Opt_delay_comp = delayCompensationEnabled;

#endif



    /* Set decoder parameters to initial values */

    if ( ( error = ivas_init_decoder_front( st_ivas ) ) != IVAS_ERR_OK )