Commit 7e9ee82a authored by eichenseer's avatar eichenseer
Browse files

Resolve PARAM_ISM_JBM_HACK and merge fixed solution with PARAM_ISM_REFACTOR.

parent 0897581a

lib_com/options.h

+1 −3
Original line number Diff line number Diff line
@@ -174,9 +174,7 @@ 
#define FIX_708_AEID_COMMAND_LINE                       /* VA: issue 708: improve AEID command-line robustness */



#define PARAM_ISM_REFACTOR                              /* FhG: Issue 768: Refactoring to decouple hDirAC and hParamISM */

#ifdef PARAM_ISM_REFACTOR

#define PARAM_ISM_JBM_HACK                              /* FhG: To do. hDirAC is not available there; needs proper solution. */

#endif



/* #################### End BE switches ################################## */



/* #################### Start NON-BE switches ############################ */

lib_dec/ivas_dirac_dec.c

+3 −7
Original line number Diff line number Diff line
@@ -1550,14 +1550,10 @@ void ivas_dirac_dec_set_md_map( 
    DIRAC_DEC_HANDLE hDirAC;

    SPAT_PARAM_REND_COMMON_DATA_HANDLE hSpatParamRendCom;



#ifndef PARAM_ISM_JBM_HACK

    hDirAC = st_ivas->hDirAC;

#else

    hDirAC = NULL;

#endif

    hSpatParamRendCom = st_ivas->hSpatParamRendCom;

#ifdef DEBUGGING

#ifndef PARAM_ISM_JBM_HACK

#ifndef PARAM_ISM_REFACTOR

    assert( hDirAC );

#endif

    assert( hSpatParamRendCom );
@@ -1586,7 +1582,7 @@ void ivas_dirac_dec_set_md_map( 
    {

        ivas_jbm_dec_get_md_map_even_spacing( nCldfbTs, num_slots_in_subfr, 0, hSpatParamRendCom->dirac_md_buffer_length, hSpatParamRendCom->render_to_md_map );

    }

#ifndef PARAM_ISM_JBM_HACK

#ifndef PARAM_ISM_REFACTOR

    else if ( hDirAC->hConfig == NULL || hDirAC->hConfig->dec_param_estim == 0 )

#else

    else if ( hDirAC == NULL || hDirAC->hConfig == NULL || hDirAC->hConfig->dec_param_estim == 0 )
@@ -1599,7 +1595,7 @@ void ivas_dirac_dec_set_md_map( 
        ivas_jbm_dec_get_md_map( DEFAULT_JBM_CLDFB_TIMESLOTS, nCldfbTs, num_slots_in_subfr, hSpatParamRendCom->dirac_read_idx, hSpatParamRendCom->dirac_md_buffer_length, hSpatParamRendCom->render_to_md_map );

    }



#ifndef PARAM_ISM_JBM_HACK

#ifndef PARAM_ISM_REFACTOR

    if ( hDirAC->hConfig == NULL || hDirAC->hConfig->dec_param_estim == 0 )

#else

    if ( hDirAC == NULL || hDirAC->hConfig == NULL || hDirAC->hConfig->dec_param_estim == 0 )