From 7946ee748952a22251a52b345e760208dfefcb37 Mon Sep 17 00:00:00 2001 From: vaclav Date: Tue, 25 Oct 2022 19:35:30 +0200 Subject: [PATCH] print-out also the SBA order of IVAS SBA format to stdout; under PRINT_SBA_ORDER --- lib_com/options.h | 1 + lib_dec/lib_dec.c | 4 ++++ lib_enc/lib_enc.c | 4 ++++ 3 files changed, 9 insertions(+) diff --git a/lib_com/options.h b/lib_com/options.h index b988fcb581..9c9effa225 100644 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -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 ######################### */ diff --git a/lib_dec/lib_dec.c b/lib_dec/lib_dec.c index b7f82edd2e..c63a2e064e 100644 --- a/lib_dec/lib_dec.c +++ b/lib_dec/lib_dec.c @@ -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 ) { diff --git a/lib_enc/lib_enc.c b/lib_enc/lib_enc.c index 4f990a25df..279a18954c 100644 --- a/lib_enc/lib_enc.c +++ b/lib_enc/lib_enc.c @@ -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 " ); -- GitLab