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

[cleanup] accept FIX_959_MASA_LINEAR_REND

parent 15a67f9d

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -97,7 +97,6 @@ 
#define NONBE_FIX_952_MC_PARAMUPMIX_5MS                 /* Dlb : issue 952 : Differences between 5ms and 20ms rendering for ParamUpmix*/

#define NONBE_FIX_935_EARLY_REFLECTIONS_WRONG_ORDER     /* Qualcomm: issue 953: fix order or ER channels in LC mode*/

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

#define NONBE_FIX_935_SBA_REVERB                              /* FhG: issue 935: fix MSAN error for SBA related to BINAURAL_ROOM_REVERB */

lib_dec/ivas_jbm_dec_fx.c

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

                move16();

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

                {

                    Copy32( st_ivas->hTcBuffer->tc_fx[n] + st_ivas->hTcBuffer->n_samples_rendered, p_output_fx[n], *nSamplesRendered );

                }

                IF( NE_32( ( error = ivas_sba_linear_renderer_fx( p_output_fx, *nSamplesRendered, nchan_remapped, 0, output_config, st_ivas->hOutSetup ) ), IVAS_ERR_OK ) )

                {

                    return error;

                }

            }

            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

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