Commit 33b43ebd authored by stoutjesdijk's avatar stoutjesdijk 🎧
Browse files

fix compilation without FIX_196_...

parent d7282b92

lib_dec/ivas_jbm_dec.c

+10 −1
Original line number Diff line number Diff line
@@ -763,8 +763,13 @@ ivas_error ivas_jbm_dec_render( 
            }

            else if ( st_ivas->renderer_type == RENDERER_BINAURAL_MIXER_CONV_ROOM )

            {

#ifdef FIX_196_REFACTOR_RENDERER_OUTPUT_CONFIG

                if ( ( error = ivas_rend_crendProcessSubframe( st_ivas->hCrendWrapper, AUDIO_CONFIG_7_1_4, AUDIO_CONFIG_BINAURAL_ROOM_IR, st_ivas->hDecoderConfig, NULL, NULL,

                                                               NULL, st_ivas->hTcBuffer, p_output, p_output, *nSamplesRendered, output_Fs ) ) != IVAS_ERR_OK )

#else

                if ( ( error = ivas_rend_crendProcessSubframe( st_ivas->hCrendWrapper, AUDIO_CONFIG_7_1_4, AUDIO_CONFIG_BINAURAL_ROOM, st_ivas->hDecoderConfig, NULL, NULL,

                                                               NULL, st_ivas->hTcBuffer, p_output, p_output, *nSamplesRendered, output_Fs ) ) != IVAS_ERR_OK )

#endif

                {

                    return error;

                }
@@ -1031,9 +1036,13 @@ ivas_error ivas_jbm_dec_flush_renderer( 
                    set_f( st_ivas->hIsmRendererData->interpolator, 1.0f, hTcBuffer->n_samples_granularity );



                    ivas_ism_render_sf( st_ivas, p_output, hTcBuffer->n_samples_granularity );



#ifdef FIX_196_REFACTOR_RENDERER_OUTPUT_CONFIG

                    if ( ( error = ivas_rend_crendProcessSubframe( st_ivas->hCrendWrapper, AUDIO_CONFIG_7_1_4, AUDIO_CONFIG_BINAURAL_ROOM_IR, st_ivas->hDecoderConfig, NULL, NULL,

                                                                   NULL, st_ivas->hTcBuffer, p_output, p_output, hTcBuffer->n_samples_granularity, st_ivas->hDecoderConfig->output_Fs ) ) != IVAS_ERR_OK )

#else

                    if ( ( error = ivas_rend_crendProcessSubframe( st_ivas->hCrendWrapper, AUDIO_CONFIG_7_1_4, AUDIO_CONFIG_BINAURAL_ROOM, st_ivas->hDecoderConfig, NULL, NULL,

                                                                   NULL, st_ivas->hTcBuffer, p_output, p_output, hTcBuffer->n_samples_granularity, st_ivas->hDecoderConfig->output_Fs ) ) != IVAS_ERR_OK )

#endif

                    {

                        return error;

                    }