Commit 79666531 authored by malenov's avatar malenov
Browse files

add #define to options.h

parent 7e6cf85a

.gitignore

+75 −0
Original line number Diff line number Diff line
@@ -88,3 +88,78 @@ coan_out_* 
/scripts/mem_analysis_enc_STEREO_sw.csv

/scripts/mem_analysis_enc_STEREO_16k4_DTX.csv

*.pwv

/dcr_ism1

/bwe_clicks_ism1

/BWD_issue

/.ipynb_checkpoints

/scripts/.ipynb_checkpoints

/scripts/wmops_analysis

/scripts/wmops_analysis_new

/tcx_hq_problem_ism1

/scripts/dly_error_profiles/dly_profile_19_.dat

/build.txt

/bit.64k

/bit.32k

/bit

/binaural_loudness.ipynb

/tmp.txt

/syn.wav

/syn.ref

/syn.64k.0.csv

/syn.64k

/syn.32k

/stvST32c_-stereo_32000_32.bit

/split_renderer_config_768_3dof_cldfbpc.txt

/split_out_sba_lcld_20ms_out.wav

/split_out_sba_lcld_20ms.pkt

/split_out_mc_lc3plus_20ms_out.wav

/split_out_mc_lc3plus_20ms.pkt

/run_ivas_codec.sh

/report.html

/report-junit.xm

/out.wav

/ltv48_1ISM.cut14.wav.0.csv

/ltv48_1ISM.cut14.pcm

/ltv48_1ISM.cut14.dec.pcm.0.csv

/ltv48_1ISM.cut14.64k.dec.pcm.0.csv

/ltv48_1ISM.cut14.64k.dec.pcm

/ltv48_1ISM.cut14.32k.dec.pcm

/IvasBuilder.txt

/ivas.192

/ism_loudness_stv48_48kHz.md

/ism_loudness_stv48_32kHz.md

/ism_loudness_sel48_48kHz.md

/ism_loudness_old.xlsx

/ism_loudness_ltv48_ISM4.md

/ism_loudness_ltv48_ISM3.md

/ism_loudness_ltv48_ISM2.md

/ism_loudness_ltv48_ISM1.md

/ism_loudness_ltv48_48kHz.md

/ism_loudness.xlsx

/ism_loudness.py

/HOA2_to_BINAURAL_ROOM_REVERBNone_rend_config_combined_20msNone_0-1000_2-500_1-500.wav

/git_blame_string.sh

/get_license_table.py

/enc_out_mc.pkt

/enc_out.pkt

/cut_ism.py

/scripts/Vlad_mergeNewsletters.py

/scripts/Vlad_extract_max_num_ind.py

/scripts/tables_obj.txt

/scripts/tables_exe.txt

/scripts/requirements.txt

/scripts/parseNewsletterWmops.py

/scripts/output.xlsx

/scripts/functions_obj.txt

/scripts/functions_exe.txt

/scripts/dep_tree.txt

/scripts/cmplx_evs_in_ivas.xlsx

/scripts/bit

/scripts/binaural_loudness.ipynb

/scripts/config/Vlad_self_test_ltv.prm

/scripts/config/Vlad_self_test.prm

/scripts/config/Vlad_ci_linux_ltv.json

/scripts/config/Vlad_ci_linux.json

/cmake-build

/bit.fix

/syn

CMakeLists.txt

+2 −2
Original line number Diff line number Diff line
@@ -74,14 +74,14 @@ if(UNIX) 
      set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=address")

    elseif("${CLANG}" MATCHES "3" OR "${CLANG}" MATCHES "usan")

      # NOTE: keep in sync with list in Makefile

      set(USAN_CHECKS_ENABLE

      set(USAN_CHECKS_LIST

        undefined # Default checks

        # Extra checks

        float-divide-by-zero

        implicit-conversion

        local-bounds

      )

      list(JOIN USAN_CHECKS_ENABLE "," USAN_CHECKS_ENABLE)

      string(JOIN , USAN_CHECKS_ENABLE ${USAN_CHECKS_LIST})



      set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=${USAN_CHECKS_ENABLE} -fsanitize-recover=${USAN_CHECKS_ENABLE}")

      set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=${USAN_CHECKS_ENABLE} -fsanitize-recover=${USAN_CHECKS_ENABLE}")

lib_com/options.h

+2 −0
Original line number Diff line number Diff line
@@ -172,6 +172,8 @@ 


#define NONBE_FIX_1070_USAN_SEGFAULT_MC_TO_BIN_BTSW_HEADROT   /* fix 1070 USAN: nullptr-with-offset and Segfaults in 7_1_4 to BINAURAL and BINAURAL_ROOM_REVERB decoding with bitrate switching and head rotation*/

#define REVERT_ZERO_FLUSH_TRESH                               /* FhG: issue 1069: revert threshold value introduced with !1518 due to significant complexity increase*/ 

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



/* ##################### End NON-BE switches ########################### */



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

lib_dec/ivas_tcx_core_dec.c

+12 −0
Original line number Diff line number Diff line
@@ -514,6 +514,18 @@ void stereo_tcx_core_dec( 
        }

    }



