Commit 3988e6f2 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_356_ISM_METADATA_SYNC

parent 4f1785ea

apps/decoder.c

+0 −8
Original line number Diff line number Diff line
@@ -386,18 +386,10 @@ 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



    {

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -150,7 +150,6 @@ 






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



#define FIX_446_STEREO_DMX_CRASH                        /* FhG: fix discrepancy with EVS code that could cause crashes in rare cases */

lib_dec/ivas_objectRenderer_internal.c

+0 −19
Original line number Diff line number Diff line
@@ -75,7 +75,6 @@ ivas_error ivas_td_binaural_renderer( 
    const int16_t output_frame /* i  : output frame length               */

)

{

#ifdef FIX_356_ISM_METADATA_SYNC

    int16_t ism_md_subframe_update;



    if ( st_ivas->hDecoderConfig->Opt_delay_comp )
@@ -92,14 +91,6 @@ ivas_error ivas_td_binaural_renderer( 
        st_ivas->hBinRendererTd, st_ivas->nchan_transport, LFE_CHANNEL, st_ivas->ivas_format,

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

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

#else

    return ivas_td_binaural_renderer_unwrap(

        st_ivas->hReverb,

        st_ivas->transport_config,

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

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

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

#endif

}
@@ -125,7 +116,6 @@ ivas_error ivas_td_binaural_renderer_sf( 
    int16_t ch, slot_size, slots_to_render, output_frame;

    ivas_error error;



#ifdef FIX_356_ISM_METADATA_SYNC

    int16_t ism_md_subframe_update_jbm;

    int16_t c_indx, nS;
@@ -139,7 +129,6 @@ ivas_error ivas_td_binaural_renderer_sf( 
        ism_md_subframe_update_jbm = st_ivas->hTcBuffer->nb_subframes - 2;

    }



#endif

    for ( ch = 0; ch < BINAURAL_CHANNELS; ch++ )

    {

        p_reverb_signal[ch] = reverb_signal[ch];
@@ -174,7 +163,6 @@ ivas_error ivas_td_binaural_renderer_sf( 
        output_frame = st_ivas->hTcBuffer->subframe_nbslots[subframe_idx] * st_ivas->hTcBuffer->n_samples_granularity;



        /* Update object position(s) */

#ifdef FIX_356_ISM_METADATA_SYNC

        c_indx = 0;



        for ( nS = 0; nS < st_ivas->nchan_transport; nS++ )
@@ -190,9 +178,6 @@ ivas_error ivas_td_binaural_renderer_sf( 
        {

            TDREND_Update_object_positions( st_ivas->hBinRendererTd, st_ivas->nchan_transport, st_ivas->ivas_format, st_ivas->hIsmMetaData );

        }

#else

        TDREND_Update_object_positions( st_ivas->hBinRendererTd, st_ivas->nchan_transport, LFE_CHANNEL, st_ivas->ivas_format, st_ivas->hIsmMetaData, tc_local );

#endif



        /* Update the listener's location/orientation */

        TDREND_Update_listener_orientation( st_ivas->hBinRendererTd, st_ivas->hDecoderConfig->Opt_Headrotation,
@@ -208,11 +193,7 @@ ivas_error ivas_td_binaural_renderer_sf( 
        }



        /* Render subframe */

#ifdef FIX_356_ISM_METADATA_SYNC

        if ( ( error = TDREND_GetMix( st_ivas->hBinRendererTd, output_f_local, output_frame, 0, ism_md_subframe_update_jbm ) ) != IVAS_ERR_OK )

#else

        if ( ( error = TDREND_GetMix( st_ivas->hBinRendererTd, output_f_local, output_frame, 0 ) ) != IVAS_ERR_OK )

#endif

        {

            return error;

        }

lib_dec/ivas_stat_dec.h

+0 −2
Original line number Diff line number Diff line
@@ -1226,9 +1226,7 @@ typedef struct decoder_config_structure 
#ifdef JBM_TSM_ON_TCS

    int16_t voip_active;

#endif

#ifdef FIX_356_ISM_METADATA_SYNC

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

#endif

} DECODER_CONFIG, *DECODER_CONFIG_HANDLE;

lib_dec/lib_dec.c

+0 −8
Original line number Diff line number Diff line
@@ -280,9 +280,7 @@ static void init_decoder_config( 
    hDecoderConfig->voip_active = 0;

#endif



#ifdef FIX_356_ISM_METADATA_SYNC

    hDecoderConfig->Opt_delay_comp = 0;

#endif



    return;

}
@@ -450,12 +448,8 @@ ivas_error IVAS_DEC_Configure( 
#endif

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

    const int16_t Opt_non_diegetic_pan, /* i  : diegetic or not                                  */

#ifdef FIX_356_ISM_METADATA_SYNC

    const float non_diegetic_pan_gain,     /* i  : non diegetic panning gain                        */

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

#else

    const float non_diegetic_pan_gain /* i  : non diegetic panning gain                        */

#endif

)

{

    Decoder_Struct *st_ivas;
@@ -511,9 +505,7 @@ ivas_error IVAS_DEC_Configure( 
    hDecoderConfig->Opt_RendConfigCustom = renderConfigEnabled;

    hDecoderConfig->Opt_non_diegetic_pan = Opt_non_diegetic_pan;

    hDecoderConfig->non_diegetic_pan_gain = non_diegetic_pan_gain;

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