Commit 274445b5 authored by vaclav's avatar vaclav
Browse files

build fix

parent 1f4a2099

apps/renderer.c

+1 −1
Original line number Diff line number Diff line
@@ -2764,7 +2764,7 @@ static CmdlnArgs parseCmdlnArgs( 
#ifdef FIX_1135_EXT_RENDERER_HANDLES

    if ( args.outConfig.audioConfig == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED || args.outConfig.audioConfig == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM )

    {

        args.Opt_Headrotation = TRUE;

        args.Opt_Headrotation = 1;

    }

#endif

lib_rend/lib_rend.c

+5 −9
Original line number Diff line number Diff line
@@ -2855,7 +2855,7 @@ ivas_error IVAS_REND_Open( 
#endif



    /* Initilize combined orientation data */

#ifdef FIX_1135_EXT_RENDERER_HANDLESaa

#ifdef FIX_1135_EXT_RENDERER_HANDLES

    hIvasRend->hCombinedOrientationData = NULL;

    if ( Opt_Headrotation || Opt_ExternalOrientation )

    {
@@ -2864,7 +2864,7 @@ ivas_error IVAS_REND_Open( 
        {

            return error;

        }

#ifdef FIX_1135_EXT_RENDERER_HANDLESaa

#ifdef FIX_1135_EXT_RENDERER_HANDLES

    }

#endif
@@ -2877,6 +2877,7 @@ ivas_error IVAS_REND_Open( 
    /* Initialize inputs */



#ifdef FIX_1135_EXT_RENDERER_HANDLES

    hIvasRend->splitRendWrapper = NULL;

    if ( hIvasRend->outputConfig == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED || hIvasRend->outputConfig == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM )

    {

        if ( ( hIvasRend->splitRendWrapper = (SPLIT_REND_WRAPPER *) malloc( sizeof( SPLIT_REND_WRAPPER ) ) ) == NULL )
@@ -2887,14 +2888,9 @@ ivas_error IVAS_REND_Open( 
        isar_init_split_rend_handles( hIvasRend->splitRendWrapper );

        hIvasRend->splitRendEncBuffer.data = NULL;

    }

    else

    {

        hIvasRend->splitRendWrapper = NULL;

    }

#else

    isar_init_split_rend_handles( &hIvasRend->splitRendWrapper );

    hIvasRend->splitRendEncBuffer.data = NULL;



#endif



    for ( i = 0; i < RENDERER_MAX_ISM_INPUTS; ++i )
@@ -4596,7 +4592,7 @@ ivas_error IVAS_REND_SetOrientationTrackingMode( 
#ifdef FIX_1135_EXT_RENDERER_HANDLES

    if ( hIvasRend->headRotData.headRotEnabled == 0 )

    {

        return IVAS_HEAD_ORIENT_TRK_NONE;

        return IVAS_ERR_OK;

    }

#endif