#ifdef DEBUG_MODE_TCX

    {

        int16_t tmp[L_FRAME48k];



        for ( i = 0; i < st->L_frame; i++ )

        {

            tmp[i] = ( int16_t )( synth[i] + 0.5f );

        }

        dbgwrite( tmp, sizeof( int16_t ), st->L_frame, 1, "./res/stereo_tcx_dec_synth.pcm" );

    }

#endif



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

     * Post-processing

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

lib_enc/ivas_stereo_classifier.c

+19 −0
Original line number Diff line number Diff line
@@ -802,6 +802,14 @@ void xtalk_classifier_td( 
    minimum( hStereoClassif->xtalk_score_buf, XTALK_SCORE_BUF_LEN, &scr_min );

    maximum( hStereoClassif->xtalk_score_buf, XTALK_SCORE_BUF_LEN, &scr_max );



#ifdef DEBUG_MODE_TD

    edge_type = 0;

    edge_detect( hStereoClassif->xtalk_score_buf, XTALK_SCORE_BUF_LEN, -0.2f, 1.0f, &edge, &edge_type );

    edge_0_1 = lin_interp( 1 - edge, 1.0f, 1.0f, 0.6f, 0.0f, 1 );

    dbgwrite( &score, sizeof( float ), 1, 1, "res/score.x" );

    dbgwrite( &edge_0_1, sizeof( float ), 1, 1, "res/edge_0_1.x" );

#endif



    if ( ( ( scr_min < 0.0f && scr_max > 0.2f ) || ( scr_max - scr_min > 0.5f ) ) )

    {

        /* test rising edge (use 0 as edge_type because of newer->older buffer samples ordering) */
@@ -823,6 +831,8 @@ void xtalk_classifier_td( 
        edge_0_1 = 0.0f;

    }







    /* weight raw score based on rising edge detector */

    wedge = lin_interp( edge_0_1, 0.0f, 0.9f, 1.0f, 0.5f, 1 );
@@ -974,6 +984,13 @@ void xtalk_classifier_dft( 
    minimum( hStereoClassif->xtalk_score_buf, XTALK_SCORE_BUF_LEN, &scr_min );

    maximum( hStereoClassif->xtalk_score_buf, XTALK_SCORE_BUF_LEN, &scr_max );



#ifdef DEBUG_MODE_TD

    edge = redge_detect( hStereoClassif->xtalk_score_buf, XTALK_SCORE_BUF_LEN, -0.2f, 1.0f );

    edge_0_1 = lin_interp( 1 - edge, 1.0f, 1.0f, 0.83f, 0.0f, 1 );

    dbgwrite( &score, sizeof( float ), 1, 1, "res/score.x" );

    dbgwrite( &edge_0_1, sizeof( float ), 1, 1, "res/edge_0_1.x" );

#endif



    if ( scr_min < 0.2f && scr_max > 0.0f )

    {

        edge = redge_detect( hStereoClassif->xtalk_score_buf, XTALK_SCORE_BUF_LEN, -0.2f, 1.0f );
@@ -984,6 +1001,8 @@ void xtalk_classifier_dft( 
        edge_0_1 = 0.0f;

    }







    /* weight raw score based on rising edge detector */

    wedge = lin_interp( edge_0_1, 0.0f, 0.95f, 1.0f, 0.3f, 1 );

    hStereoClassif->xtalk_wscore = wedge * hStereoClassif->xtalk_wscore + ( 1 - wedge ) * score;