Commit 5ec05e62 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_747_ISM_TODOS

parent fbb62107

lib_com/ivas_cnst.h

+0 −14
Original line number Diff line number Diff line
@@ -153,11 +153,7 @@ typedef enum 
#define MAX_SCE                                 MAX_NUM_OBJECTS             /* max. number of SCEs */

#define MAX_CPE                                 ( MAX_TRANSPORT_CHANNELS / CPE_CHANNELS )    /* max. number of CPEs */



#ifdef FIX_747_ISM_TODOS

#define MAX_BITS_METADATA                       2500                        /* max. bit-budget of metadata */

#else

#define MAX_BITS_METADATA                       2640                        /* max. bit-budget of metadata, one channel */ /* IVAS_fmToDo: to be confirmed for final value once mature */

#endif

#define MIN_NUM_IND                             10                          /* minimum number of indices in the core coder */

#define MAX_NUM_IND_LFE                         100                         /* maximum number of indices in the LFE encoder */

#define MAX_NUM_IND_TEMP_LIST                   10                          /* maximum number of indices in the temporary list */
@@ -369,9 +365,6 @@ typedef enum 
#define ISM_Q_STEP_LOW                          (ISM_Q_STEP * 2)

#define ISM_Q_STEP_BORDER_LOW                   (ISM_Q_STEP_BORDER * 2)



#ifndef FIX_747_ISM_TODOS

#define BRATE_ISM_INACTIVE                      2450 /* CoreCoder bitrate in ISM inactive frames */

#endif

/* ISM modes */

typedef enum 

{
@@ -407,15 +400,8 @@ enum 
    IND_ISM_ELEVATION = TAG_ISM_LOOP_START,

    IND_ISM_RADIUS_DIFF_FLAG = TAG_ISM_LOOP_START,

    IND_ISM_RADIUS = TAG_ISM_LOOP_START,

#ifdef FIX_747_ISM_TODOS

    TAG_ISM_LOOP_END = TAG_ISM_LOOP_START

#else

    TAG_ISM_LOOP_END = TAG_ISM_LOOP_START + 100, /* IVAS_fmToDo: to be reviewed once the final metadata are defined */

#endif

    /* --------- end of loop for objects ----------- */

#ifndef FIX_747_ISM_TODOS

    ISM_MAX_NUM_INDICES

#endif



};

lib_com/ivas_error.h

+0 −11
Original line number Diff line number Diff line
@@ -61,9 +61,6 @@ typedef enum 
    IVAS_ERR_INVALID_MASA_CONFIG,

    IVAS_ERR_TOO_MANY_INPUTS,

    IVAS_ERR_MISSING_METADATA,

#ifndef FIX_747_ISM_TODOS

    IVAS_ERR_INDEX_OUT_OF_BOUNDS,

#endif

    IVAS_ERR_RECONFIGURE_NOT_SUPPORTED,

    IVAS_ERR_INVALID_FEC_CONFIG,

    IVAS_ERR_INVALID_FEC_OFFSET,
@@ -84,12 +81,8 @@ typedef enum 
    IVAS_ERR_ACOUSTIC_ENVIRONMENT_NOT_SUPPORTED,

    IVAS_ERR_INVALID_HRTF,

    IVAS_ERR_INVALID_INPUT_FORMAT,

#ifdef FIX_747_ISM_TODOS

    IVAS_ERR_INVALID_INDEX,



#else

    IVAS_ERR_INVALID_INDEX, /* ToDo: should be merged with IVAS_ERR_INDEX_OUT_OF_BOUNDS */

#endif

    IVAS_ERR_NOT_SUPPORTED_OPTION,

    IVAS_ERR_NOT_IMPLEMENTED,

    IVAS_ERR_WAITING_FOR_BITSTREAM,
@@ -220,10 +213,6 @@ static inline const char *ivas_error_to_string( ivas_error error_code ) 
            return "Invalid MASA config";

        case IVAS_ERR_TOO_MANY_INPUTS:

            return "Too many object inputs provided";

#ifndef FIX_747_ISM_TODOS

        case IVAS_ERR_INDEX_OUT_OF_BOUNDS:

            return "Index out of bounds";

