Commit 55d4a3dc authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_2505_IVAS_DEC_SEGFAULT

parent eb70e5a3

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -114,7 +114,6 @@ 
#define FIX_2500_RENDCONF_REFACTOR                      /* Eri: Basop issue #2500: Renderer configuration range check before conversion to fixed point. Harmonize between BASOP/float */

#define FIX_BASOP_2023_TDREND_DISTATT_PRECISION         /* Eri: Basop issue 2023: Distance attenuation scaling, adding clamping of distance att input and listener position */

#define FIX_BASOP_2023_TDREND_DISTATT_PRECISION_BUGFIX  /* Eri: Bug discovered in cleanup of basop issue 2023 */

#define FIX_2505_IVAS_DEC_SEGFAULT                      /* FhG: BASOP #2505: Add headroom to input of ivas_rend_crendProcessSubframe_fx() for ivas_mdft_fx() calculation */

#define HARMONIZE_DoRTFTn                               /* VA: harmonize functions DoRTFTn_fx() and DoRTFTn_fx_ivas() */

#define FIX_1574_EFAP_CODE_LINT                         /* FhG: float issue 1574: Code quality fixes in ivas_efap.c */

#define FIX_BASOP_2529_MASA_RATIO_SCALINGS              /* Nokia: BASOP issue 2529: Fix MASA ratio scalings and verifications */

lib_dec/ivas_dec_render_fx.c

+0 −10
Original line number Diff line number Diff line
@@ -1077,17 +1077,14 @@ ivas_error ivas_jbm_dec_flush_renderer_fx( 
                }

                ELSE IF( EQ_16( renderer_type_old, RENDERER_BINAURAL_MIXER_CONV_ROOM ) )

                {

#ifdef FIX_2505_IVAS_DEC_SEGFAULT

                    Word16 subframe_len, guard_bits, q_shift_min;



#endif

                    /* Convert to CICPxx; used also for ISM->CICP19->binaural_room rendering */

                    set16_fx( st_ivas->hIsmRendererData->interpolator_fx, 32767, n_samples_granularity ); // 32767=1.0f in Q15



                    ivas_ism_render_sf_fx( st_ivas, renderer_type_old, p_output_fx, n_samples_granularity );



                    st_ivas->hCrendWrapper->p_io_qfactor = &st_ivas->hCrendWrapper->io_qfactor;

#ifdef FIX_2505_IVAS_DEC_SEGFAULT



                    IF( NE_32( ( error = getAudioConfigNumChannels( IVAS_AUDIO_CONFIG_7_1_4, &nchan_in ) ), IVAS_ERR_OK ) )

                    {
@@ -1109,25 +1106,18 @@ ivas_error ivas_jbm_dec_flush_renderer_fx( 
                        scale_sig32( p_output_fx[i], *nSamplesRendered, q_shift_min );

                    }

                    *st_ivas->hCrendWrapper->p_io_qfactor = add( Q11, q_shift_min );

#else

                    *st_ivas->hCrendWrapper->p_io_qfactor = 11;



                    move16();

#endif

                    IF( NE_32( ( error = ivas_rend_crendProcessSubframe_fx( st_ivas->hCrendWrapper, IVAS_AUDIO_CONFIG_7_1_4, IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR, st_ivas->hDecoderConfig, NULL,

                                                                            NULL, NULL, st_ivas->hTcBuffer, p_output_fx, p_output_fx, hTcBuffer->n_samples_granularity, st_ivas->hDecoderConfig->output_Fs, 0 ) ),

                               IVAS_ERR_OK ) )

                    {

                        return error;

                    }

#ifdef FIX_2505_IVAS_DEC_SEGFAULT

                    FOR( Word16 i = 0; i < nchan_in; i++ )

                    {

                        scale_sig32( p_output_fx[i], *nSamplesRendered, negate( q_shift_min ) ); // Q11

                    }

                    *st_ivas->hCrendWrapper->p_io_qfactor = Q11;

                    move16();

#endif

                }

            }

            ELSE

lib_rend/ivas_crend_fx.c

+0 −4
Original line number Diff line number Diff line
@@ -1923,11 +1923,7 @@ static ivas_error ivas_rend_crendConvolver_fx( 
                    }

                }

            }

#ifdef FIX_2505_IVAS_DEC_SEGFAULT

            ivas_mdft_fx( pIn, pFreq_buf_re, pFreq_buf_im, subframe_length, subframe_length ); // Input guard bits are added two functions up the call chain before ivas_rend_crendProcessSubframe_fx() is called

#else

            ivas_mdft_fx( pIn, pFreq_buf_re, pFreq_buf_im, subframe_length, subframe_length );

#endif

            i = add( i, 1 );

        }

    }