Commit 2078f2d7 authored by malenovsky's avatar malenovsky
Browse files

Merge branch '1028-level-drop-in-ismx-formats-at-higher-bitrates' into 'main'

[non-BE][split-non-be] Resolve "Level drop in ISMx formats at higher bitrates"

See merge request !1516
parents eb8c4bc2 1fc96358
Loading
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ if __name__ == "__main__":
            if skiplines > 0:
                skiplines = skiplines - 1
            else:
                if "//" in line and len(line) > args.max_length:
                if "//" in line and all(x not in line for x in ["IVAS_cod", "IVAS_dec", "IVAS_rend"]) and len(line) > args.max_length:
                    exceeded.append(line)

    if exceeded:
+1 −0
Original line number Diff line number Diff line
@@ -169,6 +169,7 @@
#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 */

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

+4 −0
Original line number Diff line number Diff line
@@ -150,7 +150,11 @@ void open_decoder_LPD(
    {
        st->gamma = GAMMA16k;
    }
#ifdef NONBE_FIX_1028_1DB_TCX_LEVEL_DROP
    else if ( st->element_mode > EVS_MONO && st->sr_core > INT_FS_16k )
#else
    else if ( st->sr_core > INT_FS_16k && st->element_mode == IVAS_CPE_MDCT )
#endif
    {
        st->gamma = GAMMA16k;
    }