Commit 58d95f91 authored by emerit's avatar emerit
Browse files

Merge branch 'main' into crend_refactoring_leftovers_cleanup

parents 9f7e50ca 1d5adce5

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -240,6 +240,7 @@ 
#define ENHANCED_STEREO_DMX                             /* Orange : Contribution 48 - Enhanced stereo downmix. */



#define BINAURAL_AUDIO_CMDLINE

#define FIX_570_TCX_LPC_WRITE                           /* FhG: fix issue 570: LPC bitstream writer in TCX */



/* ################## End DEVELOPMENT switches ######################### */

/* clang-format on */

lib_enc/ivas_tcx_core_enc.c

+4 −0
Original line number Diff line number Diff line
@@ -392,10 +392,14 @@ void stereo_tcx_core_enc( 
     * Write LPC parameters

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



#ifndef FIX_570_TCX_LPC_WRITE

    n = st->coder_type; /* IVAS_fmToDo: hack to keep bit-exactness -> TBV */

    st->coder_type = INACTIVE;

#endif

    writeLPCparam( st, hBstr, param_lpc, bits_param_lpc, no_param_lpc, &total_nbbits );

#ifndef FIX_570_TCX_LPC_WRITE

    st->coder_type = n;

#endif



    assert( total_nbbits == ( nbits_lpc[0] + nbits_lpc[1] ) );

#ifdef DEBUG_MODE_TCX

tests/test_param_file.py

+1 −5
Original line number Diff line number Diff line
@@ -266,11 +266,7 @@ def test_param_file_tests( 


    # the output file is not the real output filename

    # -> construct output filename

    if output_config != "":

        output_file = f"{testv_base}_{tag_str}.dec.{output_config_name}.pcm"

    else:

        # EVS decoder command lines do not have an output_config: use "MONO" in the output filename

        output_file = f"{testv_base}_{tag_str}.dec.MONO.pcm"

    output_file = f"{testv_base}_{tag_str}.dec.wav"



    decode(

        dut_decoder_frontend,