Commit 0e7d0ef5 authored by ramoa's avatar ramoa
Browse files

Merge branch '490-masa-2tc-13-2-and-16-4-dtx-to-ext-out-is-broken' into 'main' 

[non-BE] Resolve "MASA 2TC 13.2 and 16.4 DTX to EXT out is broken"

See merge request !668
parents a2bcdd0a 1da4a40f

lib_com/options.h

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


#define FIX_487_LOWRATE_SBA_TUNING_FIX                  /* Dlb: TUning fix for low bitrate cases to match theoretical longest SPAR MD bitstream */



#define FIX_490_MASA_2TC_LBR_DTX                        /* Nokia: Fixes issue 490 by correcting condition. */



/* ################## End DEVELOPMENT switches ######################### */

/* clang-format on */

lib_dec/ivas_masa_dec.c

+4 −0
Original line number Diff line number Diff line
@@ -581,7 +581,11 @@ void ivas_masa_prerender( 
    const int16_t output_frame  /* i  : output frame length per channel             */

)

{

#ifdef FIX_490_MASA_2TC_LBR_DTX

    if ( st_ivas->ivas_format == MASA_FORMAT && st_ivas->nchan_transport == 2 && st_ivas->hDecoderConfig->ivas_total_brate < MASA_STEREO_MIN_BITRATE )

#else

    if ( st_ivas->ivas_format == MASA_FORMAT && st_ivas->nchan_transport == 2 && st_ivas->hDecoderConfig->ivas_total_brate < MASA_STEREO_MIN_BITRATE && st_ivas->hDecoderConfig->ivas_total_brate > IVAS_SID_5k2 )

#endif

    {

        if ( st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_EXTERNAL )

        {