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

[cleanup] 

- revert change in renderer.c - needs fix on API level
- correct IVAS_REND_{Get,Feed}RenderConfig function return types
- remove commented if condition.
parent f7a738a1

apps/renderer.c

+0 −6
Original line number Diff line number Diff line
@@ -1055,16 +1055,10 @@ int main( 
            exit( -1 );

        }



#ifndef FIX_1113_EXTREND_ISAR

        CLDFBframeSize_smpls = frameSize_smpls * 2;

        cldfb_in_flag = get_cldfb_in_flag( args.outConfig.audioConfig, &renderConfig );

#endif

    }



#ifdef FIX_1113_EXTREND_ISAR

    CLDFBframeSize_smpls = frameSize_smpls * 2;

    cldfb_in_flag = get_cldfb_in_flag( args.outConfig.audioConfig, &renderConfig );

#endif



    if ( ( error = IVAS_REND_SetOrientationTrackingMode( hIvasRend, args.orientation_tracking ) ) != IVAS_ERR_OK )

    {

lib_dec/ivas_binRenderer_internal.c

+0 −1
Original line number Diff line number Diff line
@@ -1854,7 +1854,6 @@ void ivas_binRenderer( 
#ifdef FIX_1113_EXTREND_ISAR

    if ( hBinRenderer->hInputSetup->is_loudspeaker_setup == 0 &&

         ( hBinRenderer->nInChannels != 16 && hBinRenderer->nInChannels != 9 && hBinRenderer->nInChannels != 4 ) )

    // if ( hBinRenderer->hInputSetup->is_loudspeaker_setup == 0 && hBinRenderer->hInputSetup->output_config == IVAS_AUDIO_CONFIG_7_1_4 )

#else

    if ( hBinRenderer->hInputSetup->is_loudspeaker_setup == 0 && hBinRenderer->nInChannels != 16 )

#endif

lib_rend/lib_rend.c

+8 −0
Original line number Diff line number Diff line
@@ -4138,7 +4138,11 @@ ivas_error IVAS_REND_InitConfig( 
 *

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



#ifdef FIX_1113_EXTREND_ISAR

ivas_error IVAS_REND_GetRenderConfig(

#else

int16_t IVAS_REND_GetRenderConfig(

#endif

    IVAS_REND_HANDLE hIvasRend,            /* i/o: IVAS decoder handle         */

    const IVAS_RENDER_CONFIG_HANDLE hRCout /* o  : Render configuration handle */

)
@@ -4201,7 +4205,11 @@ int16_t IVAS_REND_GetRenderConfig( 
 *

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



#ifdef FIX_1113_EXTREND_ISAR

ivas_error IVAS_REND_FeedRenderConfig(

#else

int16_t IVAS_REND_FeedRenderConfig(

#endif

    IVAS_REND_HANDLE hIvasRend,                /* i/o: IVAS decoder handle         */

    const IVAS_RENDER_CONFIG_DATA renderConfig /* i  : Render configuration struct */

)

lib_rend/lib_rend.h

+8 −0
Original line number Diff line number Diff line
@@ -238,12 +238,20 @@ ivas_error IVAS_REND_InitConfig( 
    const IVAS_AUDIO_CONFIG outAudioConfig          /* i  : output audioConfig                                  */

);



#ifdef FIX_1113_EXTREND_ISAR

ivas_error IVAS_REND_GetRenderConfig(

#else

int16_t IVAS_REND_GetRenderConfig(

#endif

    IVAS_REND_HANDLE hIvasRend,                     /* i/o: IVAS decoder handle                                 */

    const IVAS_RENDER_CONFIG_HANDLE hRCout          /* o  : Render configuration handle                         */

);



#ifdef FIX_1113_EXTREND_ISAR

ivas_error IVAS_REND_FeedRenderConfig(

#else

int16_t IVAS_REND_FeedRenderConfig(

#endif

    IVAS_REND_HANDLE hIvasRend,                     /* i/o: IVAS decoder handle                                 */

    const IVAS_RENDER_CONFIG_DATA renderConfig      /* i  : Render configuration struct                         */

);