Commit 1bd293bf authored by vaclav's avatar vaclav
Browse files

Merge branch '1368_basop_PortFlpMR1325' into 'main-pc' 

Port float MR1325 to BASOP

See merge request !1252
parents 4b4f6041 2ac1c6fc

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -97,6 +97,7 @@ 
#define NONBE_FIX_935_EARLY_REFLECTIONS_WRONG_ORDER     /* Qualcomm: issue 953: fix order or ER channels in LC mode*/

#define FIX_955_FASTCONV_REND_IN_ISM                    /* VA: put FastConv rendering call under DEBUGGING */

#define NONBE_FIX_967_ISM_MONO_DMX                      /* FhG: issue 967: accumulating energies in ISM mono DMX */

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



#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*/

lib_dec/ivas_jbm_dec_fx.c

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

        ELSE IF( EQ_32( st_ivas->ivas_format, MASA_FORMAT ) )

        {

#ifndef FIX_959_MASA_LINEAR_REND

            IF( EQ_32( st_ivas->renderer_type, RENDERER_SBA_LINEAR_DEC ) )

            {

                *nSamplesRendered = s_min( st_ivas->hTcBuffer->n_samples_available, nSamplesAskedLocal );
@@ -2118,6 +2119,9 @@ ivas_error ivas_jbm_dec_render_fx( 
                }

            }

            ELSE IF( EQ_32( st_ivas->renderer_type, RENDERER_DIRAC ) )

#else

            IF( EQ_32( st_ivas->renderer_type, RENDERER_DIRAC ) )

#endif

            {

                ivas_dirac_dec_render_fx( st_ivas, nchan_remapped, nSamplesAskedLocal, nSamplesRendered, nSamplesAvailableNext, p_output_fx );

            }

lib_dec/ivas_output_config_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -445,7 +445,11 @@ void ivas_renderer_select( 
                *internal_config = IVAS_AUDIO_CONFIG_HOA3;

                move16();

            }

#ifdef FIX_959_MASA_LINEAR_REND

            *renderer_type = RENDERER_SBA_LINEAR_DEC;

#else

            st_ivas->renderer_type = RENDERER_SBA_LINEAR_DEC;

#endif

            move16();

        }

        ELSE IF( ( EQ_32( ivas_format, MASA_FORMAT ) && EQ_32( output_config, IVAS_AUDIO_CONFIG_MONO ) && EQ_16( st_ivas->nchan_transport, 1 ) ) ||