Commit d3dba0b5 authored by Vladimir Malenovsky's avatar Vladimir Malenovsky
Browse files

Merge branch... 

Merge branch '1391-ivas-float-udpate-sba-spar-dynamic-active-w-is-not-getting-hit-by-stvs' into 'ivas-float-update'

Resolve "SBA SPAR Dynamic active W is not getting hit by STVs"

See merge request !2557
parents 954bb077 0d7753db

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -206,6 +206,7 @@ 
#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 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 BE_FIX_1391_COVERAGE_SPAR_DYN__CHANNEL         /* Dolby: Fix coverage of SBA SPAR Dynamic active W not getting hit by the tests */



// object-editing feature porting

#define FIX_HRTF_LOAD_API                               // solves API conflicts between HRTF and object-editing features

lib_debug/debug.c

+5 −0
Original line number Diff line number Diff line
@@ -784,8 +784,13 @@ char *fname( 
#endif

    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 );

#ifdef DEBUG_FORCE_DIR

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 )

            {