Commit 0ac7509a authored by vaclav's avatar vaclav
Browse files

remove Opt_Limiter flag: the handle 'hDecoderConfig' should contain only... 

remove Opt_Limiter flag: the handle 'hDecoderConfig' should contain only parameters that are directly derived from the command-line
parent ce619fdc

lib_dec/ivas_jbm_dec.c

+2 −2
Original line number Diff line number Diff line
@@ -1504,7 +1504,7 @@ ivas_error ivas_jbm_dec_render( 
        nchan_out_syn_output = nchan_out;

    }



    if ( st_ivas->hDecoderConfig->Opt_Limiter )

    if ( output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED || output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM )

#endif

    {

        if ( st_ivas->ivas_format != MONO_FORMAT )
@@ -1784,7 +1784,7 @@ ivas_error ivas_jbm_dec_flush_renderer( 


    /* Only write out the valid data*/

#ifdef SPLIT_REND_WITH_HEAD_ROT

    if ( st_ivas->hDecoderConfig->Opt_Limiter )

    if ( st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED || st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM )

#endif

    {

        if ( st_ivas->ivas_format != MONO_FORMAT )

lib_dec/ivas_stat_dec.h

+0 −3
Original line number Diff line number Diff line
@@ -1026,9 +1026,6 @@ typedef struct decoder_config_structure 
    int16_t force_rend; /* forced TD/CLDFB binaural renderer (for ISM and MC) */

#endif

    int16_t Opt_tsm; /* indicates whether time scaling modification is activated */

#ifdef SPLIT_REND_WITH_HEAD_ROT

    int16_t Opt_Limiter;

#endif

    IVAS_RENDER_FRAMESIZE render_framesize;

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

lib_dec/lib_dec.c

+0 −5
Original line number Diff line number Diff line
@@ -309,9 +309,6 @@ static void init_decoder_config( 
    hDecoderConfig->Opt_non_diegetic_pan = 0;

    hDecoderConfig->non_diegetic_pan_gain = 0;

    hDecoderConfig->Opt_tsm = 0;

#ifdef SPLIT_REND_WITH_HEAD_ROT

    hDecoderConfig->Opt_Limiter = 1;

#endif

    hDecoderConfig->Opt_delay_comp = 0;

    hDecoderConfig->Opt_ExternalOrientation = 0;

    hDecoderConfig->Opt_dpid_on = 0;
@@ -550,8 +547,6 @@ ivas_error IVAS_DEC_EnableSplitRendering( 
    hDecoderConfig->Opt_Headrotation = 1;

    hDecoderConfig->render_framesize = IVAS_RENDER_FRAMESIZE_20MS;



    hDecoderConfig->Opt_Limiter = 0;



    return error;

}

#endif