Commit ed0684f4 authored by bayers's avatar bayers
Browse files

add temp fixes for #840, #841, fix SBA CNA/CNG again

parent 700566d8

lib_com/options.h

+2 −0
Original line number Diff line number Diff line
@@ -197,6 +197,8 @@ 
#define FIX_XXX_JBM_FOR_OSBA

#define FIX_XXX_CHANNEL_MEM_COUNT

#define FIX_XXX_JBM_PARAMUPMIX_HEADROT

#define FIX_XXX_MC_RS_BINAURAL

#define FIX_XXX_PMC_RS

#endif



/* ##################### End NON-BE switches ########################### */

lib_dec/ivas_mc_param_dec.c

+2 −1
Original line number Diff line number Diff line
@@ -590,8 +590,9 @@ ivas_error ivas_param_mc_dec_reconfig( 
    hTransportSetup = st_ivas->hTransSetup;

    mc_ls_setup = ivas_mc_map_output_config_to_mc_ls_setup( st_ivas->transport_config );

    nchan_out_transport = st_ivas->hTransSetup.nchan_out_woLFE + st_ivas->hTransSetup.num_lfe;

#ifndef FIX_XXX_PMC_RS

    hParamMC->hoa_encoder = NULL;



#endif

    if ( hParamMC->synthesis_conf == PARAM_MC_SYNTH_LS_CONV_COV || hParamMC->synthesis_conf == PARAM_MC_SYNTH_MONO_STEREO )

    {

        nchan_out_cov = st_ivas->hOutSetup.nchan_out_woLFE + st_ivas->hOutSetup.num_lfe;

lib_dec/ivas_mct_dec.c

+3 −0
Original line number Diff line number Diff line
@@ -1226,6 +1226,9 @@ static ivas_error ivas_mc_dec_reconfig( 
            if ( st_ivas->hBinRendererTd != NULL && ( st_ivas->renderer_type != RENDERER_BINAURAL_OBJECTS_TD ) )

            {

                ivas_td_binaural_close( &st_ivas->hBinRendererTd );

#ifdef FIX_XXX_MC_RS_BINAURAL

                st_ivas->hHrtfTD = NULL;

#endif

            }



#ifdef SPLIT_REND_WITH_HEAD_ROT_PARAMBIN

lib_dec/ivas_sba_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -872,7 +872,7 @@ ivas_error ivas_sba_dec_digest_tc( 
        nchan_transport = 1; /* Only one channel transported */

    }

    if ( ( ( st_ivas->ivas_format != SBA_FORMAT && st_ivas->ivas_format != SBA_ISM_FORMAT ) && st_ivas->nchan_transport == 1 && st_ivas->hSCE[0]->hCoreCoder[0] != NULL && st_ivas->hSCE[0]->hCoreCoder[0]->cna_dirac_flag ) ||

         ( ( st_ivas->renderer_type == RENDERER_STEREO_PARAMETRIC || st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC_ROOM || st_ivas->hBinRendererTd == RENDERER_BINAURAL_PARAMETRIC ) && ( nchan_transport == 1 && st_ivas->nchan_transport != 2 && st_ivas->hSCE[0]->hCoreCoder[0] != NULL && st_ivas->hSCE[0]->hCoreCoder[0]->cng_sba_flag ) ) )

         ( ( st_ivas->renderer_type == RENDERER_STEREO_PARAMETRIC || st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC_ROOM || st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC ) && ( nchan_transport == 1 && st_ivas->nchan_transport != 2 && st_ivas->hSCE[0]->hCoreCoder[0] != NULL && st_ivas->hSCE[0]->hCoreCoder[0]->cng_sba_flag ) ) )

#else

    if ( st_ivas->nchan_transport == 1 && st_ivas->hSCE[0]->hCoreCoder[0] != NULL && st_ivas->hSCE[0]->hCoreCoder[0]->cna_dirac_flag && st_ivas->ivas_format == SBA_FORMAT )

#endif