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

- Merge remote-tracking branch 'remotes/origin/main' into 1923-basop-PortFlpMr1928

parents b4f724f8 654b594c

lib_com/ivas_rom_com.c

+8 −0
Original line number Diff line number Diff line
@@ -2328,6 +2328,14 @@ const UWord16 ivas_param_mc_sym_freq_ild_delta_combined_48_16bits[2 * PARAM_MC_S 
 * MASA ROM tables

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





#ifdef FIX_1121_MASA_DESCRIPTOR

const UWord8 ivasmasaFormatDescriptor[8] = 

{ 

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

};



#endif

const Word64 diffuseness_reconstructions_hr_fx[HR_MASA_ER_LEVELS] = { /* Q62 */

    0,

    65865144550293504,

lib_com/ivas_rom_com.h

+4 −0
Original line number Diff line number Diff line
@@ -225,6 +225,10 @@ extern const UWord16 ivas_param_mc_sym_freq_icc_delta_combined_48_16bits[2 * PAR 
 * MASA ROM tables

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



#ifdef FIX_1121_MASA_DESCRIPTOR

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



#endif

extern const Word16 bits_direction_masa[DIRAC_DIFFUSE_LEVELS];

extern const Word16 no_theta_masa[NO_SPHERICAL_GRIDS - 2];

extern const Word16 no_phi_masa[NO_SPHERICAL_GRIDS][MAX_NO_THETA];

lib_com/options.h

+6 −3
Original line number Diff line number Diff line
@@ -117,12 +117,15 @@ 
#define NONBE_FIX_1174_MCMASA_LBR_LOOP_ERROR            /* Nokia: Fix issue 1174 by removing the unnecessary inner loop causing problems. */

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

#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: do not scale OSBA inputs by 0.5 any more */

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

#define NONBE_1229_FIX_ISM1_DPID                        /* Eri: issue 1229: fix bug causing ISM 1 to use default -dpid instead of the specified one */

#define NONBE_SVD_OPTIMIZATION 

#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_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -992,7 +992,11 @@ ivas_error acelp_core_dec_fx( 
                tmpF_fx = *old_exc_s_fx;

                st->mem_deemph_fx = shl_sat( old_exc_s_fx[st->L_frame - 1], st->Q_syn ); /* Q0 -> Q_syn */

                move16();

#ifdef NONBE_1131_ACELP_OOB

                PREEMPH_FX( old_exc_s_fx, st->preemph_fac, st->L_frame, &tmpF_fx );

#else

                PREEMPH_FX( old_exc_s_fx, st->preemph_fac, L_FRAME16k, &tmpF_fx );

#endif

                Copy( old_exc_s_fx + sub( st->L_frame, M ), st->mem_syn2_fx, M );

                Scale_sig( st->mem_syn2_fx, M, st->Q_syn ); /* Q0 -> Q_syn */

                Residu3_fx( Aq_fx, old_exc_s_fx, old_exc_fx + sub( L_EXC_MEM_DEC, st->L_frame ), st->L_frame, 0 );

lib_dec/ivas_init_dec_fx.c

+6 −1
Original line number Diff line number Diff line
@@ -2700,7 +2700,6 @@ ivas_error ivas_init_decoder_fx( 
     *-----------------------------------------------------------------*/



    IF( st_ivas->hTcBuffer == NULL )



    {

        /* no module has yet open the TC buffer, open a default one */

        n_channels_transport_jbm = ivas_jbm_dec_get_num_tc_channels_fx( st_ivas );
@@ -2719,8 +2718,14 @@ ivas_error ivas_init_decoder_fx( 
            return error;

        }

    }



    test();

#ifdef FIX_1099_JBM_MD_HANDLE_ALLOC

    test();

    IF( ( EQ_32( st_ivas->ivas_format, MASA_FORMAT ) || EQ_32( 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( EQ_32( st_ivas->hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_EXTERNAL ) )

        {