Commit 394806a5 authored by Marek Szczerba's avatar Marek Szczerba
Browse files

Fix for intermediate rendering format in case of binaural room reverb output

parent 48198a07

lib_rend/ivas_crend.c

+0 −2
Original line number Diff line number Diff line
@@ -1906,7 +1906,6 @@ 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 )
@@ -1914,7 +1913,6 @@ ivas_error ivas_rend_crendProcessSubframe( 
                    return error;

                }

            }

#endif



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

            {

lib_rend/lib_rend.c

+5 −4
Original line number Diff line number Diff line
@@ -2530,6 +2530,9 @@ static ivas_error updateSbaPanGains( 
                    break;

                }

                case IVAS_AUDIO_CONFIG_BINAURAL:

#ifdef FIX_1129_EXT_REND_OUTPUT_HIGH

                case IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB:

#endif

                    if ( hRendCfg->split_rend_config.rendererSelection == ISAR_SPLIT_REND_RENDERER_SELECTION_FASTCONV )

                    {

                        if ( ( error = ivas_rend_openCldfbRend( &inputSba->cldfbRendWrapper, inConfig, outConfig, &rendCtx.pSplitRendWrapper->multiBinPoseData, *rendCtx.pOutSampleRate ) ) != IVAS_ERR_OK )
@@ -2546,17 +2549,15 @@ static ivas_error updateSbaPanGains( 
                    }

                    break;

                case IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR:

#ifndef FIX_1129_EXT_REND_OUTPUT_HIGH

                case IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB:

#endif

                    if ( ( error = initSbaPanGainsForMcOut( inputSba, IVAS_AUDIO_CONFIG_7_1_4, NULL ) ) != IVAS_ERR_OK )

                    {

                        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;

                    }