Commit 4d641fa6 authored by Dominik Weckbecker's avatar Dominik Weckbecker 💬
Browse files

open ism-to-mono downmix renderer in OSBA when switching from pre-rendering to... 

open ism-to-mono downmix renderer in OSBA when switching from pre-rendering to discrete object coding
parent 4fbbc08a

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -200,7 +200,7 @@ 
#define NONBE_FIX_738_SBA_BR_SW_ASAN                          /* FhG: issue 738: fixes bug when switching to an MCT bitrate and previous frame was ACELP */

#define NONBE_CR_FIX_735_SBA_HP20_BRATE_SWITCHING             /* VA: Issue 735: Resolve "HP20 filtering bug in SBA/OSBA bitrate switching" */

#define NONBE_FIX_588_UPDATE_FASTCONV_SD                      /* FhG: issue 588: update FastConv SD HRTFs in CLDFB domain with new conversion method */



#define NONBE_FIX_774_OSBA_MONO_DEC_CRASH                     /* FhG: issue 774: decoder crash for OSBA to mono */



/* ##################### End NON-BE switches ########################### */

lib_dec/ivas_sba_dec.c

+21 −0
Original line number Diff line number Diff line
@@ -395,6 +395,27 @@ ivas_error ivas_sba_dec_reconfigure( 
                }

            }



#ifdef NONBE_FIX_774_OSBA_MONO_DEC_CRASH

            if (st_ivas->renderer_type == RENDERER_MONO_DOWNMIX )

            {

                    if ( st_ivas->renderer_type == RENDERER_MONO_DOWNMIX )

                    {

                        if ( ( error = ivas_mono_dmx_renderer_open( st_ivas ) ) != IVAS_ERR_OK )

                        {

                            return error;

                        }

                    }

                    else

                    {

                        if ( st_ivas->hMonoDmxRenderer != NULL )

                        {

                            free( st_ivas->hMonoDmxRenderer );

                            st_ivas->hMonoDmxRenderer = NULL;

                        }

                    }

			}

#endif



            if ( st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV )

            {

                /* Allocate TD renderer for the objects in DISC mode */