Commit 37e58682 authored by norvell's avatar norvell
Browse files

Merge branch 'ci/fix-ivas-conf-2' into ci/ivas-conformance-ltv

parents c97a3e86 1b612f53

.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line
@@ -1351,7 +1351,7 @@ ivas-conformance: 
  timeout: "90 minutes"

  rules:

    - if: ($CI_PIPELINE_SOURCE == 'web' || $CI_PIPELINE_SOURCE == 'trigger') && $MANUAL_PIPELINE_TYPE == 'ivas-conformance'

#    - if: $CI_PIPELINE_SOURCE == 'push' && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH

    - if: $CI_PIPELINE_SOURCE == 'push' && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH

  allow_failure:

    exit_codes:

      - 123

lib_com/ivas_dirac_com.c

+5 −1
Original line number Diff line number Diff line
@@ -342,10 +342,14 @@ void ivas_get_dirac_sba_max_md_bits( 
    {

        *bits_frame_nominal = ACELP_16k40 / FRAMES_PER_SEC;

        *metadata_max_bits = 103;

        /* OSBA needs an additional 2-bits safety margin to avoid acelp crashes */

        /* OSBA needs an additional 5-bits safety margin to avoid acelp crashes */

        if ( ivas_format == SBA_ISM_FORMAT )

        {

#ifdef NONBE_FIX_SBA_SIGNALING_BITS_B

            ( *metadata_max_bits ) -= 7;

#else

            ( *metadata_max_bits ) -= 3;

#endif

        }

    }

    else if ( sba_total_brate <= IVAS_32k )

lib_com/ivas_prot.h

+0 −6
Original line number Diff line number Diff line
@@ -982,20 +982,14 @@ ivas_error ivas_ism_metadata_enc_create( 


ivas_error ivas_ism_metadata_dec_create(

    Decoder_Struct *st_ivas,                                    /* i/o: IVAS decoder structure                      */

#ifdef NONBE_FIX_1065_ISM_MD_HANDLE

    const int16_t n_ISms,                                       /* i  : number of separately coded objects          */

#else

    const int16_t n_ISms,                                       /* i  : number of objects                           */

#endif

    int32_t element_brate_tmp[]                                 /* o  : element bitrate per object                  */

);



#ifdef NONBE_FIX_1065_ISM_MD_HANDLE

void ivas_ism_reset_metadata_handle_dec(

    ISM_METADATA_HANDLE hIsmMeta                                /* i/o: ISM metadata handle                         */

);



#endif

ivas_error ivas_ism_enc(

    Encoder_Struct *st_ivas,                                    /* i/o: IVAS encoder structure                      */

    float *data[],                                             /* i  : input signal [channels][samples]            */

lib_com/options.h

+2 −4
Original line number Diff line number Diff line
@@ -159,7 +159,6 @@ 
#define FIX_NUM_SUBFRAME_UPDATE



#define FIX_1053_REVERB_RECONFIGURATION                 /* Philips: issue 1053: fix for dynamic switching of acoustic environment */

#define FIX_1060_USAN_ARRAY_BOUNDS                      /* FhG: issue 1060: USAN array-bounds errors */





/* #################### End BE switches ################################## */
@@ -168,11 +167,10 @@ 
/* any switch which is non-be wrt selection floating point code */

/* all switches in this category should start with "NONBE_" */



#define NONBE_FIX_1045_ISM_BITRATE_SWITCHING            /* Eri: Difference between ROM/File HRTF in ISM bitrate switching */

#define NONBE_FIX_1067_QUATERNIONSLERP_INACCURACIES     /* Philips: issue 1067: QuaternionSlerp inaccuracies in corner cases */

#define NONBE_FIX_1065_ISM_MD_HANDLE                    /* VA: issue 1065: Allocate only the necessary number of ISM MD decoder handles. */

#define NONBE_FIX_1028_1DB_TCX_LEVEL_DROP               /* VA: Harmonize the logic setting LP weighting factor between TCX encoder and TCX decoder */



#define NONBE_FIX_SBA_SIGNALING_BITS_B                  /* FhG: issue 1061: option B: signal sba order additionally in OSBA */



/* ##################### End NON-BE switches ########################### */



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

lib_dec/ivas_dirac_dec.c

+0 −5
Original line number Diff line number Diff line
@@ -2317,13 +2317,8 @@ void ivas_dirac_dec_render_sf( 


                                for ( l = 0; l < hSpatParamRendCom->num_freq_bands; l++ )

                                {

#ifdef FIX_1060_USAN_ARRAY_BOUNDS

                                    Cldfb_RealBuffer[j2][k][l] += g * *( tc_re++ );

                                    Cldfb_ImagBuffer[j2][k][l] += g * *( tc_im++ );

#else

                                    Cldfb_RealBuffer[j2][0][k * hSpatParamRendCom->num_freq_bands + l] += g * *( tc_re++ );

                                    Cldfb_ImagBuffer[j2][0][k * hSpatParamRendCom->num_freq_bands + l] += g * *( tc_im++ );

#endif

                                }

                                w1 += hSpatParamRendCom->num_freq_bands;

                            }