Commit ab3cf5be authored by Manuel Jander's avatar Manuel Jander
Browse files

Merge remote-tracking branch 'origin' into 3gpp_issue_1348_fix

parents 36bbe074 c93084e6

.gitlab-ci.yml

+3 −3
Original line number Diff line number Diff line
@@ -831,7 +831,7 @@ build-codec-linux-make: 
      when: never

  extends:

    - .build-job-linux

  timeout: "10 minutes"

  timeout: "100 minutes"

  script:

    - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/print-common-info.sh

    - *activate-Werror-linux
@@ -848,7 +848,7 @@ build-codec-linux-instrumented-make: 
      when: never

  extends:

    - .build-job-linux

  timeout: "10 minutes"

  timeout: "100 minutes"

  script:

    - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/print-common-info.sh

    - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/update-scripts-repo.sh
@@ -865,7 +865,7 @@ build-codec-linux-debugging-make: 
      when: never

  extends:

    - .build-job-linux

  timeout: "10 minutes"

  timeout: "100 minutes"

  variables:

    BUILD_WITH_DEBUG_MODE_INFO: "true"

  script:

lib_enc/ivas_stereo_dmx_evs_fx.c

+2 −0
Original line number Diff line number Diff line
@@ -1799,6 +1799,7 @@ void stereo_dmx_evs_enc_fx( 
    Word64 W_tmp;

    Word16 W_tmp_q;



    push_wmops( "stereo_dmx_evs_enc" );

    if ( is_binaural )

    {

        /* use of is_binaural flag is to be considered */
@@ -2149,6 +2150,7 @@ void stereo_dmx_evs_enc_fx( 
    }



    Copy_Scale_sig32_16( p_dmx_data, data, n_samples, 5 ); // Q26->Q15

    pop_wmops();



    return;

}

lib_enc/swb_pre_proc_fx.c

+3 −2
Original line number Diff line number Diff line
@@ -1068,8 +1068,9 @@ void swb_pre_proc_ivas_fx( 
                    {

                        Word16 out_start_ind, out_end_ind;

                        stereo_dft_enc_synthesize_fx( hCPE->hStereoDft, new_swb_speech_fx, &out_start_ind, &out_end_ind, st->idchan, input_Fs, 32000, 0, NULL );

                        Copy_Scale_sig32_16( new_swb_speech_fx - STEREO_DFT_OVL_MAX, new_swb_speech - STEREO_DFT_OVL_MAX, L_FRAME48k + STEREO_DFT_OVL_MAX, add( q_reImBuffer, 1 ) ); // Q0

                        Copy( new_swb_speech - Sample_Delay_SWB_BWE32k, hBWE_FD->old_input_fx, Sample_Delay_SWB_BWE32k );                                                            // Q0

                        Copy_Scale_sig32_16( new_swb_speech_fx - STEREO_DFT_OVL_MAX, new_swb_speech - STEREO_DFT_OVL_MAX, L_FRAME48k + STEREO_DFT_OVL_MAX, add( st->q_inp, add( q_reImBuffer, 1 ) ) ); // st->q_inp



                        Copy( new_swb_speech - Sample_Delay_SWB_BWE32k, hBWE_FD->old_input_fx, Sample_Delay_SWB_BWE32k ); // st->q_inp

                    }

                }

            }