Commit 0c5ecd6e authored by vaclav's avatar vaclav
Browse files

- Merge remote-tracking branch 'remotes/origin/ivas-float-update' into 1923-ref-PortFlpMr1928

parents 65ebc1f2 626e18b7

lib_com/ivas_rom_com.c

+7 −0
Original line number Diff line number Diff line
@@ -2473,6 +2473,13 @@ const uint16_t ivas_param_mc_sym_freq_ild_delta_combined_48_16bits[2 * PARAM_MC_ 
 * MASA ROM tables

 *----------------------------------------------------------------------------------*/













#ifdef FIX_1121_MASA_DESCRIPTOR













const uint8_t ivasmasaFormatDescriptor[8] = 













{ 













    0x49, 0x56, 0x41, 0x53, 0x4D, 0x41, 0x53, 0x41 /* "IVASMASA" */













};

























#endif















const float diffuseness_reconstructions_hr[HR_MASA_ER_LEVELS] =















{















     0.00f,

































lib_com/ivas_rom_com.h



+4
−0




























Original line number
Diff line number
Diff line








@@ -264,6 +264,10 @@ extern const uint16_t ivas_param_mc_sym_freq_icc_delta_combined_48_16bits[2 * PA













 * MASA ROM tables















 *----------------------------------------------------------------------------------*/





























#ifdef FIX_1121_MASA_DESCRIPTOR













extern const uint8_t ivasmasaFormatDescriptor[8]; /* "IVASMASA" */



























#endif















extern const int16_t bits_direction_masa[DIRAC_DIFFUSE_LEVELS];















extern const int16_t no_theta_masa[NO_SPHERICAL_GRIDS - 2];















extern const int16_t no_phi_masa[NO_SPHERICAL_GRIDS][MAX_NO_THETA];

































lib_com/options.h



+3
−0




























Original line number
Diff line number
Diff line








@@ -187,6 +187,8 @@













#define NONBE_FIX_1052_SBA_EXT_FIX                      /* VA: SBA external output support fix - do not overwrite "output_config" parameter */















#define FIX_1113_CLDFB_REND_IN_ISAR                     /* issue 1113: fix the use of CLDFB renderer in split-rendering at the external renderer */















#define NONBE_FIX_1110_STEREO_DTX_BRATE_SWITCHING       /* VA: issue 1110: fix encoder crash in the stereo DTX bitrate switching condition */













#define FIX_1099_JBM_MD_HANDLE_ALLOC                    /* VA: issue 1099: Limit the allocation of `hJbmMetadata` handle to MASA and OMASA only */













#define FIX_1121_MASA_DESCRIPTOR                        /* VA: issue 1121: Define 'ivasmasaFormatDescriptor' at one common place */















#define NONBE_1894_OSBA_SCALING                         /* FhG: port OSBA scaling MRs (298,355,360) jointly */















#define NONBE_FIX_1141_OSBA_ROOM_RENDERING              /* FhG: Fix for issue 1141: render objects in OSBA decoder with room effect  */















#define NONBE_1360_LFE_DELAY                            /* Dlb: LFE delay alignment when rendering in CLDFB domain*/









@@ -194,6 +196,7 @@













#define NONBE_SVD_OPTIMIZATION















#define FIX_1158_FASTCONV_REVERB_HRTF                   /* Philips: issue 1158: Rendering with FastConv to BINAURAL_ROOM_REVERB uses BRIR convolution instead of HRTF */















#define NONBE_FIX_1176_OSBA_REVERB_JBM_ASAN_ERROR       /* Ericsson: Issue 1176, fix in TDREND_firfilt for subframes shorter than the filter length */













#define NONBE_1131_ACELP_OOB                            /* VA: issue 1131: fix division-by-zero in acelp gain decoding caused by wrong length of buffer update when switching from HQ core to ACELP core */















#define FIX_1249_REMOVE_OBSOLETE_ALLRAD_MATRIX          /* VA: issue 1249: remove obsolete code around ALLRAD decoder matrix */































/* #################### End BASOP porting switches ############################ */

































lib_dec/acelp_core_dec.c



+4
−0




























Original line number
Diff line number
Diff line








@@ -712,7 +712,11 @@ ivas_error acelp_core_dec(













                old_exc_s = st->old_exc + L_EXC_MEM_DEC - st->L_frame;















                tmpF = *old_exc_s;















                st->mem_deemph = old_exc_s[st->L_frame - 1];













#ifdef NONBE_1131_ACELP_OOB













                preemph( old_exc_s, st->preemph_fac, st->L_frame, &tmpF );













#else















                preemph( old_exc_s, st->preemph_fac, L_FRAME16k, &tmpF );













#endif















                mvr2r( old_exc_s + st->L_frame - M, st->mem_syn2, M );















                residu( Aq, M, old_exc_s, old_exc + L_EXC_MEM_DEC - st->L_frame, st->L_frame );















            }

































lib_dec/ivas_init_dec.c



+4
−1




























Original line number
Diff line number
Diff line








@@ -2241,8 +2241,11 @@ ivas_error ivas_init_decoder(













        }















    }











































#ifdef FIX_1099_JBM_MD_HANDLE_ALLOC













    if ( ( st_ivas->ivas_format == MASA_FORMAT || st_ivas->ivas_format == MASA_ISM_FORMAT ) && st_ivas->hDecoderConfig->Opt_tsm )













#else















    if ( st_ivas->hJbmMetadata == NULL && st_ivas->hDecoderConfig->Opt_tsm )













#endif















    {















        if ( st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_EXTERNAL )















        {