Commit d4aad621 authored by multrus's avatar multrus
Browse files

[cleanup] accept PRINT_SBA_ORDER

parent 40b09e9d

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -145,7 +145,6 @@ 
/*#define ITD_WINNER_GAIN_MODIFY */                     /* ITD optimization - WORK IN PROGRESS */

/*#define FIX_I4_OL_PITCH*/                             /* fix open-loop pitch used for EVS core switching */

#define FIX_I1_113                                      /* under review : MCT bit distribution optimization for SBA high bitrates*/

#define PRINT_SBA_ORDER                                 /* Issue 179: print-out also the SBA order of IVAS SBA format to stdout */

#define EXT_RENDERER                                    /* FhG: external renderer library and standalone application */

#define NOKIA_MASA_EXTERNAL_RENDERER                    /* Nokia: MASA support for external renderer */

#define FIX_EFAP_MATH                                   /* fix for EFAP: remove angle quantization and a bug in polygon lookup causing incorrect gains. minor tweak for ALLRAD. non-BE for modes using EFAP */

lib_dec/lib_dec.c

+0 −4
Original line number Diff line number Diff line
@@ -1770,11 +1770,7 @@ static ivas_error printConfigInfo_dec( 
            }

            else if ( st_ivas->ivas_format == SBA_FORMAT )

            {

#ifdef PRINT_SBA_ORDER

                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

            }

            else if ( st_ivas->ivas_format == MASA_FORMAT )

            {

lib_enc/lib_enc.c

+0 −4
Original line number Diff line number Diff line
@@ -1520,11 +1520,7 @@ static ivas_error printConfigInfo_enc( 
    }

    else if ( hEncoderConfig->ivas_format == SBA_FORMAT )

    {

#ifdef PRINT_SBA_ORDER

        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

        if ( hEncoderConfig->Opt_PCA_ON )

        {

            fprintf( stdout, "- PCA configured with signal adaptive decision " );