Commit fe2752a5 authored by vaclav's avatar vaclav
Browse files

editorial changes

parent 1c9a6de3

lib_dec/ivas_jbm_dec_fx.c

+12 −11
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ ivas_error ivas_jbm_dec_tc_fx( 
     *----------------------------------------------------------------*/



    test();

#ifndef REMOVE_UNUSED_CODE_IVAS_DECaa

#ifndef REMOVE_UNUSED_CODE_IVAS_DEC

    test();

    IF( st_ivas->bfi != 0 && st_ivas->ini_frame == 0 )

    {
@@ -400,11 +400,11 @@ ivas_error ivas_jbm_dec_tc_fx( 


                s = 0;

                move16();

                FOR( i = 0; i < CPE_CHANNELS; i++ )

                FOR( i = 0; i < 2; i++ )

                {

                    s = s_min( s, L_norm_arr( p_output_fx[i], L_FRAME48k ) - 11 ) /* Guard bits */; // L_frame should be used instead of L_FRAME48k */

                }

                FOR( i = 0; i < CPE_CHANNELS; i++ )

                FOR( i = 0; i < 2; i++ )

                {

                    Scale_sig32( p_output_fx[i], L_FRAME48k, s ); // Q(11+s)

                }
@@ -510,14 +510,14 @@ ivas_error ivas_jbm_dec_tc_fx( 


                ivas_sba_dirac_stereo_dec_fx( st_ivas, p_output_fx, output_frame, st_ivas->ivas_format == MC_FORMAT );



                FOR( i = 0; i < CPE_CHANNELS; i++ )

                FOR( i = 0; i < 2; i++ )

                {

                    Scale_sig32( p_output_fx[i], L_FRAME48k, negate( s ) );

                }



                FOR( ii = 0; ii < CPE_CHANNELS; ii++ )

                {

                    Scale_sig32( hCPE->prev_synth_fx[ii], NS2SA_FX2( st_ivas->hDecoderConfig->output_Fs, IVAS_DEC_DELAY_NS - STEREO_DFT32MS_OVL_NS ), sub( Q11, hCPE->q_prev_synth_fx ) ); // Q11

                    Scale_sig32( &hCPE->prev_synth_fx[ii][0], NS2SA_FX2( st_ivas->hDecoderConfig->output_Fs, IVAS_DEC_DELAY_NS - STEREO_DFT32MS_OVL_NS ), sub( Q11, hCPE->q_prev_synth_fx ) ); // Q11

                }



                scale_sig32( hCPE->input_mem_BPF_fx[0], STEREO_DFT32MS_OVL_16k, sub( Q11, hCPE->hStereoDft->q_dft ) );
@@ -673,6 +673,7 @@ ivas_error ivas_jbm_dec_tc_fx( 
            move16();



            ivas_masa_prerender_fx( st_ivas, p_output_fx, &q_shift, output_frame, nchan_remapped );

            

            FOR( i = 0; i < CPE_CHANNELS; i++ )

            {

                Scale_sig32( p_output_fx[i], output_frame, negate( q_shift ) );
@@ -953,11 +954,11 @@ ivas_error ivas_jbm_dec_tc_fx( 
        hSCE = st_ivas->hSCE[0];

        s = 0;

        move16();

        FOR( i = 0; i < CPE_CHANNELS; i++ )

        FOR( i = 0; i < 2; i++ )

        {

            s = s_min( s, L_norm_arr( p_output_fx[sba_ch_idx + i], L_FRAME48k ) - 11 /* Guard bits */ );

        }

        FOR( i = 0; i < CPE_CHANNELS; i++ )

        FOR( i = 0; i < 2; i++ )

        {

            Scale_sig32( p_output_fx[sba_ch_idx + i], L_FRAME48k, s ); // Q(11+s)

        }
@@ -1016,7 +1017,7 @@ ivas_error ivas_jbm_dec_tc_fx( 


        ivas_sba_dirac_stereo_dec_fx( st_ivas, &p_output_fx[sba_ch_idx], output_frame, 0 );



        FOR( i = 0; i < CPE_CHANNELS; i++ )

        FOR( i = 0; i < 2; i++ )

        {

            Scale_sig32( p_output_fx[sba_ch_idx + i], L_FRAME48k, negate( s ) );

        }
@@ -1430,11 +1431,11 @@ ivas_error ivas_jbm_dec_tc_fx( 
            hSCE = st_ivas->hSCE[0];

            s = 0;

            move16();

            FOR( i = 0; i < CPE_CHANNELS; i++ )

            FOR( i = 0; i < 2; i++ )

            {

                s = s_min( s, L_norm_arr( p_output_fx[i], L_FRAME48k ) - 11 /* Guard bits */ );

            }

            FOR( i = 0; i < CPE_CHANNELS; i++ )

            FOR( i = 0; i < 2; i++ )

            {

                Scale_sig32( p_output_fx[i], L_FRAME48k, s ); // Q(11+s)

            }
@@ -1502,7 +1503,7 @@ ivas_error ivas_jbm_dec_tc_fx( 


            ivas_sba_dirac_stereo_dec_fx( st_ivas, p_output_fx, output_frame, 1 );



            FOR( i = 0; i < CPE_CHANNELS; i++ )

            FOR( i = 0; i < 2; i++ )

            {

                Scale_sig32( p_output_fx[i], L_FRAME48k, negate( s ) );

            }

lib_dec/ivas_sba_dirac_stereo_dec_fx.c

+2 −2
Original line number Diff line number Diff line
@@ -1597,7 +1597,7 @@ void ivas_sba_dirac_stereo_dec_fx( 


    FOR( i = 0; i < CPE_CHANNELS; i++ )

    {

#ifdef REMOVE_UNUSED_CODE_IVAS_DECaa

#ifdef REMOVE_UNUSED_CODE_IVAS_DEC

        Scale_sig32( output[i], output_frame, negate( s ) );

#else

        Scale_sig32( output[i], L_FRAME48k, negate( s ) );
@@ -1619,7 +1619,7 @@ void ivas_sba_dirac_stereo_dec_fx( 
    IF( hCPE->hCoreCoder[0] != NULL )

    {

        Copy_Scale_sig_32_16( hCPE->hCoreCoder[0]->hHQ_core->old_out_LB_fx32, hCPE->hCoreCoder[0]->hHQ_core->old_out_LB_fx, L_FRAME32k, hCPE->hCoreCoder[0]->hHQ_core->Q_old_wtda_LB - q ); // Q_old_wtda_LB

#ifdef REMOVE_UNUSED_CODE_IVAS_DECaa

#ifdef REMOVE_UNUSED_CODE_IVAS_DEC

        Copy_Scale_sig_32_16( hCPE->hCoreCoder[0]->hHQ_core->old_out_fx32, hCPE->hCoreCoder[0]->hHQ_core->old_out_fx, output_frame, hCPE->hCoreCoder[0]->hHQ_core->Q_old_wtda - q ); // Q_old_wtda_LB

#else

        Copy_Scale_sig_32_16( hCPE->hCoreCoder[0]->hHQ_core->old_out_fx32, hCPE->hCoreCoder[0]->hHQ_core->old_out_fx, L_FRAME48k, hCPE->hCoreCoder[0]->hHQ_core->Q_old_wtda - q ); // Q_old_wtda_LB