Commit 43163cb0 authored by Dominik Weckbecker's avatar Dominik Weckbecker 💬
Browse files

Merge remote-tracking branch 'origin/main' into... 

Merge remote-tracking branch 'origin/main' into 1173-evs-bitexactness-pipeline-errors-with-obj_editing_interface-2
parents c45b1662 7f1eeab7

.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line
@@ -2223,7 +2223,7 @@ coverage-test-on-main-scheduled: 
    - .test-job-linux-needs-testv-dir

    - .rules-main-scheduled

  tags:

    - ivas-linux

    - ivas-linux-fast

  stage: test

  rules:

    # only run in scheduled pipeline that passes this env vars

lib_com/options.h

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


#define NONE_BE_FIX_816_LFE_PLC_FLOAT                   /* DLB: issue 816: reduce required precision to float for LFE-PLC*/

#define NONBE_FIX_1220_OMASA_JBM_EXT_USAN                     /* Nokia: fix issue 1220 OMASA EXT JBM USAN, also fix similar cases of free to avoid future problems */

#define NONBE_FIX_1174_MCMASA_LBR_LOOP_ERROR            /* Nokia: Fix issue 1174 by removing the unnecessary inner loop causing problems. */



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

lib_enc/ivas_masa_enc.c

+4 −0
Original line number Diff line number Diff line
@@ -1777,10 +1777,14 @@ static void reduce_metadata_further( 
                /* Copy spread coherence to the rest of subframes for the coherence coding algorithm. */

                for ( sf = 1; sf < MAX_PARAM_SPATIAL_SUBFRAMES; sf++ )

                {

#ifdef NONBE_FIX_1174_MCMASA_LBR_LOOP_ERROR

                    hqmetadata->q_direction[0].coherence_band_data[band].spread_coherence[sf] = hqmetadata->q_direction[0].coherence_band_data[band].spread_coherence[0];

#else

                    for ( band = 0; band < numCodingBands; band++ )

                    {

                        hqmetadata->q_direction[0].coherence_band_data[band].spread_coherence[sf] = hqmetadata->q_direction[0].coherence_band_data[band].spread_coherence[0];

                    }

#endif

                }



                /* Surround coherence is already merged through time */

lib_util/g192.c

+1 −1
Original line number Diff line number Diff line
@@ -494,7 +494,7 @@ G192_ERROR G192_WriteVoipFrame_short( 
    uint32_t ssrc = 0;

    uint16_t rtpSequenceNumber_2 = htons( rtpSequenceNumber );

    uint32_t rtpTimeStamp_2 = htonl( rtpTimeStamp );

    uint16_t ssrc_2 = (uint16_t) htonl( ssrc );

    uint32_t ssrc_2 = (uint32_t) htonl( ssrc );



    assert( numBits <= IVAS_MAX_BITS_PER_FRAME );