Commit 614bb18a authored by multrus's avatar multrus
Browse files

Merge branch 'main' into 5msAPI-with-default_20ms

parents cb7dd719 08510066

.gitlab-ci.yml

+3 −1
Original line number Diff line number Diff line
@@ -828,11 +828,13 @@ check-first-frame-is-sid: 


    # TODO: for some MASA modes, we currently do not have testvectors that actually trigger DTX

    # SBA is run separately to use shorter part of file

    - exit_code_no_sba=0

    - exit_code_sba=0

    - modes=$(scripts/runIvasCodec.py -l | grep dtx | grep -v MASA | grep -v SBA)

    - scripts/runIvasCodec.py -p scripts/config/ci_linux_sidstart_test.json -m $modes -s --bs_length 500 -U 0:20 || exit_code_no_sba=$?

    - modes=$(scripts/runIvasCodec.py -l | grep dtx | grep SBA)

    - scripts/runIvasCodec.py -p scripts/config/ci_linux_sidstart_test.json -m $modes -s --bs_length 500 -U 70:80 || exit_code_sba=$?

    - if [ $exit_code_no_sba != 0 || $exit_code_sba != 0 ]; then exit 1; fi

    - if [ $exit_code_no_sba -ne 0 ] || [ $exit_code_sba -ne 0 ]; then exit 1; fi

  artifacts:

    paths:

      - out/logs

lib_com/options.h

+4 −0
Original line number Diff line number Diff line
@@ -165,6 +165,10 @@ 
#define APLIT_5MS_FIX_TODO

#endif



#define FIX_718_JBM_MD_UDPATE                           /* Fhg: fix issue #718, wrong setting of the update flag in the TD obj renderer in the JBM path */

#define FIX_719_CRASH_IN_CLEANUP                        /* VA: issue 719: fix Decoder crash after call to goto to cleanup */





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



/* #################### Start NON-BE CR switches ########################## */

lib_dec/ivas_init_dec.c

+4 −0
Original line number Diff line number Diff line
@@ -2522,7 +2522,11 @@ void ivas_initialize_handles_dec( 
    st_ivas->hJbmMetadata = NULL;



    /*  floating-point output audio buffers */

#ifdef FIX_719_CRASH_IN_CLEANUP

    for ( i = 0; i < MAX_OUTPUT_CHANNELS + MAX_NUM_OBJECTS; i++ )

#else

    for ( i = 0; i < MAX_OUTPUT_CHANNELS; i++ )

#endif

    {

        st_ivas->p_output_f[i] = NULL;

    }

lib_dec/ivas_objectRenderer_internal.c

+6 −0
Original line number Diff line number Diff line
@@ -238,7 +238,13 @@ ivas_error ivas_td_binaural_renderer_sf( 
        }



        /* Render subframe */

#ifdef FIX_718_JBM_MD_UDPATE

        /* ism_md_subframe_update_jbm != subframe_idx: trigger update only for ism_md_subframe_update_jbm == subframe_idx,

           where then the two TDREND_GetMix()-arguments subframe_idx and ism_md_subframe_update are equal, and we want to enforce the update inside TDREND_GetMix to use subframe_idx == 0 */

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

#else

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

#endif

        {

            return error;

        }