Commit 7898ecbd authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

[cleanup] accept FIX_SPLIT_REND_OPEN_ERROR_HANDLING

parent 3041518e

lib_com/options.h

+0 −2
Original line number Diff line number Diff line
@@ -180,7 +180,6 @@ 


#define FIX_SPLIT_REND_MERGE                            /* Resolving the compilation warnings after splitrenderer main updation */



														

//#define SPLIT_REND_WITH_HEAD_ROT_DEBUG // only for debugging purposes

//#define DBG_WAV_WRITER

//#define SPLIT_POSE_CORRECTION_DEBUG
@@ -220,7 +219,6 @@ 


#define SPLIT_REND_LC3PLUS                              /* FhG: split rendering using LC3plus codec */

#define SPLIT_REND_LC3PLUS_MC                           /* FhG: split rendering using LC3plus codec for Multichannel content */

#define FIX_SPLIT_REND_OPEN_ERROR_HANDLING              /* adds missing error handling around ivas_split_renderer_open calls  */

// #define SPLIT_REND_LC3PLUS_HBR_DBG                      /* Override bitrate per LC3 core */

#endif

lib_dec/ivas_init_dec.c

+10 −20
Original line number Diff line number Diff line
@@ -1278,20 +1278,15 @@ ivas_error ivas_init_decoder( 
                                                  ( st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_BINAURAL_SPLIT_PCM ) ? 1 : 0 );

#endif



#ifdef FIX_SPLIT_REND_OPEN_ERROR_HANDLING

            error =

#endif

                ivas_split_renderer_open( &st_ivas->splitBinRend.splitrend,

            error = ivas_split_renderer_open( &st_ivas->splitBinRend.splitrend,

                                              &st_ivas->hRenderConfig->split_rend_config,

                                              hDecoderConfig->output_Fs,

                                              1, ( st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_BINAURAL_SPLIT_PCM ) ? 1 : 0 );



#ifdef FIX_SPLIT_REND_OPEN_ERROR_HANDLING

            if ( error != IVAS_ERR_OK )

            {

                return error;

            }

#endif

        }

#endif

    }
@@ -1342,10 +1337,7 @@ ivas_error ivas_init_decoder( 
                &st_ivas->splitBinRend.splitrend.multiBinPoseData,

                st_ivas->hHeadTrackData->sr_pose_pred_axis );



#ifdef FIX_SPLIT_REND_OPEN_ERROR_HANDLING

            error =

#endif

                ivas_split_renderer_open( &st_ivas->splitBinRend.splitrend,

            error = ivas_split_renderer_open( &st_ivas->splitBinRend.splitrend,

                                              &st_ivas->hRenderConfig->split_rend_config,

                                              hDecoderConfig->output_Fs, 0,

#ifdef SPLIT_REND_CLDFB_ISM
@@ -1355,12 +1347,10 @@ ivas_error ivas_init_decoder( 
#endif

            );



#ifdef FIX_SPLIT_REND_OPEN_ERROR_HANDLING

            if ( error != IVAS_ERR_OK )

            {

                return error;

            }

#endif

        }

#endif

        if ( st_ivas->hDecoderConfig->voip_active )

lib_dec/ivas_sba_dec.c

+3 −8
Original line number Diff line number Diff line
@@ -253,18 +253,13 @@ ivas_error ivas_sba_dec_reconfigure( 
#ifdef SPLIT_REND_LC3PLUS

            assert( st_ivas->hRenderConfig->split_rend_config.codec == IVAS_SPLIT_REND_CODEC_LCLD );

#endif

#ifdef FIX_SPLIT_REND_OPEN_ERROR_HANDLING

            error =

#endif

                ivas_split_renderer_open( &st_ivas->splitBinRend.splitrend,

            error = ivas_split_renderer_open( &st_ivas->splitBinRend.splitrend,

                                              &st_ivas->hRenderConfig->split_rend_config,

                                              hDecoderConfig->output_Fs, 1, ( st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_BINAURAL_SPLIT_PCM ) ? 1 : 0 );

#ifdef FIX_SPLIT_REND_OPEN_ERROR_HANDLING

            if ( error != IVAS_ERR_OK )

            {

                return error;

            }

#endif

        }

#endif

    }