Commit 92370ac2 authored by multrus's avatar multrus
Browse files

[cleanup] accept NONBE_FIX_952_MC_PARAMUPMIX_5MS

parent 6f8d51a4

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -161,7 +161,6 @@ 
/* all switches in this category should start with "NONBE_" */



#define NONBE_FIX_922_PRECOMPUTED_HRTF_PROPERTIES             /* Philips: Use pre-computed HRTF average L/R energies and IAC in all renderers */

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

#define NONBE_FIX_977_OSBA_GAIN_MISMATCH                      /* Dlb : issue 977 : Output gain mismatch for different bit rates in OSBA */

lib_dec/ivas_mc_paramupmix_dec.c

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

        }



#ifdef NONBE_FIX_952_MC_PARAMUPMIX_5MS

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

        {

            mvr2r( hMCParamUpmix->alpha_prev[i], hMCParamUpmix->alpha_sf[i], IVAS_MAX_NUM_BANDS );

            mvr2r( hMCParamUpmix->beta_prev[i], hMCParamUpmix->beta_sf[i], IVAS_MAX_NUM_BANDS );

        }

#endif



        hMCParamUpmix->first_frame = 1;

    }
@@ -144,7 +142,6 @@ void ivas_mc_paramupmix_dec_read_BS( 
        st0->bits_frame = min( MAX_BITS_METADATA, last_bit_pos + 1 );

        st0->total_brate = st_ivas->hDecoderConfig->ivas_total_brate; /* to avoid BER detect */



#ifdef NONBE_FIX_952_MC_PARAMUPMIX_5MS

        if ( hMCParamUpmix->first_frame == 0 )

        {

            for ( i = 0; i < MC_PARAMUPMIX_COMBINATIONS; i++ )
@@ -153,7 +150,6 @@ void ivas_mc_paramupmix_dec_read_BS( 
                mvr2r( hMCParamUpmix->betas[i], hMCParamUpmix->beta_prev[i], IVAS_MAX_NUM_BANDS );

            }

        }

#endif



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

        {
@@ -175,13 +171,11 @@ void ivas_mc_paramupmix_dec_read_BS( 
            hMCParamUpmix->first_frame = 0;

        }



#ifdef NONBE_FIX_952_MC_PARAMUPMIX_5MS

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

        {

            mvr2r( hMCParamUpmix->alpha_prev[i], hMCParamUpmix->alpha_sf[i], IVAS_MAX_NUM_BANDS );

            mvr2r( hMCParamUpmix->beta_prev[i], hMCParamUpmix->beta_sf[i], IVAS_MAX_NUM_BANDS );

        }

#endif

    }



    pop_wmops();
@@ -273,13 +267,6 @@ void ivas_mc_paramupmix_dec_render( 
    assert( slots_to_render == 0 );

#endif

    {

#ifndef NONBE_FIX_952_MC_PARAMUPMIX_5MS

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

        {

            mvr2r( hMCParamUpmix->alpha_prev[ch], hMCParamUpmix->alpha_sf[ch], IVAS_MAX_NUM_BANDS );

            mvr2r( hMCParamUpmix->beta_prev[ch], hMCParamUpmix->beta_sf[ch], IVAS_MAX_NUM_BANDS );

        }

#endif



#ifdef SPLIT_REND_WITH_HEAD_ROT

        slot_index_start = 0;
@@ -304,13 +291,6 @@ void ivas_mc_paramupmix_dec_render( 
            /* update combined orientation access index */

            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++ )

        {

            mvr2r( hMCParamUpmix->alphas[ch], hMCParamUpmix->alpha_prev[ch], IVAS_MAX_NUM_BANDS );

            mvr2r( hMCParamUpmix->betas[ch], hMCParamUpmix->beta_prev[ch], IVAS_MAX_NUM_BANDS );

        }

#endif

    }



    *nSamplesAvailable = ( st_ivas->hTcBuffer->num_slots - st_ivas->hTcBuffer->slots_rendered ) * slot_size;