Commit 949b5630 authored by sbsarac's avatar sbsarac
Browse files

Switch off reverb and modify crend

parent bedf9637

lib_rend/ivas_crend.c

+2 −0
Original line number Diff line number Diff line
@@ -1906,6 +1906,7 @@ ivas_error ivas_rend_crendProcessSubframe( 
                return error;

            }



#ifndef FIX_1129_EXT_REND_OUTPUT_HIGH

            if ( pCrend->hCrend[0]->hReverb != NULL )

            {

                if ( ( error = ivas_reverb_process( pCrend->hCrend[pos_idx]->hReverb, inConfig, 1, tc_local, p_pcm_tmp, 0 ) ) != IVAS_ERR_OK )
@@ -1913,6 +1914,7 @@ ivas_error ivas_rend_crendProcessSubframe( 
                    return error;

                }

            }

#endif



            for ( ch = 0; ch < nchan_in; ch++ )

            {

lib_rend/lib_rend.c

+12 −0
Original line number Diff line number Diff line
@@ -2552,7 +2552,11 @@ static ivas_error updateSbaPanGains( 
                        return error;

                    }



#ifdef FIX_1129_EXT_REND_OUTPUT_HIGH

                    if ( ( error = ivas_rend_openCrend( &inputSba->crendWrapper, inConfig, outConfig, hRendCfg, hMixconv, hHrtfStatistics, *rendCtx.pOutSampleRate, rendCtx.pSplitRendWrapper->multiBinPoseData.num_poses ) ) != IVAS_ERR_OK )

#else

                    if ( ( error = ivas_rend_openCrend( &inputSba->crendWrapper, IVAS_AUDIO_CONFIG_7_1_4, outConfig, hRendCfg, hMixconv, hHrtfStatistics, *rendCtx.pOutSampleRate, rendCtx.pSplitRendWrapper->multiBinPoseData.num_poses ) ) != IVAS_ERR_OK )

#endif

                    {

                        return error;

                    }
@@ -6755,11 +6759,19 @@ static ivas_error renderInputSba( 
                case IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM:

                    error = renderSbaToSplitBinaural( sbaInput, outConfig, outAudio );

                    break;

#ifdef FIX_1129_EXT_REND_OUTPUT_HIGH

                case IVAS_AUDIO_CONFIG_BINAURAL:

                case IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB:

                    error = renderSbaToBinaural( sbaInput, outConfig, outAudio );

                    break;

                case IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR:

#else

                case IVAS_AUDIO_CONFIG_BINAURAL:

                    error = renderSbaToBinaural( sbaInput, outConfig, outAudio );

                    break;

                case IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR:

                case IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB:

#endif

                    error = renderSbaToBinauralRoom( sbaInput, outConfig, outAudio );

                    break;

                default: