Commit c2721c7a authored by Fabian Bauer's avatar Fabian Bauer
Browse files

Merge branch 'main' of ssh://forge.3gpp.org:29419/sa4/audio/ivas-basop into... 

Merge branch 'main' of ssh://forge.3gpp.org:29419/sa4/audio/ivas-basop into 1439-complexity-overhead-stereo-to-stereo-32kbps-fb-float-vs-basop-nonBE
parents 1daee418 63bb612b

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -84,6 +84,7 @@ 
//#define HARM_SCE_INIT

#define DIV32_OPT_NEWTON                               /* FhG: faster 32 by 32 bit division */ 

#define	MERGE_REQUEST_1378_SPEEDUP_ivas_mc_param_enc_fx_NONBE /* FhG: reduce WMOPS of Cy calculation in ivas_param_mc_param_est_enc_fx() by using 64 Bit addition. Obsoletes IMPROVE_HIGH_COMPLEXITY_PARAM_MC_PRM_EST_NONBE. */

#define FIX_1481_HARDCODE_DIV                          /* FhG: hardcode division results in stereo_dmx_evs_init_encoder_fx() */



#define TEST_HR

lib_com/pvq_com_fx.c

+2 −2
Original line number Diff line number Diff line
@@ -565,7 +565,7 @@ void fine_gain_quant_fx( 
            exp1 = sub( 14, exp1 );



            L_tmp = L_mult0( fg_pred[band], tmp1 );                              /*12+exp1 */

            fg_pred[band] = round_fx( L_shl( L_tmp, sub( 16, exp1 ) ) ); /*12+exp1+16-exp1-16=12 */

            fg_pred[band] = round_fx_sat( L_shl_sat( L_tmp, sub( 16, exp1 ) ) ); /*12+exp1+16-exp1-16=12 */

            move16();

        }

    }

lib_dec/fd_cng_dec_fx.c

+26 −23
Original line number Diff line number Diff line
@@ -1536,8 +1536,8 @@ Word16 ApplyFdCng_ivas_fx( 
                Word16 shift2 = L_norm_arr( cngNoiseLevel + sub( hFdCngCom->stopFFTbin, hFdCngCom->startBand ), sub( FFTCLDFBLEN, sub( hFdCngCom->stopFFTbin, hFdCngCom->startBand ) ) );

                Word16 shift = s_max( sub( hFdCngDec->bandNoiseShape_exp, shift1 ), sub( *cngNoiseLevel_exp, shift2 ) );



                scale_sig32( cngNoiseLevel, sub( hFdCngCom->stopFFTbin, hFdCngCom->startBand ), sub( sub( hFdCngDec->bandNoiseShape_exp, shift1 ), shift ) );

                scale_sig32( cngNoiseLevel + sub( hFdCngCom->stopFFTbin, hFdCngCom->startBand ), sub( FFTCLDFBLEN, sub( hFdCngCom->stopFFTbin, hFdCngCom->startBand ) ), sub( sub( *cngNoiseLevel_exp, shift2 ), shift ) );

                scale_sig32( cngNoiseLevel, sub( hFdCngCom->stopFFTbin, hFdCngCom->startBand ), sub( hFdCngDec->bandNoiseShape_exp, shift ) );

                scale_sig32( cngNoiseLevel + sub( hFdCngCom->stopFFTbin, hFdCngCom->startBand ), sub( FFTCLDFBLEN, sub( hFdCngCom->stopFFTbin, hFdCngCom->startBand ) ), sub( *cngNoiseLevel_exp, shift ) );



                *cngNoiseLevel_exp = shift;

                move16();
@@ -1688,16 +1688,15 @@ Word16 ApplyFdCng_ivas_fx( 
                            move32();

                        }

                    }

                    /* adapt scaling for rest of the buffer */

                    s = sub( *cngNoiseLevel_exp, add( hFdCngDec->bandNoiseShape_exp, s2 ) );



                    FOR( ; j < FFTCLDFBLEN; j++ )

                    {

                        cngNoiseLevel[j] = L_shl( cngNoiseLevel[j], s ); /*Q31 - hFdCngDec->bandNoiseShape_exp + s*/

                        move32();

                    }

                    Word16 shift1 = L_norm_arr( cngNoiseLevel, j );

                    Word16 shift2 = L_norm_arr( &cngNoiseLevel[j], sub( FFTCLDFBLEN, j ) );

                    Word16 shift = s_max( sub( add( hFdCngDec->bandNoiseShape_exp, s2 ), shift1 ), sub( *cngNoiseLevel_exp, shift2 ) );



                    *cngNoiseLevel_exp = add( hFdCngDec->bandNoiseShape_exp, s2 );

                    scale_sig32( cngNoiseLevel, j, sub( add( hFdCngDec->bandNoiseShape_exp, s2 ), shift ) );

                    scale_sig32( &cngNoiseLevel[j], sub( FFTCLDFBLEN, j ), sub( *cngNoiseLevel_exp, shift ) );



                    *cngNoiseLevel_exp = shift;

                    move16();

                }

            }
