Commit f0a85dce authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

[cleanup] accept FIX_959_MASA_LINEAR_REND

parent 9c8fe047

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -200,7 +200,6 @@ 
#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 NONBE_FIX_935_SBA_REVERB                              /* FhG: issue 935: fix MSAN error for SBA related to BINAURAL_ROOM_REVERB */

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

#define NONBE_FIX_973_HODIRAC_BAND_GROUPING                   /* FhG: issue 973: empty parameter band in DirAC */

#define FIX_971_LOG2_IDX_GAIN_0                         /* VA: prevent -Inf due to log2(ratio==0)  */

lib_dec/ivas_jbm_dec.c

+0 −17
Original line number Diff line number Diff line
@@ -1136,24 +1136,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 );

                for ( n = 0; n < nchan_remapped; n++ )

                {

                    mvr2r( st_ivas->hTcBuffer->tc[n] + st_ivas->hTcBuffer->n_samples_rendered, p_output[n], *nSamplesRendered );

                }



                if ( ( error = ivas_sba_linear_renderer( p_output, *nSamplesRendered, nchan_remapped, 0, output_config, st_ivas->hOutSetup ) ) != IVAS_ERR_OK )

                {

                    return error;

                }

            }

            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

+0 −4
Original line number Diff line number Diff line
@@ -372,11 +372,7 @@ 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 ) ) )