Commit cd97db64 authored by vaclav's avatar vaclav Committed by Manuel Jander
Browse files

port fix

parent 30193cd0

apps/decoder.c

+13 −0
Original line number Diff line number Diff line
@@ -144,6 +144,7 @@ typedef struct 
    bool rtpOutSR;

<<<<<<< HEAD

<<<<<<< HEAD

<<<<<<< HEAD

=======

#ifdef FIX_1419_MONO_STEREO_UMX

    bool evsMode;
@@ -152,6 +153,10 @@ typedef struct 
=======

    bool evsMode;

>>>>>>> 88f1eb3c8 (acceptance of switches, step 2)

=======

#endif

#ifdef FIX_1318_ROOM_SIZE_CMD_LINE

>>>>>>> 76499842b (port fix)

    IVAS_ROOM_SIZE_T roomSize;



} DecArguments;
@@ -903,9 +908,12 @@ static bool parseCmdlIVAS_dec( 
    arg->outputConfig = IVAS_AUDIO_CONFIG_MONO;

    arg->decMode = IVAS_DEC_MODE_IVAS;

<<<<<<< HEAD

<<<<<<< HEAD

=======

    arg->evsMode = false;

>>>>>>> 88f1eb3c8 (acceptance of switches, step 2)

=======

>>>>>>> 76499842b (port fix)

    arg->quietModeEnabled = false;

    arg->delayCompensationEnabled = true;

    arg->voipMode = false;
@@ -1496,11 +1504,16 @@ static bool parseCmdlIVAS_dec( 
            usage_dec();

            return false;

        }

<<<<<<< HEAD

<<<<<<< HEAD

        else if ( arg->non_diegetic_pan_enabled && arg->outputConfig == IVAS_AUDIO_CONFIG_STEREO && arg->decMode == IVAS_DEC_MODE_EVS )

=======

        else if ( arg->non_diegetic_pan_enabled && arg->outputConfig == IVAS_AUDIO_CONFIG_STEREO && arg->evsMode )

>>>>>>> 88f1eb3c8 (acceptance of switches, step 2)

=======

#ifdef FIX_1419_MONO_STEREO_UMX

        else if ( arg->non_diegetic_pan_enabled && arg->outputConfig == IVAS_AUDIO_CONFIG_STEREO && arg->decMode == IVAS_DEC_MODE_EVS )

>>>>>>> 76499842b (port fix)

        {

            fprintf( stderr, "Error: Both non-diegetic panning and stereo output specified!\n\n" );

            usage_dec();

lib_dec/ivas_sba_rendering_internal_fx.c

+28 −0
Original line number Diff line number Diff line
@@ -211,6 +211,34 @@ void ivas_mc2sba_fx( 
    return;

}



#ifdef FIX_1419_MONO_STEREO_UMX



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

 * ivas_stereo2sba()

 *

 * stereo signal is transformed into SBA in TD domain

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



void ivas_stereo2sba_fx(

    Word32 *input_fx[],       /* i  : core-coder transport stereo channels */

    Word32 *output_fx[],      /* o  : SBA output channels                  */

    const Word16 output_frame /* i  : output frame length per channel      */

)

{

    Word16 n;

    Word32 tmp;



    FOR( n = 0; n < output_frame; n++ )

    {

        tmp = input_fx[0][n];

        output_fx[0][n] = L_shr( L_add( tmp, input_fx[1][n] ), 1 ); /* W = 0.5 * ( L + R ) */

        output_fx[1][n] = L_shr( L_sub( tmp, input_fx[1][n] ), 1 ); /* Y = 0.5 * ( L - R ) */

    }



    return;

}



#endif



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

 * ivas_stereo2sba()