@@ -1761,18 +1760,15 @@ Word16 ApplyFdCng_ivas_fx( 
                            move32();

                        }

                    }

                    /* adapt scaling for rest of the buffer */

                    s = sub( *cngNoiseLevel_exp, add( hFdCngDec->bandNoiseShape_exp, s2 ) );



                    FOR( ; j < FFTCLDFBLEN; j++ )

                    {

                        /* NOTE: saturation is added here as part of issue 1218 fix. after rescaling the fdcng noise estimation buffers, due to slight precision loss, values may slightly overflow */

                        cngNoiseLevel[j] = L_shl_sat( cngNoiseLevel[j], s ); /*Q31 - hFdCngDec->bandNoiseShape_exp + s*/

                        move32();

                    }

                    Word16 shift1 = L_norm_arr( cngNoiseLevel, j );

                    Word16 shift2 = L_norm_arr( &cngNoiseLevel[j], sub( FFTCLDFBLEN, j ) );

                    Word16 shift = s_max( sub( add( hFdCngDec->bandNoiseShape_exp, s2 ), shift1 ), sub( *cngNoiseLevel_exp, shift2 ) );



                    scale_sig32( cngNoiseLevel, j, sub( add( hFdCngDec->bandNoiseShape_exp, s2 ), shift ) );

                    scale_sig32( &cngNoiseLevel[j], sub( FFTCLDFBLEN, j ), sub( *cngNoiseLevel_exp, shift ) );



                    *cngNoiseLevel_exp = add( hFdCngDec->bandNoiseShape_exp, s2 );

                    *cngNoiseLevel_exp = shift;

                    move16();

                }

            }
