Commit 3bb4486a authored by Jan Kiene's avatar Jan Kiene
Browse files

Merge branch 'float-pc' into 1550_ref_igf_usan_fixes

parents 65e5f7ea 6ee395e2

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -187,6 +187,7 @@ 
#define NONBE_FIX_967_ISM_MONO_DMX                            /* FhG: issue 967: accumulating energies in ISM mono DMX */

#define NONBE_FIX_968_ISM_BRIR_WITH_HEADROTATION_5MS_FIX      /* FhG : issue #968: differences between 5ms and 20ms rendering for discrete ISM with BRIR and head rotation*/

#define FIX_969_USAN_IGF_ARITH                          /* FhG: issue 969: fix USAN error in igf_sce_dec; same issue as #962 */

#define FIX_959_MASA_LINEAR_REND                        /* VA: issue 959: remove unused calling of ivas_sba_linear_renderer() in MASA rendering */



/* #################### End BASOP porting switches ############################ */

lib_dec/ivas_jbm_dec.c

+4 −0
Original line number Diff line number Diff line
@@ -1139,6 +1139,7 @@ ivas_error ivas_jbm_dec_render( 
        }

        else if ( st_ivas->ivas_format == MASA_FORMAT )

        {

#ifndef FIX_959_MASA_LINEAR_REND

            if ( st_ivas->renderer_type == RENDERER_SBA_LINEAR_DEC )

            {

                *nSamplesRendered = min( st_ivas->hTcBuffer->n_samples_available, nSamplesAskedLocal );
@@ -1153,6 +1154,9 @@ ivas_error ivas_jbm_dec_render( 
                }

            }

            else if ( st_ivas->renderer_type == RENDERER_DIRAC )

#else

            if ( st_ivas->renderer_type == RENDERER_DIRAC )

#endif

            {

                ivas_dirac_dec_render( st_ivas, nchan_remapped, nSamplesAskedLocal, nSamplesRendered, nSamplesAvailableNext, p_output );

            }

lib_dec/ivas_output_config.c

+4 −0
Original line number Diff line number Diff line
@@ -368,7 +368,11 @@ void ivas_renderer_select( 
            {

                *internal_config = IVAS_AUDIO_CONFIG_HOA3;

            }

#ifdef FIX_959_MASA_LINEAR_REND

            *renderer_type = RENDERER_SBA_LINEAR_DEC;

#else

            st_ivas->renderer_type = RENDERER_SBA_LINEAR_DEC;

#endif

        }

        else if ( ( ivas_format == MASA_FORMAT && output_config == IVAS_AUDIO_CONFIG_MONO && st_ivas->nchan_transport == 1 ) ||

                  ( ivas_format == SBA_FORMAT && ( output_config == IVAS_AUDIO_CONFIG_STEREO || output_config == IVAS_AUDIO_CONFIG_MONO ) ) )