Commit d7db76e9 authored by norvell's avatar norvell
Browse files

Merge with main

parents 0f0a7c54 95504f51

lib_com/disclaimer.c

+2 −0
Original line number Diff line number Diff line
@@ -55,3 +55,5 @@ int16_t print_disclaimer( FILE *fPtr ) 


    return 0;

}



#undef WMC_TOOL_SKIP

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -167,7 +167,7 @@ 
#define FIX_413_SBA_DTX                                 /* Dlb: Fix for issue 413, SBA DTX CNG in 2TC mode*/

#define FIX_417_TD_DECORR_BRATE_SW                      /* VA: Issue 417: fix incorrect use of TD decorrelator in bitrate switching */

#define FIX_427_MAXIMUM_S_INDEX                         /* VA: issue 427: fix return index of function maximum_s() */



#define FIX_431_PARAMMC_PLC_INTERPOLATOR                /* FhG: Issue 431: fix missing interpolator reset for ParamMC PCL */

#define LBR_SBA                                         /* Contribution 47: Master macro for low bitrate SBA (SPAR+DirAC) */

#ifdef LBR_SBA

#define LBR_SBA_BR_SWITCHING                            /* Clean up changes for SBA bitrate switching */

lib_dec/ivas_ism_dtx_dec.c

+1 −0
Original line number Diff line number Diff line
@@ -190,6 +190,7 @@ ivas_error ivas_ism_dtx_dec( 
            st->bit_stream = st_ivas->hSCE[0]->hCoreCoder[0]->bit_stream;

            st->next_bit_pos = 0; /* note: needed in paramISM -> discISM switching */

            st->cng_ism_flag = 1;

            st->L_frame = min( st->L_frame, L_FRAME16k ); /* note: needed for switching from active frame with L_frame=640 to CNG in object with no SID */

#else

            ivas_ism_preprocessing( st_ivas, ch ); // VE: after the acceptance of switches, replace the function call by its content

#endif

lib_dec/ivas_mc_param_dec.c

+3 −0
Original line number Diff line number Diff line
@@ -1328,6 +1328,9 @@ void ivas_param_mc_dec_read_BS( 
        /* for PLC, use the saved ILDs and ICCs from the past and set the transient flag and transient position to zero */

        hMetadataPMC->bAttackPresent = 0;

        hMetadataPMC->attackIndex = 0;

#ifdef FIX_431_PARAMMC_PLC_INTERPOLATOR

        param_mc_compute_interpolator( hMetadataPMC->bAttackPresent, hMetadataPMC->attackIndex, PARAM_MC_MAX_NSLOTS, hParamMC->h_output_synthesis_params.interpolator );

#endif

    }



    pop_wmops();

scripts/prepare_mem_dryrun.py

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ for d in dirs: 
            with open(fileIn, 'r') as f_in:

                lines = f_in.readlines()

            with open(fileIn, 'w') as f_out:

                skip = 0

                for line in lines:

                    if re.search(r'#define\W+WMC_TOOL_SKIP', line):

                        skip = 1