#endif

        case IVAS_ERR_RECONFIGURE_NOT_SUPPORTED:

            return "Reconfigure not supported";

        case IVAS_ERR_INVALID_FEC_OFFSET:

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -163,7 +163,6 @@ 
#define FIX_708_DPID_COMMAND_LINE                       /* issue 708: sanity checks for '-dpid' command-line */

#define FIX_730_DPID_NOT_SET_CORRECTLY                  /* Eri: issue 730: write dpid read from file in correct index, print informative error message when DPID specified is not found. */

#define FIX_513_REND_MC_ALLOC                           /* FhG: issue 513, optimise external renderer allocation for multichannel */

#define FIX_747_ISM_TODOS                               /* VA: issue 747 - address ISM ToDos */

#define FIX_ISMRENDERER_HANDLE_DEALLOC                  /* VA: issue 781: harmonize Deallocation of handle 'hIsmRendererData' */

#define FIX_782_OSBA_FUNCTION_NAMES                     /* VA: fix 782: correct OSBA function names */

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

lib_dec/ivas_ism_metadata_dec.c

+0 −14
Original line number Diff line number Diff line
@@ -62,9 +62,7 @@ static int16_t decode_radius( DEC_CORE_HANDLE st0, int16_t *last_radius_idx, int 
#define CNG_MD_MAX_DIFF_AZIMUTH   5

#define CNG_MD_MAX_DIFF_ELEVATION 5



#ifdef FIX_747_ISM_TODOS

#define MAX_BITS_ISM_METADATA ( 2 * ISM_EXTENDED_METADATA_BITS + MAX_NUM_OBJECTS * ( 1 /*number of objects*/ + ISM_METADATA_MD_FLAG_BITS + 2 * ISM_METADATA_FLAG_BITS + ISM_METADATA_IS_NDP_BITS + 1 /*abs.flag*/ + ISM_AZIMUTH_NBITS + ISM_ELEVATION_NBITS + 1 /*abs.flag*/ + ISM_RADIUS_NBITS + 1 /*abs.flag*/ + ISM_AZIMUTH_NBITS + ISM_ELEVATION_NBITS ) + 10 /* margin */ ) /* max. bit-budget of ISM metadata */

#endif





/*-------------------------------------------------------------------*
@@ -169,11 +167,7 @@ ivas_error ivas_ism_metadata_dec( 
    int16_t idx_angle1;

    int16_t idx_angle2;

    int16_t next_bit_pos_orig;

#ifdef FIX_747_ISM_TODOS

    uint16_t i, bstr_meta[MAX_BITS_ISM_METADATA], *bstr_orig;

#else

    uint16_t i, bstr_meta[MAX_BITS_METADATA], *bstr_orig;

#endif

    ISM_METADATA_HANDLE hIsmMetaData;

    int16_t nchan_transport_prev, ism_metadata_flag_global;

    int16_t null_metadata_flag[MAX_NUM_OBJECTS];
@@ -199,11 +193,7 @@ ivas_error ivas_ism_metadata_dec( 
    set_s( lowrate_metadata_flag, 0, nchan_ism );



    /* reverse the bitstream for easier reading of indices */

#ifdef FIX_747_ISM_TODOS

    for ( i = 0; i < min( MAX_BITS_ISM_METADATA, last_bit_pos ); i++ )

#else

    for ( i = 0; i < min( MAX_BITS_METADATA, last_bit_pos ); i++ )

#endif

    {

        bstr_meta[i] = st0->bit_stream[last_bit_pos - i];

    }
@@ -977,11 +967,7 @@ void ivas_ism_metadata_sid_dec( 
    st0->next_bit_pos = 0;



    /* reverse the bitstream for easier reading of indices */

#ifdef FIX_747_ISM_TODOS

    for ( i = 0; i < min( MAX_BITS_ISM_METADATA, last_bit_pos ); i++ )

#else

    for ( i = 0; i < min( MAX_BITS_METADATA, last_bit_pos ); i++ )

#endif

    {

        bstr_meta[i] = st0->bit_stream[last_bit_pos - i];

    }

lib_enc/ivas_ism_enc.c

+0 −18
Original line number Diff line number Diff line
@@ -247,7 +247,6 @@ ivas_error ivas_ism_enc( 
    }

    else if ( st_ivas->ism_mode == ISM_MODE_PARAM )

    {

#ifdef FIX_747_ISM_TODOS

#ifndef PARAM_ISM_REFACTOR

        if ( ( error = ivas_ism_metadata_enc( &st_ivas->hEncoderConfig->ivas_total_brate, nchan_ism, nchan_transport_ism, st_ivas->hIsmMetaData, st_ivas->hSCE, st_ivas->hSCE[st_ivas->nSCE - 1]->hMetaData,

                                              nb_bits_metadata, vad_flag, st_ivas->ism_mode, st_ivas->hDirAC->hParamIsm, st_ivas->hEncoderConfig->ism_extended_metadata_flag, -1, 0, NULL, st_ivas->hSCE[0]->hCoreCoder[0]->ini_frame ) ) != IVAS_ERR_OK )
@@ -258,17 +257,6 @@ ivas_error ivas_ism_enc( 
        {

            return error;

        }

#else

#ifndef PARAM_ISM_REFACTOR

        ivas_ism_metadata_enc( &st_ivas->hEncoderConfig->ivas_total_brate, nchan_ism, nchan_transport_ism, st_ivas->hIsmMetaData, st_ivas->hSCE, st_ivas->hSCE[st_ivas->nSCE - 1]->hMetaData,

                               nb_bits_metadata, vad_flag, st_ivas->ism_mode, st_ivas->hDirAC->hParamIsm, st_ivas->hEncoderConfig->ism_extended_metadata_flag, -1, 0, NULL,

                               st_ivas->hSCE[0]->hCoreCoder[0]->ini_frame );

#else

        ivas_ism_metadata_enc( &st_ivas->hEncoderConfig->ivas_total_brate, nchan_ism, nchan_transport_ism, st_ivas->hIsmMetaData, st_ivas->hSCE, st_ivas->hSCE[st_ivas->nSCE - 1]->hMetaData,

                               nb_bits_metadata, vad_flag, st_ivas->ism_mode, st_ivas->hParamIsmDec->hParamIsm, st_ivas->hEncoderConfig->ism_extended_metadata_flag, -1, 0, NULL,

                               st_ivas->hSCE[0]->hCoreCoder[0]->ini_frame );

#endif

#endif

    }

    else /* ISM_MODE_DISC */

    {
@@ -287,17 +275,11 @@ ivas_error ivas_ism_enc( 


        ism_total_brate_ref = ism_total_brate;



#ifdef FIX_747_ISM_TODOS

        if ( ( error = ivas_ism_metadata_enc( &ism_total_brate, nchan_ism, nchan_transport_ism, st_ivas->hIsmMetaData, st_ivas->hSCE, st_ivas->hSCE[st_ivas->nSCE - 1]->hMetaData,

                                              nb_bits_metadata, vad_flag, st_ivas->ism_mode, NULL, st_ivas->hEncoderConfig->ism_extended_metadata_flag, st_ivas->hMasa != NULL ? st_ivas->hMasa->data.hOmasaData->lp_noise_CPE : 0, flag_omasa_ener_brate, st_ivas->hMasa != NULL ? &( st_ivas->hMasa->data.hOmasaData->omasa_stereo_sw_cnt ) : NULL, st_ivas->hSCE[0]->hCoreCoder[0]->ini_frame ) ) != IVAS_ERR_OK )

        {

            return error;

        }

#else

        ivas_ism_metadata_enc( &ism_total_brate, nchan_ism, nchan_transport_ism, st_ivas->hIsmMetaData, st_ivas->hSCE, st_ivas->hSCE[st_ivas->nSCE - 1]->hMetaData,

                               nb_bits_metadata, vad_flag, st_ivas->ism_mode, NULL, st_ivas->hEncoderConfig->ism_extended_metadata_flag, st_ivas->hMasa != NULL ? st_ivas->hMasa->data.hOmasaData->lp_noise_CPE : 0, flag_omasa_ener_brate, st_ivas->hMasa != NULL ? &( st_ivas->hMasa->data.hOmasaData->omasa_stereo_sw_cnt ) : NULL,

                               st_ivas->hSCE[0]->hCoreCoder[0]->ini_frame );

#endif



        if ( st_ivas->hEncoderConfig->ivas_format == MASA_ISM_FORMAT )

        {