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

[fix] compilation with either API_5MS or SPLIT_REND_WITH_HEAD_ROT disabled

parent 84475ae1

lib_com/options.h

+2 −0
Original line number Diff line number Diff line
@@ -183,8 +183,10 @@ 
#define SBA_AND_OBJECTS

#ifdef SBA_AND_OBJECTS

#define OSBA_BR_SWITCHING

#ifdef SPLIT_REND_WITH_HEAD_ROT                         /* requires main split rendering switch to be active */

#define OSBA_SPLIT_RENDERING

#endif

#endif



#define FIX_264_AUDIO_CHANNELS_TO_HEAP                  /* VA: issue 243: Move audio channels memory from stack to heap */

lib_dec/lib_dec.c

+3 −3
Original line number Diff line number Diff line
@@ -684,8 +684,7 @@ ivas_error IVAS_DEC_Configure( 
    return error;

}



#ifdef API_5MS

#ifdef SPLIT_REND_WITH_HEAD_ROT

#if defined( SPLIT_REND_WITH_HEAD_ROT ) && defined( API_5MS )

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

 * IVAS_DEC_EnableSplitRendering( )

 *
@@ -719,7 +718,8 @@ ivas_error IVAS_DEC_EnableSplitRendering( 


    return error;

}

#endif





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

 * IVAS_DEC_Get5msFlag( )

 *

lib_rend/ivas_output_init.c

+2 −0
Original line number Diff line number Diff line
@@ -383,10 +383,12 @@ int16_t ivas_get_nchan_buffers_dec( 
        }

    }



#ifdef SPLIT_REND_WITH_HEAD_ROT

    if ( output_config == AUDIO_CONFIG_BINAURAL_SPLIT_CODED || output_config == AUDIO_CONFIG_BINAURAL_SPLIT_PCM )

    {

        nchan_out_buff = max( nchan_out_buff, st_ivas->splitBinRend.splitrend.multiBinPoseData.num_poses * BINAURAL_CHANNELS );

    }

#endif



    return nchan_out_buff;

}

lib_rend/ivas_rotation.c

+0 −4
Original line number Diff line number Diff line
@@ -605,12 +605,8 @@ void rotateFrame_sd( 
#endif

#ifdef SPLIT_REND_WITH_HEAD_ROT

            hCombinedOrientationData->Rmat_prev[0][i],

#else

#ifdef API_5MS

            hCombinedOrientationData->Rmat_prev,

#else

            hCombinedOrientationData->Rmat_prev[i],

#endif

#endif

            3 );

    }

lib_rend/lib_rend.c

+1 −1
Original line number Diff line number Diff line
@@ -1516,7 +1516,7 @@ static ivas_error setRendInputActiveIsm( 
        }

        if ( outConfig == IVAS_REND_AUDIO_CONFIG_BINAURAL_ROOM_REVERB )

        {

            if ( ( error = ivas_reverb_open( &( inputIsm->hReverb ), getIvasAudioConfigFromRendAudioConfig( outConfig ), NULL, &inputIsm->tdRendWrapper.hBinRendererTd->HrFiltSet_p->lr_energy_and_iac, hRendCfg, *rendCtx.pOutSampleRate ) ) != IVAS_ERR_OK )

            if ( ( error = ivas_reverb_open( &( inputIsm->hReverb ), getIvasAudioConfigFromRendAudioConfig( outConfig ), NULL, inputIsm->tdRendWrapper.hBinRendererTd->HrFiltSet_p->lr_energy_and_iac, hRendCfg, *rendCtx.pOutSampleRate ) ) != IVAS_ERR_OK )

            {

                return error;

            }