Commit b3c0971b authored by vaclav's avatar vaclav
Browse files

fix build + errors

parent bbc73b17

lib_dec/ivas_jbm_dec.c

+2 −2
Original line number Diff line number Diff line
@@ -1501,7 +1501,7 @@ ivas_error ivas_jbm_dec_render( 
        nchan_out_syn_output = nchan_out;

    }



    if ( output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED || output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM )

    if ( !( output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED || output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM ) )

#endif

    {

        if ( st_ivas->ivas_format != MONO_FORMAT )
@@ -1781,7 +1781,7 @@ ivas_error ivas_jbm_dec_flush_renderer( 


    /* Only write out the valid data*/

#ifdef SPLIT_REND_WITH_HEAD_ROT

    if ( st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED || st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM )

    if ( !( st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED || st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM ) )

#endif

    {

        if ( st_ivas->ivas_format != MONO_FORMAT )

lib_isar/lib_isar_post_rend.c

+10 −3
Original line number Diff line number Diff line
@@ -1169,7 +1169,7 @@ int16_t ISAR_POST_REND_GetRenderConfig( 
    }



    hRCin = hIvasRend->splitRenderConfig;

#ifdef DEBUGGING

#ifdef DEBUGGINGaa

    switch ( hRCin->renderer_type_override )

    {

        case IVAS_RENDER_TYPE_OVERRIDE_CREND:
@@ -1820,13 +1820,20 @@ ivas_error ISAR_REND_SetSplitRendBitstreamHeader( 
 *-------------------------------------------------------------------*/



int32_t ISAR_POST_REND_GetNoCLipping(

    IVAS_REND_CONST_HANDLE hIvasRend )

    ISAR_POST_REND_HANDLE hIvasRend )

{

    return hIvasRend->numClipping;

}





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

 * ISAR_POST_REND_GetCntFramesLimited()

 *

 *

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



int32_t ISAR_POST_REND_GetCntFramesLimited(

    ISAR_POST_REND_CONST_HANDLE hIvasRend )

    ISAR_POST_REND_HANDLE hIvasRend )

{

    if ( hIvasRend->hLimiter == NULL )

    {

lib_isar/lib_isar_post_rend.h

+2 −2
Original line number Diff line number Diff line
@@ -207,11 +207,11 @@ ivas_error ISAR_REND_SetSplitRendBitstreamHeader( 


#ifdef DEBUGGING

int32_t ISAR_POST_REND_GetNoCLipping(

    IVAS_REND_CONST_HANDLE hIvasRend                            /* i  : Renderer handle                                     */

    ISAR_POST_REND_HANDLE hIvasRend                            /* i  : Renderer handle                                     */

);



int32_t ISAR_POST_REND_GetCntFramesLimited(

    IVAS_REND_CONST_HANDLE hIvasRend                            /* i  : Renderer handle                                     */

    ISAR_POST_REND_HANDLE hIvasRend                            /* i  : Renderer handle                                     */

);

#endif