Commit e95e67d2 authored by Jan Kiene's avatar Jan Kiene
Browse files

Merge branch 'main' into 101-fd-cng-encoder-handle-initialization

parents e8b9c40b 4590e00d

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -153,6 +153,7 @@ 
#define FIX_I173_I174                                   /* Issues 173 and 174: Remove frame and subframe index from ISm metadata and headtracking respectively. */

#define FIX_TCX_DEC_RECONF_BFI

#define FIX_SBA_DTX_DECODE_ERROR                        /* Issue 176: SBA decoder error with DTX at 80kbps SWB, Issue 21: SBA front-VAD threshold (203) */

#define FIX_MSAN_ERROR_STEREO_RATE_SWITCHING            /* addresses Issue 177 */



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

/* clang-format on */

lib_dec/ivas_post_proc.c

+4 −0
Original line number Diff line number Diff line
@@ -478,7 +478,11 @@ void stereo_dft_dec_core_switching( 
                mvr2r( output, pAp_input, st->L_frame );

            }



#ifdef FIX_MSAN_ERROR_STEREO_RATE_SWITCHING

            if ( st->last_core == ACELP_CORE && !( st->prev_bfi == 1 && st->last_core == ACELP_CORE && st->last_con_tcx == 1 ) && !st->tcxonly ) /* ACELP -> TCX/HQ-Core */

#else

            if ( st->last_core == ACELP_CORE && !( st->prev_bfi == 1 && st->last_core == ACELP_CORE && st->last_con_tcx == 1 ) ) /* ACELP -> TCX/HQ-Core */

#endif

            {

                mvr2r( tcx_core_buf, tmp_fade, ap_fade_len );

                for ( i = 0; i < ap_fade_len; i++ )

lib_dec/lib_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -1767,7 +1767,7 @@ static ivas_error printConfigInfo_dec( 
            else if ( st_ivas->ivas_format == SBA_FORMAT )

            {

#ifdef PRINT_SBA_ORDER

                fprintf( stdout, "Input configuration:    Scene Based Analysis, Ambisonic order %i%s, %d transport channel(s)\n", st_ivas->sba_order, st_ivas->sba_planar ? " (Planar)" : "", st_ivas->nchan_transport );

                fprintf( stdout, "Input configuration:    Scene Based Audio, Ambisonic order %i%s, %d transport channel(s)\n", st_ivas->sba_order, st_ivas->sba_planar ? " (Planar)" : "", st_ivas->nchan_transport );

#else

                fprintf( stdout, "Input configuration:    SBA - %d transport channel(s) %s\n", st_ivas->nchan_transport, st_ivas->sba_planar ? "(Planar)" : "" );

#endif

lib_enc/lib_enc.c

+1 −1
Original line number Diff line number Diff line
@@ -1509,7 +1509,7 @@ static ivas_error printConfigInfo_enc( 
    else if ( hEncoderConfig->ivas_format == SBA_FORMAT )

    {

#ifdef PRINT_SBA_ORDER

        fprintf( stdout, "IVAS format:            Scene Based Analysis, Ambisonic order %i %s ", hEncoderConfig->sba_order, hEncoderConfig->sba_planar ? "(Planar)" : "" );

        fprintf( stdout, "IVAS format:            Scene Based Audio, Ambisonic order %i %s ", hEncoderConfig->sba_order, hEncoderConfig->sba_planar ? "(Planar)" : "" );

#else

        fprintf( stdout, "IVAS format:            Scene Based Analysis %s ", hEncoderConfig->sba_planar ? "(Planar)" : "" );

#endif