Commit 957de910 authored by reutelhuber's avatar reutelhuber
Browse files

address some minor issues

parent 776727b5
Loading
Loading
Loading
Loading
Loading
+18 −0
Original line number Diff line number Diff line
@@ -347,6 +347,24 @@ ivas_error ivas_dec(

            if ( st_ivas->sba_mode == SBA_MODE_SPAR )
            {
#ifdef SBA2MONO
                ivas_agc_dec_process( st_ivas->hSpar->hAgcDec, output, output, st_ivas->hSpar->hMdDec->spar_md_cfg.nchan_transport, output_frame );

                if ( st_ivas->hSpar->hPCA != NULL )
                {
                    int16_t num_in_ingest;
                    if ( st_ivas->hSpar->hMdDec->td_decorr_flag )
                    {
                        num_in_ingest = ivas_sba_get_nchan_metadata( st_ivas->sba_analysis_order );;
                    }
                    else
                    {
                        num_in_ingest = st_ivas->hSpar->hMdDec->spar_md_cfg.nchan_transport;
                    }
                    ivas_pca_dec( st_ivas->hSpar->hPCA, output_frame, num_in_ingest, st_ivas->hDecoderConfig->ivas_total_brate, st_ivas->hDecoderConfig->last_ivas_total_brate, st_ivas->bfi, output );
                }

#endif
                ivas_spar_dec_gen_umx_mat( st_ivas->hSpar->hMdDec, st_ivas->nchan_transport, IVAS_MAX_NUM_BANDS, st_ivas->bfi );
            }

+4 −0
Original line number Diff line number Diff line
@@ -1033,7 +1033,11 @@ ivas_error ivas_init_decoder(
        }

        /* create CPE element for DFT Stereo like upmix */
#ifdef SBA2MONO
        if ( st_ivas->sba_dirac_stereo_flag && st_ivas->nCPE == 0 )
#else
        if ( st_ivas->sba_dirac_stereo_flag && st_ivas->nchan_transport == 1 )
#endif
        {
            if ( ( error = create_cpe_dec( st_ivas, cpe_id, ivas_total_brate / ( st_ivas->nSCE + st_ivas->nCPE ) ) ) != IVAS_ERR_OK )
            {