Commit d40bf14e authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

[cleanup] rename alternate output name variation SPLIT_BINAURAL_CLDFB to SPLIT_BINAURAL_CODED

parent 0f75e581

apps/decoder.c

+8 −8
Original line number Diff line number Diff line
@@ -304,7 +304,7 @@ int main( 
        /* sanity check */

        if ( arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL && arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_ROOM_IR && arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_ROOM_REVERB

#ifdef SPLIT_REND_WITH_HEAD_ROT

             && arg.outputFormat != IVAS_DEC_OUTPUT_SPLIT_BINAURAL_CLDFB && arg.outputFormat != IVAS_DEC_OUTPUT_SPLIT_BINAURAL_PCM

             && arg.outputFormat != IVAS_DEC_OUTPUT_SPLIT_BINAURAL_CODED && arg.outputFormat != IVAS_DEC_OUTPUT_SPLIT_BINAURAL_PCM

#endif

        )

        {
@@ -408,7 +408,7 @@ int main( 
        /* sanity check */

        if ( arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL && arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_ROOM_IR && arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_ROOM_REVERB

#ifdef SPLIT_REND_WITH_HEAD_ROT

             && arg.outputFormat != IVAS_DEC_OUTPUT_SPLIT_BINAURAL_CLDFB && arg.outputFormat != IVAS_DEC_OUTPUT_SPLIT_BINAURAL_PCM

             && arg.outputFormat != IVAS_DEC_OUTPUT_SPLIT_BINAURAL_CODED && arg.outputFormat != IVAS_DEC_OUTPUT_SPLIT_BINAURAL_PCM

#endif

        )

        {
@@ -427,7 +427,7 @@ int main( 
     * Configure the decoder

     *------------------------------------------------------------------------------------------*/

#ifdef SPLIT_REND_WITH_HEAD_ROT

    if ( arg.outputFormat == IVAS_DEC_OUTPUT_SPLIT_BINAURAL_CLDFB || arg.outputFormat == IVAS_DEC_OUTPUT_SPLIT_BINAURAL_PCM )

    if ( arg.outputFormat == IVAS_DEC_OUTPUT_SPLIT_BINAURAL_CODED || arg.outputFormat == IVAS_DEC_OUTPUT_SPLIT_BINAURAL_PCM )

    {

        arg.enableHeadRotation = true;

    }
@@ -581,7 +581,7 @@ int main( 
        /* sanity check */

#ifdef SPLIT_REND_WITH_HEAD_ROT

        if ( arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL && arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_ROOM_IR && arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_ROOM_REVERB &&

             arg.outputFormat != IVAS_DEC_OUTPUT_SPLIT_BINAURAL_CLDFB &&

             arg.outputFormat != IVAS_DEC_OUTPUT_SPLIT_BINAURAL_CODED &&

             arg.outputFormat != IVAS_DEC_OUTPUT_SPLIT_BINAURAL_PCM )

        {

            fprintf( stderr, "\nExternal Renderer Config is supported only when binaural output configurations is used as output OR when Split rendering mode is enabled. Exiting. \n" );
@@ -856,7 +856,7 @@ static IVAS_DEC_AUDIO_CONFIG cmdline2config( 
#ifdef SPLIT_REND_WITH_HEAD_ROT

    else if ( strcmp( argv_to_upper, "BINAURAL_SPLIT_CODED" ) == 0 )

    {

        output_config = IVAS_DEC_OUTPUT_SPLIT_BINAURAL_CLDFB;

        output_config = IVAS_DEC_OUTPUT_SPLIT_BINAURAL_CODED;

    }

    else if ( strcmp( argv_to_upper, "BINAURAL_SPLIT_PCM" ) == 0 )

    {
@@ -1561,7 +1561,7 @@ static ivas_error initOnFirstGoodFrame( 
    }

#ifdef SPLIT_REND_CLDFB_ISM

    if ( ( arg.outputFormat == IVAS_DEC_OUTPUT_SPLIT_BINAURAL_PCM ) ||

         ( arg.outputFormat == IVAS_DEC_OUTPUT_SPLIT_BINAURAL_CLDFB ) )

         ( arg.outputFormat == IVAS_DEC_OUTPUT_SPLIT_BINAURAL_CODED ) )

    {

        pFullDelayNumSamples[0] = 0;

    }
@@ -1589,7 +1589,7 @@ static ivas_error initOnFirstGoodFrame( 
    }



#ifdef SPLIT_REND_WITH_HEAD_ROT

    if ( arg.outputFormat == IVAS_DEC_OUTPUT_SPLIT_BINAURAL_CLDFB )

    if ( arg.outputFormat == IVAS_DEC_OUTPUT_SPLIT_BINAURAL_CODED )

    {

        int16_t delayNumSamples_temp[3];

        int32_t delayTimeScale_temp;
@@ -2033,7 +2033,7 @@ static ivas_error decodeG192( 
        if ( decodedGoodFrame )

        {

#ifdef SPLIT_REND_WITH_HEAD_ROT

            if ( ( hSplitRendFileReadWrite != NULL ) && ( arg.outputFormat == IVAS_DEC_OUTPUT_SPLIT_BINAURAL_CLDFB ) )

            if ( ( hSplitRendFileReadWrite != NULL ) && ( arg.outputFormat == IVAS_DEC_OUTPUT_SPLIT_BINAURAL_CODED ) )

            {

                if ( split_rend_write_bitstream_to_file( hSplitRendFileReadWrite, splitRendBits.bits_buf, &splitRendBits.bits_read, &splitRendBits.bits_written

#ifdef SPLIT_REND_LC3PLUS

lib_dec/lib_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -384,7 +384,7 @@ static AUDIO_CONFIG mapOutputFormat( 
        output_config = AUDIO_CONFIG_BINAURAL_ROOM_REVERB;

    }

#ifdef SPLIT_REND_WITH_HEAD_ROT

    else if ( outputFormat == IVAS_DEC_OUTPUT_SPLIT_BINAURAL_CLDFB )

    else if ( outputFormat == IVAS_DEC_OUTPUT_SPLIT_BINAURAL_CODED )

    {

        output_config = AUDIO_CONFIG_BINAURAL_SPLIT_CODED;

    }

lib_dec/lib_dec.h

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ typedef enum _IVAS_DEC_OUTPUT_CONFIG 
    IVAS_DEC_OUTPUT_HOA3,

    IVAS_DEC_OUTPUT_BINAURAL,

#ifdef SPLIT_REND_WITH_HEAD_ROT

    IVAS_DEC_OUTPUT_SPLIT_BINAURAL_CLDFB, /* ToDo: Also includes LC3plus, should be renamed during harmonization */

    IVAS_DEC_OUTPUT_SPLIT_BINAURAL_CODED,

    IVAS_DEC_OUTPUT_SPLIT_BINAURAL_PCM,

#endif

    IVAS_DEC_OUTPUT_BINAURAL_ROOM_IR,