Commit eb223f5e authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_634_MASA_JBM_UNUSED_PARAMETER

parent d5a53e84

lib_com/ivas_prot.h

+0 −3
Original line number Diff line number Diff line
@@ -872,9 +872,6 @@ int16_t ivas_jbm_dec_get_num_tc_channels( 
);



void ivas_jbm_dec_get_md_map_even_spacing(

#ifndef FIX_634_MASA_JBM_UNUSED_PARAMETER

    const int16_t default_len,  /* i  : default frame length in metadata slots         */

#endif

    const int16_t len,          /* i  : length of the modfied frames in metadata slots */

    const int16_t subframe_len, /* i  : default length of a subframe                   */

    const int16_t offset,       /* i  : current read offset into the md buffer         */

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -172,7 +172,6 @@ 






#define FIX_634_MASA_JBM_UNUSED_PARAMETER               /* Nokia: Fix issue 634 by removing the unnecessary argument. */

#define FIX_675_WB_OMASA                                /* Nokia: Fix for issue 675 solving the crash in OMASA for WB input */

#define FIX_683_JBM_CLEANUP                             /* FhG: Fix for issue 683, add clean up for ISM and MASA file writers */

#define FIX_689_USAN_QSPHERICAL                         /* Nokia: Fix usan error from issue 689 */

lib_dec/ivas_dirac_dec.c

+0 −4
Original line number Diff line number Diff line
@@ -1600,11 +1600,7 @@ void ivas_dirac_dec_set_md_map( 


    if ( st_ivas->ivas_format == MASA_FORMAT )

    {

#ifdef FIX_634_MASA_JBM_UNUSED_PARAMETER

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

#else

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

#endif

    }

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

    {

lib_dec/ivas_jbm_dec.c

+0 −12
Original line number Diff line number Diff line
@@ -1558,9 +1558,6 @@ void ivas_jbm_dec_get_md_map( 
 * Get an meta data map adapted to a time scale modified IVAS frame. Distribute slots evenly across the modified frame.

 *--------------------------------------------------------------------------*/

void ivas_jbm_dec_get_md_map_even_spacing(

#ifndef FIX_634_MASA_JBM_UNUSED_PARAMETER

    const int16_t default_len, /* i  : default frame length in metadata slots         */

#endif

    const int16_t len,          /* i  : length of the modfied frames in metadata slots */

    const int16_t subframe_len, /* i  : default length of a subframe                   */

    const int16_t offset,       /* i  : current read offset into the md buffer         */
@@ -1571,11 +1568,6 @@ void ivas_jbm_dec_get_md_map_even_spacing( 
    int16_t map_idx, sf_idx, sf_length, increment, subframes_written;

    float decimal, decimal_sum, eps;

    int16_t subframe_map_length[MAX_PARAM_SPATIAL_SUBFRAMES];

#ifndef FIX_634_MASA_JBM_UNUSED_PARAMETER

#ifdef DEBUGGING

    assert( default_len % 2 == 0 );

#endif

#endif



    /* subframe map length */

    sf_length = len / subframe_len;
@@ -2325,11 +2317,7 @@ static void ivas_jbm_masa_sf_to_slot_map( 
    num_slots_in_subfr = CLDFB_NO_COL_MAX / MAX_PARAM_SPATIAL_SUBFRAMES;



    /* Map input subframes to slots */

#ifdef FIX_634_MASA_JBM_UNUSED_PARAMETER

    ivas_jbm_dec_get_md_map_even_spacing( nCldfbTs, num_slots_in_subfr, 0, MAX_PARAM_SPATIAL_SUBFRAMES, sf_to_slot_map );

#else

    ivas_jbm_dec_get_md_map_even_spacing( DEFAULT_JBM_CLDFB_TIMESLOTS, nCldfbTs, num_slots_in_subfr, 0, MAX_PARAM_SPATIAL_SUBFRAMES, sf_to_slot_map );

#endif



    for ( slot_idx = 0; slot_idx < nCldfbTs; slot_idx++ )

    {