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

add format AMBI_FMT_FM_FM

parent aaa1cd10

apps/decoder.c

+1 −1
Original line number Diff line number Diff line
@@ -1734,7 +1734,7 @@ static void usage_dec( void ) 
    fprintf( stdout, "--------\n" );

#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 (FuMa-MaxN), 3 (SID-SN3D), 4 (SID-N3D)" );

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

#endif

    fprintf( stdout, "-VOIP               : VoIP mode: RTP in G192\n" );

    fprintf( stdout, "-VOIP_hf_only=0     : VoIP mode: EVS RTP Payload Format hf_only=0 in rtpdump\n" );

apps/encoder.c

+1 −1
Original line number Diff line number Diff line
@@ -1909,7 +1909,7 @@ static void usage_enc( void ) 
    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 (FuMa-MaxN), 3 (SID-SN3D), 4 (SID-N3D)" );

    fprintf( stdout, "                      where n = 0 (ACN-SN3D), 1 (ACN-N3D), 2 (FuMa-MaxN), 3 (FuMa-FuMa), 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" );

lib_util/ambi_convert.c

+9 −1
Original line number Diff line number Diff line
@@ -156,6 +156,10 @@ int16_t convert_ambi_format( float *in[], float *out[], int16_t order, AMBI_FMT 
            ch_ord_in = AMBI_CHANNEL_ORDER_FM;

            ch_norm_in = AMBI_NORM_MAXN;

            break;

        case AMBI_FMT_FM_FM:

            ch_ord_in = AMBI_CHANNEL_ORDER_FM;

            ch_norm_in = AMBI_NORM_FM;

            break;

        case AMBI_FMT_SID_SN3D:

            ch_ord_in = AMBI_CHANNEL_ORDER_SID;

            ch_norm_in = AMBI_NORM_SN3D;
@@ -180,7 +184,11 @@ int16_t convert_ambi_format( float *in[], float *out[], int16_t order, AMBI_FMT 
            break;

        case AMBI_FMT_FM_MAXN:

            ch_ord_out = AMBI_CHANNEL_ORDER_FM;

            ch_norm_in = AMBI_NORM_MAXN;

            ch_norm_out = AMBI_NORM_MAXN;

            break;

        case AMBI_FMT_FM_FM:

            ch_ord_out = AMBI_CHANNEL_ORDER_FM;

            ch_norm_out = AMBI_NORM_FM;

            break;

        case AMBI_FMT_SID_SN3D:

            ch_ord_out = AMBI_CHANNEL_ORDER_SID;

lib_util/ambi_convert.h

+1 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ typedef enum 
    AMBI_FMT_ACN_SN3D = 0,

    AMBI_FMT_ACN_N3D,

    AMBI_FMT_FM_MAXN,

    AMBI_FMT_FM_FM,

    AMBI_FMT_SID_SN3D,

    AMBI_FMT_SID_N3D

} AMBI_FMT;

readme.txt

+2 −2
Original line number Diff line number Diff line
@@ -195,7 +195,7 @@ EVS mono is default, for IVAS choose one of the following: -stereo, -ism, -sba, 
                      where Order specifies the Ambisionics order (1-3),

                      where positive (+) means full 3D and negative (-) only 2D/planar components to be coded

-sba_convention n   : Ambisonics convention of the input signal

                      where n = 0 (ACN-SN3D), 1 (ACN-N3D), 2 (FuMa-MaxN), 3 (SID-SN3D), 4 (SID-N3D)

                      where n = 0 (ACN-SN3D), 1 (ACN-N3D), 2 (FuMa-MaxN), 3 (FuMa-FuMa), 4 (SID-SN3D), 5 (SID-N3D)

-masa Ch File       : MASA format

                      where Ch specifies the number of MASA input/transport channels (1 or 2):

                      and File specifies input file containing parametric MASA metadata
@@ -257,7 +257,7 @@ output_file : Output audio filename 
Options:

--------

-sba_convention n   : Ambisonics convention of the output signal

                      where n = 0 (ACN-SN3D), 1 (ACN-N3D), 2 (FuMa-MaxN), 3 (SID-SN3D), 4 (SID-N3D)

                    : where n = 0 (ACN-SN3D), 1 (ACN-N3D), 2 (FuMa-MaxN), 3 (FuMa-FuMa), 4 (SID-SN3D), 5 (SID-N3D)

-VOIP               : VoIP mode: RTP in G192

-VOIP_hf_only=0     : VoIP mode: EVS RTP Payload Format hf_only=0 in rtpdump

-VOIP_hf_only=1     : VoIP mode: EVS RTP Payload Format hf_only=1 in rtpdump