Commit f31ae5ff authored by Dominik Weckbecker's avatar Dominik Weckbecker 💬
Browse files

explain ambisonics conventions in usage_enc/dec

parent edd73108

apps/decoder.c

+4 −0
Original line number Diff line number Diff line
@@ -1688,6 +1688,10 @@ static void usage_dec( void ) 
#else

    fprintf( stdout, "OutputConf           : Output configuration: MONO, STEREO, 5_1, 7_1, 5_1_2, 5_1_4, 7_1_4, FOA,\n" );

    fprintf( stdout, "                       HOA2, HOA3, BINAURAL, BINAURAL_ROOM_IR, BINAURAL_ROOM_REVERB, EXT\n" );

#endif

#ifdef AMBISONICS_CONVENTIONS

    fprintf( stdout, "-sba_convention n    : Ambisonics convention of the output signal" );

    fprintf( stdout, "                       where n = 0 (ACN-SN3D), 1 (ACN-N3D), 2 (AMBIX), 3 (FuMa-MaxN), 4 (SID-SN3D), 5 (SID-N3D)" );

#endif

    fprintf( stdout, "                       By default, channel order and loudspeaker positions are equal to the\n" );

    fprintf( stdout, "                       encoder. For loudspeaker outputs, OutputConf can be a custom loudspeaker\n" );

apps/encoder.c

+5 −2
Original line number Diff line number Diff line
@@ -61,8 +61,7 @@ static 
#define DEFAULT_FIXED_SID_RATE 8 /* DTX SID rate */



/* Additional config info for each input format */

typedef union _EncInputFormatConfig

{

typedef union _EncInputFormatConfig {

    /* MONO details */

    bool stereoToMonoDownmix;
@@ -1900,6 +1899,10 @@ static void usage_enc( void ) 
    fprintf( stdout, "-sba +/-Order       : Scene Based Audio input format (Ambisonics ACN/SN3D),\n" );

    fprintf( stdout, "                      where Order specifies the Ambisionics order (1-3),\n" );

    fprintf( stdout, "                      where positive (+) means full 3D and negative (-) only 2D/planar components to be coded\n" );

#ifdef AMBISONICS_CONVENTIONS

    fprintf( stdout, "-sba_convention n   : Ambisonics convention of the input signal" );

    fprintf( stdout, "                      where n = 0 (ACN-SN3D), 1 (ACN-N3D), 2 (AMBIX), 3 (FuMa-MaxN), 4 (SID-SN3D), 5 (SID-N3D)" );

#endif

    fprintf( stdout, "-masa Ch File       : MASA format \n" );

    fprintf( stdout, "                      where Ch specifies the number of MASA input/transport channels (1 or 2): \n" );

    fprintf( stdout, "                      and File specifies input file containing parametric MASA metadata \n" );