Commit 64b5e36d authored by Jouni Paulus's avatar Jouni Paulus
Browse files

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

Merge remote-tracking branch 'origin/main' into 425-masa-bitrate-switching-not-reconfiguring-renderer

# Conflicts:
#	lib_com/options.h
parents 28d2ca67 98a326b7

lib_com/options.h

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


#define FIX_416_ISM_BR_SWITCHING                        /* FhG: add missing CLDFB reconfig to ISM BR switching */

#define FIX_SP2A                                        /* VA: Issue 412: Adjust threshold for the S_p2a feature in the tonal detector */

#define FIX_413_SBA_DTX                                 /*Dlb: Fix for issue 413, SBA DTX CNG in 2TC mode*/



#define FIX_425_MASA_BRSW_RENDERER                      /* Nokia: Issue 425: renderer not reconfigure in MASA bitrate switching */

lib_dec/ivas_stereo_mdct_stereo_dec.c

+11 −0
Original line number Diff line number Diff line
@@ -468,11 +468,22 @@ ivas_error initMdctStereoDtxData( 


            /* Init FD-CNG */

            initFdCngDec( st );

#ifndef FIX_413_SBA_DTX

            if ( ch == 1 && st->cng_sba_flag )

            {

                st->hFdCngDec->hFdCngCom->seed += 3;

            }

#endif

        }

#ifdef FIX_413_SBA_DTX

        if ( st->first_CNG == 0 )

        {

            if ( ch == 1 && st->cng_sba_flag )

            {

                st->hFdCngDec->hFdCngCom->seed += 3;

            }

        }

#endif



        if ( st->cldfbAna == NULL )

        {