Commit 32d98ab7 authored by vaclav's avatar vaclav
Browse files

Merge remote-tracking branch 'remotes/origin/main' into RTP_revision

parents 707ff045 dab9e8ba

lib_com/options.h

100644 → 100755
+2 −1
Original line number Diff line number Diff line
@@ -203,6 +203,7 @@ 
#define NONBE_1380_OMASA_BUILD_DIFF                     /* Nokia: Fix for issue #1380: Large differences in OMASA output between Debug and Release builds */

#define NONBE_FIX_1426_STEREO_PANNING_BETWEEN_OPT_LEVEL /* Nokia: Adjustments in remaining stereo panning functions to make them BE between Debug and Release */

#define FIX_GAIN_EDIT_LIMITS                           /* Harmonize gain edit limits for all opertation points. For all modes, limit to max +12dB. For parametric modes, limit to min -24dB. */

#define BE_FIX_1391_COVERAGE_SPAR_DYN__CHANNEL         /* Dolby: Fix coverage of SBA SPAR Dynamic active W not getting hit by the tests */





#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 */

lib_debug/debug.c

+5 −0
Original line number Diff line number Diff line
@@ -774,8 +774,13 @@ char *fname( 
{

    char idd[6];



#ifdef BE_FIX_1391_COVERAGE_SPAR_DYN__CHANNEL

    assert( id >= 0 && id < 100 );

    snprintf( idd, sizeof( idd ), ".id%d", id );

#else

    assert( id < 100 );

    sprintf( idd, ".id%d", id );

#endif



    strcpy( tmp_fname, dir );

    strcat( tmp_fname, file );

lib_enc/ivas_spar_encoder.c

+4 −0
Original line number Diff line number Diff line
@@ -838,7 +838,11 @@ static ivas_error ivas_spar_enc_process( 
    {



        /*cross fade between new active W channels and old passive W channel*/

#ifdef BE_FIX_1391_COVERAGE_SPAR_DYN__CHANNEL

        if ( dyn_active_w_flag == 1 || hSpar->hMdEnc->spar_md.prior_dyn_active_w_flag == 1 )

#else

        if ( dyn_active_w_flag == 1 )

#endif

        {

            if ( hSpar->hMdEnc->spar_md.prior_dyn_active_w_flag != dyn_active_w_flag )

            {

lib_rend/lib_rend.c

+6 −7
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ typedef struct 
    float gain; /* Linear, not in dB */

    rendering_context ctx;

    int32_t numNewSamplesPerChannel; /* Used to keep track how much new audio was fed before rendering current frame */

    int32_t delayNumSamples;

    int16_t delayNumSamples;

} input_base;



typedef struct
@@ -1493,9 +1493,8 @@ static ivas_error alignInputDelay( 
{

    ivas_error error;

    input_ism *inputIsm;

    int16_t maxGlobalDelaySamples;

    int32_t numSamplesToPush, numSamplesToPop;

    uint32_t ringBufferSize, preDelay;

    int16_t maxGlobalDelaySamples, numSamplesToPop, numSamplesToPush;

    uint16_t ringBufferSize, preDelay;

#ifdef FIX_1119_SPLIT_RENDERING_VOIP

    int16_t i;

    const float *p_read_channels[MAX_INPUT_CHANNELS];
@@ -1516,7 +1515,7 @@ static ivas_error alignInputDelay( 


        if ( preDelay > 0 )

        {

            if ( ( error = ivas_TD_RINGBUF_Open( &inputBase->delayBuffer, (int16_t) ringBufferSize, inputAudio.config.numChannels ) ) != IVAS_ERR_OK )

            if ( ( error = ivas_TD_RINGBUF_Open( &inputBase->delayBuffer, ringBufferSize, inputAudio.config.numChannels ) ) != IVAS_ERR_OK )

            {

                return error;

            }
@@ -1524,7 +1523,7 @@ static ivas_error alignInputDelay( 
            /* for the first frame we need to push zeros to align the input delay to the global delay

             * and then push a frame of actual data */

#ifdef FIX_1119_SPLIT_RENDERING_VOIP

            ivas_TD_RINGBUF_PushConstant( inputBase->delayBuffer, 0, (int16_t) preDelay );

            ivas_TD_RINGBUF_PushConstant( inputBase->delayBuffer, 0, preDelay );

#else

            ivas_TD_RINGBUF_PushZeros( inputBase->delayBuffer, preDelay );

#endif
@@ -1547,7 +1546,7 @@ static ivas_error alignInputDelay( 
        /* push in the new input data and pop to retrieve a complete input frame

         * if we are flushing the inputs, we don't push in any new data */

        numSamplesToPush = flushInputs ? 0 : inputAudio.config.numSamplesPerChannel;

        numSamplesToPop = flushInputs ? (uint32_t) ivas_TD_RINGBUF_Size( inputBase->delayBuffer ) : (uint32_t) inputAudio.config.numSamplesPerChannel;

        numSamplesToPop = flushInputs ? ivas_TD_RINGBUF_Size( inputBase->delayBuffer ) : inputAudio.config.numSamplesPerChannel;



#ifdef FIX_1119_SPLIT_RENDERING_VOIP

        for ( i = 0; i < inputAudio.config.numChannels; ++i )

scripts/config/self_test.prm

+4 −0
Original line number Diff line number Diff line
@@ -738,6 +738,10 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1 
../IVAS_cod -dtx -sba 1 64000 48 testv/stvFOA48n.wav bit

../IVAS_dec BINAURAL_ROOM_IR 48 bit testv/stvFOA48n.wav_SBA_64000_48-48_DTX_BINAURAL_ROOM.tst



// SBA at 64 kpbs, 48kHz in, 48kHz out, EXT out

../IVAS_cod -sba 1 64000 48 testv/stvFOA48c_cut.wav bit

../IVAS_dec EXT 48 bit testv/stvFOA48c_cut.wav_SBA_64000_48-48_EXT.tst



// SBA at 80 kbps, 32kHz in, 32kHz out, HOA3 out

../IVAS_cod -sba 3 80000 32 testv/stv3OA32c.wav bit

../IVAS_dec HOA3 32 bit testv/stv3OA32c.wav_SBA_80000_32-32_HOA3.tst