@@ -2399,8 +2395,15 @@ void perform_noise_estimation_dec_ivas_fx( 
                ELSE

                {

                    Copy32( msPeriodog, msNoiseEst, npart );

                    scale_sig32( &msNoiseEst[npart], sub( NPART_SHAPING, npart ), sub( hFdCngDec->msNoiseEst_exp, hFdCngDec->msPeriodog_exp ) );

                    hFdCngDec->msNoiseEst_exp = hFdCngDec->msPeriodog_exp;



                    Word16 shift1 = L_norm_arr( msNoiseEst, npart );

                    Word16 shift2 = L_norm_arr( &msNoiseEst[npart], sub( NPART_SHAPING, npart ) );

                    Word16 shift = s_max( sub( hFdCngDec->msPeriodog_exp, shift1 ), sub( hFdCngDec->msNoiseEst_exp, shift2 ) );



                    scale_sig32( msNoiseEst, npart, sub( hFdCngDec->msPeriodog_exp, shift ) );

                    scale_sig32( &msNoiseEst[npart], sub( NPART_SHAPING, npart ), sub( hFdCngDec->msNoiseEst_exp, shift ) );



                    hFdCngDec->msNoiseEst_exp = shift;

                    move16();

                }
@@ -5071,8 +5074,8 @@ void FdCng_decodeSID_ivas_fx( 
    Word16 shift2 = L_norm_arr( hFdCngCom->cngNoiseLevel + sub( hFdCngCom->stopBand, hFdCngCom->startBand ), sub( FFTCLDFBLEN, sub( hFdCngCom->stopBand, hFdCngCom->startBand ) ) );

    Word16 shift = s_max( sub( hFdCngCom->sidNoiseEstExp, shift1 ), sub( hFdCngCom->cngNoiseLevelExp, shift2 ) );



    scale_sig32( hFdCngCom->cngNoiseLevel, sub( hFdCngCom->stopBand, hFdCngCom->startBand ), sub( sub( hFdCngCom->sidNoiseEstExp, shift1 ), shift ) );

    scale_sig32( hFdCngCom->cngNoiseLevel + sub( hFdCngCom->stopBand, hFdCngCom->startBand ), sub( FFTCLDFBLEN, sub( hFdCngCom->stopBand, hFdCngCom->startBand ) ), sub( sub( hFdCngCom->cngNoiseLevelExp, shift2 ), shift ) );

    scale_sig32( hFdCngCom->cngNoiseLevel, sub( hFdCngCom->stopBand, hFdCngCom->startBand ), sub( hFdCngCom->sidNoiseEstExp, shift ) );

    scale_sig32( hFdCngCom->cngNoiseLevel + sub( hFdCngCom->stopBand, hFdCngCom->startBand ), sub( FFTCLDFBLEN, sub( hFdCngCom->stopBand, hFdCngCom->startBand ) ), sub( hFdCngCom->cngNoiseLevelExp, shift ) );



    hFdCngCom->cngNoiseLevelExp = shift;

    move16();

lib_dec/ivas_jbm_dec_fx.c

+29 −2
Original line number Diff line number Diff line
@@ -2550,7 +2550,7 @@ ivas_error ivas_jbm_dec_flush_renderer_fx( 
    DECODER_TC_BUFFER_HANDLE hTcBuffer;

    Word32 output_fx[MAX_OUTPUT_CHANNELS + MAX_NUM_OBJECTS][L_FRAME48k / MAX_PARAM_SPATIAL_SUBFRAMES];

    Word32 *p_output_fx[MAX_OUTPUT_CHANNELS + MAX_NUM_OBJECTS];

    Word16 nchan_in, nchan_out;

    Word16 nchan_in, nchan_out, gd_bits, n_chan_inp, i, shift;

    IF( !st_ivas->hDecoderConfig->Opt_tsm )

    {

        return IVAS_ERR_OK;
@@ -2637,17 +2637,44 @@ ivas_error ivas_jbm_dec_flush_renderer_fx( 
                    /* Convert to CICPxx; used also for ISM->CICP19->binaural_room rendering */

                    set16_fx( st_ivas->hIsmRendererData->interpolator_fx, 32767, hTcBuffer->n_samples_granularity ); // 32767=1.0f in Q15



                    ivas_ism_render_sf_fx( st_ivas, p_output_fx, *nSamplesRendered );

                    ivas_ism_render_sf_fx( st_ivas, p_output_fx, hTcBuffer->n_samples_granularity );



                    st_ivas->hCrendWrapper->p_io_qfactor = &st_ivas->hCrendWrapper->io_qfactor;

                    *st_ivas->hCrendWrapper->p_io_qfactor = 11;

                    move16();



                    shift = MAX_16;

                    move16();

                    n_chan_inp = add( st_ivas->hIntSetup.nchan_out_woLFE, st_ivas->hIntSetup.num_lfe );



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

                    {

                        shift = s_min( shift, L_norm_arr( p_output_fx[i], hTcBuffer->n_samples_granularity ) );

                    }



                    gd_bits = sub( find_guarded_bits_fx( imult1616( hTcBuffer->subframe_nbslots[0], hTcBuffer->n_samples_granularity ) ), shift );



                    *st_ivas->hCrendWrapper->p_io_qfactor = sub( *st_ivas->hCrendWrapper->p_io_qfactor, gd_bits );

                    move16();



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

                    {

                        scale_sig32( p_output_fx[i], hTcBuffer->n_samples_granularity, sub( *st_ivas->hCrendWrapper->p_io_qfactor, Q11 ) ); // Q(*st_ivas->hCrendWrapper->p_io_qfactor)

                    }



                    IF( NE_32( ( error = ivas_rend_crendProcessSubframe( st_ivas->hCrendWrapper, IVAS_AUDIO_CONFIG_7_1_4, IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR, st_ivas->hDecoderConfig, NULL,

                                                                         NULL, NULL, st_ivas->hTcBuffer, p_output_fx, p_output_fx, hTcBuffer->n_samples_granularity, st_ivas->hDecoderConfig->output_Fs ) ),

                               IVAS_ERR_OK ) )

                    {

                        return error;

                    }



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

                    {

                        scale_sig32( p_output_fx[i], hTcBuffer->n_samples_granularity, sub( Q11, *st_ivas->hCrendWrapper->p_io_qfactor ) ); // Q(11)

                    }

                    *st_ivas->hCrendWrapper->p_io_qfactor = Q11;

                    move16();

                }

            }

            ELSE

lib_enc/find_tilt_fx.c

+1 −1
Original line number Diff line number Diff line
@@ -329,7 +329,7 @@ void find_tilt_ivas_fx( 
    {

        hp_bckr = L_deposit_l( 1 );

    }

    Ltmp = BASOP_Util_Divide3232_Scale_cadence( lp_bckr, hp_bckr, &e_tmp );

    Ltmp = BASOP_Util_Divide3232_Scale_newton( lp_bckr, hp_bckr, &e_tmp );

    Ltmp = Mpy_32_16_r( Ltmp, 3277 /* 0.1f in Q15 */ );

    Ltmp = L_shr_sat( Ltmp, sub( 15, e_tmp ) );

    *bckr_tilt_lt = L_add_sat( Mpy_32_16_r( *bckr_tilt_lt, 29491 /* 0.9f in Q15 */ ), Ltmp ); // Q16