Loading lib_com/ivas_tools.c +55 −12 Original line number Diff line number Diff line Loading @@ -2555,21 +2555,64 @@ void lls_interp_n_fx( { Word16 i; const Word16 n_i_fx[11] = { 0, 2048, 4096, 6144, 8192, 10240, 12288, 14336, 16384, 18432, 20480 }; // Q11 move16(); move16(); move16(); move16(); move16(); move16(); move16(); move16(); move16(); move16(); move16(); move16(); move16(); move16(); move16(); move16(); move16(); move16(); move16(); move16(); move16(); move16(); const Word16 one_by_n_fx[11] = { 0, 32767, 16384, 10911, 8192, 6553, 5459, 4681, 4096, 3640, 3276 }; move16(); move16(); move16(); move16(); move16(); move16(); move16(); move16(); move16(); move16(); move16(); move16(); move16(); move16(); move16(); move16(); move16(); move16(); move16(); move16(); move16(); move16(); const Word16 sum_i_fx[12] = { 0, 0, 1, 3, 6, 10, 15, 21, 28, 36, 45, 55 }; move16(); move16(); move16(); move16(); move16(); move16(); move16(); move16(); move16(); move16(); move16(); move16(); move16(); move16(); move16(); move16(); move16(); move16(); move16(); move16(); move16(); move16(); move16(); move16(); // 1.0f/ ( N * sum_ii[N] - sum_i[N] * sum_i[N] ) const Word32 res_table[12] = { 0, 0, 0, 357913952, 107374184, 42949672, 20452226, 10956549, 6391320, 3976821, 2603010, 385 }; move16(); move16(); move16(); move16(); move16(); move16(); move16(); move16(); move16(); move16(); move16(); move16(); move16(); move16(); move16(); move16(); move16(); move16(); move16(); move16(); move16(); move16(); move16(); move16(); Word32 sum_x_fx, sum_ix_fx, slope_fx, offset_fx; Word16 dot_exp = 0, sum_ix_q = 0; move16(); move16(); move16(); move16(); Word32 num; assert( N > 0 && LE_16( N, 10 ) ); Loading lib_enc/ivas_osba_enc.c +25 −20 Original line number Diff line number Diff line Loading @@ -184,9 +184,11 @@ ivas_error ivas_osba_enc_reconfig( ivas_error error; ENCODER_CONFIG_HANDLE hEncoderConfig; error = IVAS_ERR_OK; move32(); error = IVAS_ERR_OK; move32(); hEncoderConfig = st_ivas->hEncoderConfig; ivas_total_brate = hEncoderConfig->ivas_total_brate; move32(); ivas_total_brate = hEncoderConfig->ivas_total_brate; move32(); IF( NE_32( ivas_total_brate, hEncoderConfig->last_ivas_total_brate ) ) { Loading @@ -197,15 +199,19 @@ ivas_error ivas_osba_enc_reconfig( int16_t nbands_old; int16_t ndir_old; spar_reconfig_flag = 0;move16(); old_ism_mode = st_ivas->ism_mode;move32(); spar_reconfig_flag = 0; move16(); old_ism_mode = st_ivas->ism_mode; move32(); IF( GE_32( ivas_total_brate, IVAS_256k ) ) { st_ivas->ism_mode = ISM_SBA_MODE_DISC;move32(); st_ivas->ism_mode = ISM_SBA_MODE_DISC; move32(); } ELSE { st_ivas->ism_mode = ISM_MODE_NONE;move32(); st_ivas->ism_mode = ISM_MODE_NONE; move32(); } nchan_transport_old = st_ivas->nchan_transport; nCPE_old = st_ivas->nCPE; Loading Loading @@ -347,7 +353,6 @@ ivas_error ivas_osba_enc_reconfig( free( old_mem_hp20_in_fx ); old_mem_hp20_in_fx = NULL; } } ivas_spar_config( ivas_total_brate, min( st_ivas->sba_analysis_order, IVAS_MAX_SBA_ORDER ), &st_ivas->nchan_transport, &st_ivas->nSCE, &st_ivas->nCPE, &st_ivas->hSpar->core_nominal_brate, -1 ); Loading lib_com/ivas_stat_com.h +1 −1 File changed.Contains only whitespace changes. Show changes lib_enc/ivas_lfe_enc.c +4 −4 File changed.Contains only whitespace changes. Show changes Loading
lib_com/ivas_tools.c +55 −12 Original line number Diff line number Diff line Loading @@ -2555,21 +2555,64 @@ void lls_interp_n_fx( { Word16 i; const Word16 n_i_fx[11] = { 0, 2048, 4096, 6144, 8192, 10240, 12288, 14336, 16384, 18432, 20480 }; // Q11 move16(); move16(); move16(); move16(); move16(); move16(); move16(); move16(); move16(); move16(); move16(); move16(); move16(); move16(); move16(); move16(); move16(); move16(); move16(); move16(); move16(); move16(); const Word16 one_by_n_fx[11] = { 0, 32767, 16384, 10911, 8192, 6553, 5459, 4681, 4096, 3640, 3276 }; move16(); move16(); move16(); move16(); move16(); move16(); move16(); move16(); move16(); move16(); move16(); move16(); move16(); move16(); move16(); move16(); move16(); move16(); move16(); move16(); move16(); move16(); const Word16 sum_i_fx[12] = { 0, 0, 1, 3, 6, 10, 15, 21, 28, 36, 45, 55 }; move16(); move16(); move16(); move16(); move16(); move16(); move16(); move16(); move16(); move16(); move16(); move16(); move16(); move16(); move16(); move16(); move16(); move16(); move16(); move16(); move16(); move16(); move16(); move16(); // 1.0f/ ( N * sum_ii[N] - sum_i[N] * sum_i[N] ) const Word32 res_table[12] = { 0, 0, 0, 357913952, 107374184, 42949672, 20452226, 10956549, 6391320, 3976821, 2603010, 385 }; move16(); move16(); move16(); move16(); move16(); move16(); move16(); move16(); move16(); move16(); move16(); move16(); move16(); move16(); move16(); move16(); move16(); move16(); move16(); move16(); move16(); move16(); move16(); move16(); Word32 sum_x_fx, sum_ix_fx, slope_fx, offset_fx; Word16 dot_exp = 0, sum_ix_q = 0; move16(); move16(); move16(); move16(); Word32 num; assert( N > 0 && LE_16( N, 10 ) ); Loading
lib_enc/ivas_osba_enc.c +25 −20 Original line number Diff line number Diff line Loading @@ -184,9 +184,11 @@ ivas_error ivas_osba_enc_reconfig( ivas_error error; ENCODER_CONFIG_HANDLE hEncoderConfig; error = IVAS_ERR_OK; move32(); error = IVAS_ERR_OK; move32(); hEncoderConfig = st_ivas->hEncoderConfig; ivas_total_brate = hEncoderConfig->ivas_total_brate; move32(); ivas_total_brate = hEncoderConfig->ivas_total_brate; move32(); IF( NE_32( ivas_total_brate, hEncoderConfig->last_ivas_total_brate ) ) { Loading @@ -197,15 +199,19 @@ ivas_error ivas_osba_enc_reconfig( int16_t nbands_old; int16_t ndir_old; spar_reconfig_flag = 0;move16(); old_ism_mode = st_ivas->ism_mode;move32(); spar_reconfig_flag = 0; move16(); old_ism_mode = st_ivas->ism_mode; move32(); IF( GE_32( ivas_total_brate, IVAS_256k ) ) { st_ivas->ism_mode = ISM_SBA_MODE_DISC;move32(); st_ivas->ism_mode = ISM_SBA_MODE_DISC; move32(); } ELSE { st_ivas->ism_mode = ISM_MODE_NONE;move32(); st_ivas->ism_mode = ISM_MODE_NONE; move32(); } nchan_transport_old = st_ivas->nchan_transport; nCPE_old = st_ivas->nCPE; Loading Loading @@ -347,7 +353,6 @@ ivas_error ivas_osba_enc_reconfig( free( old_mem_hp20_in_fx ); old_mem_hp20_in_fx = NULL; } } ivas_spar_config( ivas_total_brate, min( st_ivas->sba_analysis_order, IVAS_MAX_SBA_ORDER ), &st_ivas->nchan_transport, &st_ivas->nSCE, &st_ivas->nCPE, &st_ivas->hSpar->core_nominal_brate, -1 ); Loading