Commit df0d20a9 authored by vaclav's avatar vaclav
Browse files

Merge branch '179-sba-printout-add-ambisonic-order-info' into 'main' 

Resolve "SBA printout: add Ambisonic order info"

See merge request !215
parents f51ae4c3 7946ee74

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -152,6 +152,7 @@ 
#define FIX_155_HP20_ISSUE                              /* Issue 155: apply hp20 on all input channels instead of just 2 channels */

#define EFAP_FIX_POLY                                   /* Issue 167: fix bug in EFAP polygon selection */

#define SBA_HOA_HBR_IMPROV                              /* issue 91: Improvements to SBA high bitrate HOA3 coding */

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





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

lib_dec/lib_dec.c

+4 −0
Original line number Diff line number Diff line
@@ -1766,7 +1766,11 @@ 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 );

#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

+4 −0
Original line number Diff line number Diff line
@@ -1501,7 +1501,11 @@ 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)" : "" );

#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 " );