Commit 0a474137 authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

[cleanup] accept NONBE_FIX_952_MC_PARAMUPMIX_5MS

parent 6bc30f24

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -94,7 +94,6 @@ 
#endif

#define NONBE_FIX_1058_DECODER_ERROR_WITH_REVERB_ROOM   /* FhG: issue 1058: do not initialize EFAP when IntSetup is HOA3 */

#define FIX_963_USAN_ERROR                              /* Eri: Issue 963: USAN error in Stereo CNG, division by zero */

#define NONBE_FIX_952_MC_PARAMUPMIX_5MS                 /* Dlb : issue 952 : Differences between 5ms and 20ms rendering for ParamUpmix*/

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

lib_dec/ivas_mc_paramupmix_dec_fx.c

+0 −20
Original line number Diff line number Diff line
@@ -119,13 +119,11 @@ void ivas_mc_paramupmix_dec_read_BS( 
            }

        }



#ifdef NONBE_FIX_952_MC_PARAMUPMIX_5MS

        FOR( i = 0; i < MC_PARAMUPMIX_COMBINATIONS; i++ )

        {

            Copy32( hMCParamUpmix->alpha_prev_fx[i], hMCParamUpmix->alpha_sf_fx[i], IVAS_MAX_NUM_BANDS );

            Copy32( hMCParamUpmix->beta_prev_fx[i], hMCParamUpmix->beta_sf_fx[i], IVAS_MAX_NUM_BANDS );

        }

#endif



        hMCParamUpmix->first_frame = 1;

        move16();
@@ -155,7 +153,6 @@ void ivas_mc_paramupmix_dec_read_BS( 
        move32();





#ifdef NONBE_FIX_952_MC_PARAMUPMIX_5MS

        IF( EQ_16( hMCParamUpmix->first_frame, 0 ) )

        {

            FOR( i = 0; i < MC_PARAMUPMIX_COMBINATIONS; i++ )
@@ -164,7 +161,6 @@ void ivas_mc_paramupmix_dec_read_BS( 
                Copy32( hMCParamUpmix->betas_fx[i], hMCParamUpmix->beta_prev_fx[i], IVAS_MAX_NUM_BANDS );

            }

        }

#endif



        FOR( i = 0; i < MC_PARAMUPMIX_COMBINATIONS; i++ )

        {
@@ -189,13 +185,11 @@ void ivas_mc_paramupmix_dec_read_BS( 
            move16();

        }



#ifdef NONBE_FIX_952_MC_PARAMUPMIX_5MS

        FOR( i = 0; i < MC_PARAMUPMIX_COMBINATIONS; i++ )

        {

            Copy32( hMCParamUpmix->alpha_prev_fx[i], hMCParamUpmix->alpha_sf_fx[i], IVAS_MAX_NUM_BANDS );

            Copy32( hMCParamUpmix->beta_prev_fx[i], hMCParamUpmix->beta_sf_fx[i], IVAS_MAX_NUM_BANDS );

        }

#endif

    }



    pop_wmops();
@@ -286,13 +280,6 @@ void ivas_mc_paramupmix_dec_render( 
    }

    {



#ifndef NONBE_FIX_952_MC_PARAMUPMIX_5MS

        FOR( ch = 0; ch < MC_PARAMUPMIX_COMBINATIONS; ch++ )

        {

            Copy32( hMCParamUpmix->alpha_prev_fx[ch], hMCParamUpmix->alpha_sf_fx[ch], IVAS_MAX_NUM_BANDS );

            Copy32( hMCParamUpmix->beta_prev_fx[ch], hMCParamUpmix->beta_sf_fx[ch], IVAS_MAX_NUM_BANDS );

        }

#endif



        FOR( subframe_idx = first_sf; subframe_idx < last_sf; subframe_idx++ )

        {
@@ -310,13 +297,6 @@ void ivas_mc_paramupmix_dec_render( 
            ivas_combined_orientation_update_index( st_ivas->hCombinedOrientationData, n_samples_sf );

        }



#ifndef NONBE_FIX_952_MC_PARAMUPMIX_5MS

        FOR( ch = 0; ch < MC_PARAMUPMIX_COMBINATIONS; ch++ )

        {

            Copy32( hMCParamUpmix->alphas_fx[ch], hMCParamUpmix->alpha_prev_fx[ch], IVAS_MAX_NUM_BANDS );

            Copy32( hMCParamUpmix->betas_fx[ch], hMCParamUpmix->beta_prev_fx[ch], IVAS_MAX_NUM_BANDS );

        }

#endif

    }



    *nSamplesAvailable = imult1616( sub( st_ivas->hTcBuffer->num_slots, st_ivas->hTcBuffer->slots_rendered ), (Word16) slot_size );