Commit 8fa7546e authored by bayers's avatar bayers
Browse files

remove double define, fix diffuseness averaging

parent 91429fb8

lib_dec/ivas_dirac_dec.c

+2 −3
Original line number Diff line number Diff line
@@ -3115,13 +3115,11 @@ void ivas_dirac_dec_render_sf( 
#ifdef FIX_393_459_460_SBA_MD

            mvs2s( &hDirAC->azimuth[md_idx][hDirAC->hConfig->enc_param_start_band], &azimuth[hDirAC->hConfig->enc_param_start_band], hDirAC->num_freq_bands - hDirAC->hConfig->enc_param_start_band );

            mvs2s( &hDirAC->elevation[md_idx][hDirAC->hConfig->enc_param_start_band], &elevation[hDirAC->hConfig->enc_param_start_band], hDirAC->num_freq_bands - hDirAC->hConfig->enc_param_start_band );

#ifdef FIX_393_459_460_SBA_MD

            if ( st_ivas->hDecoderConfig->Opt_Headrotation && st_ivas->hHeadTrackData->shd_rot_max_order == 0 )

            {

                num_freq_bands = hDirAC->band_grouping[hDirAC->hConfig->enc_param_start_band];

                rotateAziEle_DirAC( azimuth, elevation, num_freq_bands, hDirAC->num_freq_bands, p_Rmat );

            }

#endif

#endif



            hDirAC->index_buffer_intensity = ( hDirAC->index_buffer_intensity % DIRAC_NO_COL_AVG_DIFF ) + 1; /* averaging_length = 32 */
@@ -3374,7 +3372,8 @@ void ivas_dirac_dec_render_sf( 
#ifdef FIX_393_459_460_SBA_MD

        if ( hDirAC->hConfig->dec_param_estim )

        {

            v_multc_acc( hDirAC->diffuseness_vector[md_idx], 0.25f, diffuseness_vector, hDirAC->num_freq_bands );

            float fac = 1.0f / (float) hDirAC->subframe_nbslots[subframe_idx];

            v_multc_acc( hDirAC->diffuseness_vector[md_idx], fac, diffuseness_vector, hDirAC->num_freq_bands );

        }

#endif