Commit 4a36f207 authored by Sandesh Venkatesh's avatar Sandesh Venkatesh
Browse files

Merge branch '3gpp_issue_1258_fix' into 'main' 

Fix for 3GPP issue 1258: Decoder: Click artifact for Stereo to Mono Decoding

See merge request !1147
parents d91f68de 2cea86be

.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line
@@ -491,7 +491,7 @@ stages: 


    ### compare the two csv files for regressions

    - regressions_found=0

    - python3 scripts/basop_check_for_changes_in_testcases.py --xml_report $XML_REPORT_BRANCH $CSV_MAIN $CSV_BRANCH || regressions_found=$?

    - python3 scripts/basop_check_for_changes_in_testcases.py --xml_report $XML_REPORT_BRANCH $CSV_BRANCH $CSV_MAIN || regressions_found=$?



    - if [ $exit_code -eq 1 ]; then echo "Differences encountered"; exit_code=$EXIT_CODE_NON_BE; fi

    - if [ $zero_errors_branch != 1 ]; then echo "Run errors encountered!"; exit_code=$EXIT_CODE_NON_BE; fi

lib_dec/ivas_core_dec.c

+10 −0
Original line number Diff line number Diff line
@@ -782,6 +782,7 @@ ivas_error ivas_core_dec_fx( 
        /* for inactive frames with mono output, copy and (if necessary) downmix buffers */

        ELSE IF( EQ_16( hCPE->nchan_out, 1 ) )

        {

            Word16 shift1, shift2;

            sts[0] = hCPE->hCoreCoder[0];

            sts[1] = hCPE->hCoreCoder[1];
@@ -800,6 +801,15 @@ ivas_error ivas_core_dec_fx( 
                move16();

                sts[1]->hHQ_core->Q_old_wtda = sub( 15, sts[1]->hHQ_core->exp_old_out );

                move16();



                shift1 = norm_arr( sts[0]->hHQ_core->old_out_fx, L_FRAME48k );

                shift2 = norm_arr( sts[1]->hHQ_core->old_out_fx, L_FRAME48k );

                scale_sig( sts[0]->hHQ_core->old_out_fx, L_FRAME48k, shift1 );

                scale_sig( sts[1]->hHQ_core->old_out_fx, L_FRAME48k, shift2 );

                sts[0]->hHQ_core->Q_old_wtda = add( sts[0]->hHQ_core->Q_old_wtda, shift1 );

                sts[1]->hHQ_core->Q_old_wtda = add( sts[1]->hHQ_core->Q_old_wtda, shift2 );

                move16();

                move16();

            }

        }