Commit 34c37588 authored by Sandesh Venkatesh's avatar Sandesh Venkatesh
Browse files

revert mc_dec_reconfig changes and ivas_sba_linear_renderer integration

parent 57df6e89
Loading
Loading
Loading
Loading
Loading
+0 −10
Original line number Diff line number Diff line
@@ -4630,11 +4630,6 @@ void ivas_param_mc_enc(
    float *data_f[],                                            /* i/o: input/transport MC data                             */
    const int16_t input_frame                                   /* i  : input frame length                                  */
);
#ifdef IVAS_FLOAT_FIXED
ivas_error ivas_param_mc_dec_open_fx(
    Decoder_Struct *st_ivas /* i/o: IVAS decoder structure  */
);
#endif // IVAS_FLOAT_FIXED

ivas_error ivas_param_mc_dec_open(
    Decoder_Struct *st_ivas                                     /* i/o: IVAS decoder structure                              */
@@ -4649,11 +4644,6 @@ ivas_error ivas_param_mc_dec_reconfig_fx(
ivas_error ivas_param_mc_dec_reconfig(
    Decoder_Struct *st_ivas                                     /* i/o: IVAS decoder structure                              */
);
#ifdef IVAS_FLOAT_FIXED
void ivas_param_mc_dec_close_fx(
	PARAM_MC_DEC_HANDLE *hParamMC_out /* i/o: Parametric MC decoder handle   */
);
#endif // IVAS_FLOAT_FIXED

void ivas_param_mc_dec_close(
    PARAM_MC_DEC_HANDLE *hParamMC                               /* i/o: Parametric MC decoder handle                        */
+2 −2
Original line number Diff line number Diff line
@@ -974,7 +974,7 @@ ivas_error ivas_cldfb_dec_reconfig_fx(
    /* resample CLDFB analysis instances */
    FOR( i = 0; i < min( numCldfbAnalyses, numCldfbAnalyses_old ); i++ )
    {
        IF( NE_32( L_mult0( extract_l(L_mult0( st_ivas->cldfbAnaDec[i]->no_channels, st_ivas->cldfbAnaDec[i]->no_col )), FRAMES_PER_SEC ), hDecoderConfig->output_Fs ) )
        IF( EQ_32( L_mult0( extract_l(L_mult0( st_ivas->cldfbAnaDec[i]->no_channels, st_ivas->cldfbAnaDec[i]->no_col )), FRAMES_PER_SEC ), hDecoderConfig->output_Fs ) )
        {
            resampleCldfb_ivas_fx( st_ivas->cldfbAnaDec[i], hDecoderConfig->output_Fs );
        }
@@ -1027,7 +1027,7 @@ ivas_error ivas_cldfb_dec_reconfig_fx(
        FOR( i = 0; i < st_ivas->cldfbAnaDec[0]->cldfb_state_length; i++ )
         st_ivas->cldfbAnaDec[0]->cldfb_state_fx[i] = L_shr( st_ivas->cldfbAnaDec[0]->cldfb_state_fx[i], 16 ); // Scaling down from 27 to 11
        FOR( i = 0; i < st_ivas->cldfbSynDec[0]->cldfb_state_length; i++ )
        st_ivas->cldfbSynDec[0]->cldfb_state_fx[i] = L_shr( st_ivas->cldfbSynDec[0]->cldfb_state_fx[i], 21- 11); // Scaling down from 21 to 11
        st_ivas->cldfbSynDec[0]->cldfb_state_fx[i] = L_shr( st_ivas->cldfbSynDec[0]->cldfb_state_fx[i], 21- Q_cldfbSynDec); // Scaling down from 21 to Q_cldfbSynDec
    }
    return IVAS_ERR_OK;
}
+20 −1
Original line number Diff line number Diff line
@@ -3298,6 +3298,7 @@ ivas_error ivas_jbm_dec_tc(
            st_ivas->hCPE[0]->element_brate = ivas_total_brate;
        }


        /* core-decoding of transport channels */
        if ( st_ivas->nSCE == 1 )
        {
@@ -5772,11 +5773,29 @@ ivas_error ivas_jbm_dec_render(
                {
                    mvr2r( st_ivas->hTcBuffer->tc[n] + st_ivas->hTcBuffer->n_samples_rendered, p_output[n], *nSamplesRendered );
                }

#ifdef IVAS_FLOAT_FIXED
#if 1//To Be removed
                for ( n = 0; n < st_ivas->p_out_len; n++ )
                {
                    floatToFixed_arr32( p_output[n], p_output_fx[n], Q11, 960 );
                }
#endif
                IF ( ( error = ivas_sba_linear_renderer_fx( p_output_fx, *nSamplesRendered, nchan_remapped, 0, output_config, st_ivas->hOutSetup ) ) != IVAS_ERR_OK )
                {
                    return error;
                }
#if 1//To Be removed
                for ( n = 0; n < st_ivas->p_out_len; n++ )
                {
                    fixedToFloat_arrL( p_output_fx[n], p_output[n], 11, 960 );
                }
#endif
#else
                if ( ( error = ivas_sba_linear_renderer( p_output, *nSamplesRendered, nchan_remapped, 0, output_config, st_ivas->hOutSetup ) ) != IVAS_ERR_OK )
                {
                    return error;
                }
#endif
            }
            else if ( st_ivas->renderer_type == RENDERER_DIRAC )
            {
+14 −684

File changed.

Preview size limit exceeded, changes collapsed.

+9 −830

File changed.

Preview size limit exceeded, changes collapsed.

Loading