Commit 3292252a authored by vaclav's avatar vaclav
Browse files

clang-format

parent 88e36897

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -179,6 +179,7 @@ 
#define NONBE_FIX_1070_USAN_SEGFAULT_MC_TO_BIN_BTSW_HEADROT   /* fix 1070 USAN: nullptr-with-offset and Segfaults in 7_1_4 to BINAURAL and BINAURAL_ROOM_REVERB decoding with bitrate switching and head rotation*/ 

#define NONBE_FIX_MC_LFE_LPF                            /* Dlb: Adding the LFE LPF filter back for MC content. */

#define NONBE_FIX_1052_SBA_EXT                          /* Dlb: SBA external output support */

#define NONBE_FIX_1087_OOB_SBA_DTX_RS                   /* VA: issue 1087: Extend the length of the buffer for MCT decoding to avoid out-of-bound writing in SBA SID bitrate switching decoding */



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

lib_dec/ivas_mct_dec.c

+11 −1
Original line number Diff line number Diff line
@@ -148,6 +148,17 @@ ivas_error ivas_mct_dec( 
    /* MCT side bits decoder */

    ivas_mct_side_bits( hMCT, st_ivas->hCPE, nCPE, st_ivas->hCPE[0]->hCoreCoder[0], st_ivas->bfi, st_ivas->hCPE[0]->hCoreCoder[0]->bit_stream, ivas_total_brate, nb_bits_metadata );



#ifdef NONBE_FIX_1087_OOB_SBA_DTX_RS

    /* in case of switching from an SID frame (with ACELP core) to MCT, buffer of 1200 samples is needed -> use synth[] as a temporary buffer */

    if ( st_ivas->hCPE[0]->hCoreCoder[0]->last_core == ACELP_CORE )

    {

        for ( n = 0; n < CPE_CHANNELS; n++ )

        {

            output[n] = synth[n];

        }

    }

#endif



    for ( cpe_id = 0; cpe_id < nCPE; cpe_id++ )

    {

        st_ivas->hCPE[cpe_id]->hCoreCoder[0]->BER_detect |= st_ivas->BER_detect;
@@ -263,7 +274,6 @@ ivas_error ivas_mct_dec( 
#endif

        } /* n_channels loop */





        /* synthesis synchronization between stereo modes */

        if ( !st_ivas->sba_dirac_stereo_flag || ( st_ivas->ivas_format == SBA_ISM_FORMAT && cpe_id < nCPE - 2 ) )

        {