Commit 1a8f0d14 authored by emerit's avatar emerit
Browse files

merge with main, remove unnecessary rom c files, fix binaural_interface cmakelist

parent ad8afe6f

.gitlab-ci.yml

+2 −2
Original line number Diff line number Diff line
@@ -932,8 +932,8 @@ coverage-test-on-main-scheduled: 
  - mv -f wmops/log_*_all.txt wmops/*.js ${public_dir}/

  # move logfiles for links

  - mkdir $public_dir/logs

  # first move logs for "native" sampling rate

  - log_files=$(cat $public_dir/graphs_wmops_flc.js | grep logFile | sed "s/.*\(wmops_newsletter_.*\.csv\).*/\1/g")

  # first move logs

  - log_files=$(cat $public_dir/graphs*.js | grep logFile | sed "s/.*\(wmops_newsletter_.*\.csv\).*/\1/g")

  - echo $log_files

  - ls wmops/logs

  - for f in $log_files; do [ -f wmops/logs/$f ] && mv wmops/logs/$f $public_dir/logs/$f; done

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -156,6 +156,7 @@ 
#define FIX_293_EXT_RENDERER_CLI                        /* FhG: Fix bugs in external renderer CLI */

#define FIX_268                                         /* Issue 268: Add low cost dry-run of memory analysis */

#define HRTF_BINARY_FILE                                /* HRTF filters' binary file used for binaural rendering. */

#define LOW_RATE_TRANS_FIX                              /* Eri: Fix for critical item during transitions */



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

/* clang-format on */

lib_enc/ivas_cpe_enc.c

+11 −0
Original line number Diff line number Diff line
@@ -656,6 +656,17 @@ ivas_error ivas_cpe_enc( 
        hCPE->hFrontVad[0]->ini_frame = min( hCPE->hFrontVad[0]->ini_frame, MAX_FRAME_COUNTER );

    }



#ifdef LOW_RATE_TRANS_FIX

    /* Store previous attack detection flag */

    for ( n = 0; n < CPE_CHANNELS; n++ )

    {

        if ( sts[n]->mct_chan_mode != MCT_CHAN_MODE_LFE )

        {

            sts[n]->hTranDet->transientDetector.prev_bIsAttackPresent = sts[n]->hTranDet->transientDetector.bIsAttackPresent;

        }

    }

#endif



#ifdef DEBUG_MODE_INFO

    if ( hCPE->element_mode == IVAS_CPE_DFT )

    {

lib_enc/ivas_ism_enc.c

+5 −0
Original line number Diff line number Diff line
@@ -273,6 +273,11 @@ ivas_error ivas_ism_enc( 


        /* update input samples buffer */

        mvr2r( st->input, st->old_input_signal, input_frame );



#ifdef LOW_RATE_TRANS_FIX

        /* Store previous attack detection flag */

        st->hTranDet->transientDetector.prev_bIsAttackPresent = st->hTranDet->transientDetector.bIsAttackPresent;

#endif

    }



    pop_wmops();

lib_enc/stat_enc.h

+4 −2
Original line number Diff line number Diff line
@@ -140,8 +140,10 @@ typedef struct TransientDetector 
    TCheckSubblocksForAttack CheckSubblocksForAttack; /* Function for checking a presence of an attack. */

    float attackRatioThreshold;                       /* Attack ratio threshold. */

    int16_t bIsAttackPresent;                         /* True when an attack was detected. */

#ifdef LOW_RATE_TRANS_FIX

    int16_t prev_bIsAttackPresent; /* True if an attack was detected in the previous frame. */

#endif

    int16_t attackIndex; /* The index of an attack. */



} TransientDetector;



/* Transient detection: Holds all transient detectors and buffers used by them. */