Commit b860fa78 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_541_EXT_REND_MASA_ROTATIONS

parent ad82190a

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -154,7 +154,6 @@ 






#define FIX_541_EXT_REND_MASA_ROTATIONS                 /* Nokia: Issue 541, rotations missing in masa external renderer */



#define MASA_PREREND                                    /* Nokia: Contribution 42: Support for IVAS_rend to merge MASA + other format to MASA */

#define FIX_383_CLEAN_UP                                /* Dlb : Clean up of unused functions */

lib_rend/lib_rend.c

+0 −4
Original line number Diff line number Diff line
@@ -6421,9 +6421,7 @@ static ivas_error renderActiveInputsMasa( 
    int16_t i;

    input_masa *pCurrentInput;

    ivas_error error;

#ifdef FIX_541_EXT_REND_MASA_ROTATIONS

    int16_t sf_idx;

#endif



    for ( i = 0, pCurrentInput = hIvasRend->inputsMasa; i < RENDERER_MAX_MASA_INPUTS; ++i, ++pCurrentInput )

    {
@@ -6433,7 +6431,6 @@ static ivas_error renderActiveInputsMasa( 
            continue;

        }



#ifdef FIX_541_EXT_REND_MASA_ROTATIONS

        if ( getAudioConfigType( hIvasRend->outputConfig ) == IVAS_REND_AUDIO_CONFIG_TYPE_BINAURAL && pCurrentInput->decDummy->hHeadTrackData != NULL )

        {

            for ( sf_idx = 0; sf_idx < RENDERER_HEAD_POSITIONS_PER_FRAME; ++sf_idx )
@@ -6442,7 +6439,6 @@ static ivas_error renderActiveInputsMasa( 
                pCurrentInput->decDummy->hHeadTrackData->Pos[sf_idx] = hIvasRend->headRotData.Pos[sf_idx];

            }

        }

#endif



        if ( ( error = renderInputMasa( pCurrentInput, hIvasRend->outputConfig, outAudio ) ) != IVAS_ERR_OK )

        {