Commit 4590e00d authored by vaclav's avatar vaclav
Browse files

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

Resolve "SBA printout: replace Analysis by Audio"

See merge request !227
parents d76dee82 35264dbd

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