Commit 7933fbac authored by Jan Kiene's avatar Jan Kiene
Browse files

Merge branch 'main' into 123_ref_test-for-ci-with-ivas-codec-ref

parents 9e712944 741802fb

.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line
@@ -2214,7 +2214,7 @@ sanitizer-test-osba-planar-hoa3-ism4: 
    - if: $MANUAL_PIPELINE_TYPE == "coverage"

  timeout: 6 hours

  before_script:

    - !reference [.job-linux, before_script]

    - !reference [.test-job-linux-needs-testv-dir, before_script]

    - set -e

    - 'trap ''echo "Command failed at line $LINENO: $BASH_COMMAND"'' ERR'

    - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/print-common-info.sh

lib_com/disclaimer.c

+4 −2
Original line number Diff line number Diff line
@@ -47,10 +47,12 @@ int16_t print_disclaimer( FILE *fPtr ) 
{



    fprintf( fPtr, "\n==================================================================================================\n" );

    fprintf( fPtr, " \n IVAS Codec Version IVAS-FL-2.0\n" );

    fprintf( fPtr, "\n" );

    fprintf( fPtr, " 3GPP TS26.258 IVAS Codec Version IVAS-FL-3.0 (floating-point C-Code)\n" );

    fprintf( fPtr, "\n" );

    fprintf( fPtr, " Based on EVS Codec (Floating Point) 3GPP TS26.443 Nov 04, 2021,\n" );

    fprintf( fPtr, " Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0\n" );

    fprintf( fPtr, "\n" );

    fprintf( fPtr, "==================================================================================================\n\n" );



    return 0;

lib_com/options.h

+3 −0
Original line number Diff line number Diff line
@@ -169,6 +169,8 @@ 
#define DECODER_FORMAT_SWITCHING                       /* Re-initialize the decoder when the format/subformat of the incoming stream is changed */

#define RTP_SR_CODEC_FRAME_SIZE_IN_TOC_BYTE            /* CR for split rendering codec framesize signalling in Toc Byte*/

#define FIX_SPLIT_RENDERING_ON_DECODER_RESTART         /* Re-configure split rendering on decoder restart */

#define RTP_UPDATES_SA4_134                            /* Updates to RTP during SA4 134 */

#define COMPACT_ORIENTATION_PI_DATA



/* ################### Start BE switches ################################# */

/* only BE switches wrt selection floating point code */
@@ -210,6 +212,7 @@ 


#define FIX_1430_EVS_STEREO_DMX_CHANNEL_DISAPPEARING    /* Orange: Fix for basop issue 2184 - to prevent one channel from becoming inaudible in the mono downmix output */

#define FIX_1440_AMR_WB_RESET                           /* VA: issue 1440: Fix missing AMR-WB IO memory reset (applicable to float only) */

#define FIX_BASOP_ISSUE_1585_CUT_BS_CRASH               /* FhG: Fix for BASOP issue 1585 crash of a cut bitstream, also valid for float code*/



#define NONBE_FIX_BASOP_2233_RTPDUMP_DIFFERING_BITSTREAMS /* Nokia: fix basop issue 2233: Fix differing rtpdump streams */

lib_dec/core_switching_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -663,7 +663,7 @@ ivas_error core_switching_post_dec( 
            }

            else if ( ( ( st->last_core == ACELP_CORE || st->last_core_bfi == ACELP_CORE ) && !( st->prev_bfi == 1 && st->last_con_tcx == 1 ) ) || st->last_core == AMR_WB_CORE ) /*ACELP->TCX/HQ*/

            {

                /* if this is first active MDCT-Stereo frame after a CNG frame and output format is mono DMX, this should only be done for the zero-th channel, the other one will simply be copied over after this function */

                /* if output format is mono DMX, this should only be done for the zero-th channel, the other one will simply be copied over after this function */

                if ( ( ( st->last_core_brate != SID_2k40 && st->last_core_brate != FRAME_NO_DATA ) || ( st->element_mode != IVAS_CPE_DFT && st->element_mode != IVAS_CPE_TD ) || nchan_out == 1 ) && !( st->element_mode == IVAS_CPE_MDCT && st->idchan == 1 && ( nchan_out == 1 || last_element_mode == IVAS_CPE_DFT ) ) )

                {

                    core_switch_lb_upsamp( st, output );

lib_dec/ivas_mdct_core_dec.c

+7 −0
Original line number Diff line number Diff line
@@ -160,6 +160,13 @@ static void dec_prm_tcx_sidebits( 
        st->last_core_from_bs = st->last_core;

    }



#ifdef FIX_BASOP_ISSUE_1585_CUT_BS_CRASH

    /* for first frame reset last_core to initialization value for better error-robustness*/

    if ( st->ini_frame == 0 )

    {

        st->last_core = TCX_20_CORE;

    }

#endif

    getTCXWindowing( st->core, st->last_core, st->element_mode, st->hTcxCfg, st0 );



    st->hTcxDec->kernel_type[0] = st->hTcxDec->kernel_type[1] = MDCT_IV;