Commit 2a3885b4 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_379_EXT_METADATA

parent 1a8cc8f6

apps/renderer.c

+0 −4
Original line number Diff line number Diff line
@@ -975,12 +975,8 @@ int main( 
        }

        else

        {

#ifdef FIX_379_EXT_METADATA

            error = IVAS_REND_SetHeadRotation( hIvasRend, NULL, NULL );

            if ( ( error != IVAS_ERR_OK ) && ( error != IVAS_ERR_INVALID_OUTPUT_FORMAT ) ) // VE: TBC

#else

            if ( ( ( error = IVAS_REND_SetHeadRotation( hIvasRend, NULL, NULL ) ) != IVAS_ERR_OK ) && ( IVAS_REND_SetHeadRotation( hIvasRend, NULL, NULL ) != IVAS_ERR_INVALID_OUTPUT_FORMAT ) ) // VE: TBC

#endif

            {

                fprintf( stderr, "Error setting Head Rotation: %s\n", ivas_error_to_string( error ) );

                exit( -1 );

lib_com/ivas_cnst.h

+0 −6
Original line number Diff line number Diff line
@@ -325,9 +325,7 @@ typedef enum 
#define ISM_RADIUS_DELTA                        0.25f /* Max radius = (2^ISM_RADIUS_NBITS-1)*0.25 = 15.75 */

#define ISM_EXTENDED_METADATA_BRATE             IVAS_64k

#define ISM_EXTENDED_METADATA_BITS              1

#ifdef FIX_379_EXT_METADATA                                     

#define ISM_METADATA_RS_MAX_FRAMES              5 /* Number of frames with opposite extended metadata flags before switching */

#endif



/* Parametric ISM */

#define MAX_PARAM_ISM_NBANDS                    11
@@ -367,11 +365,7 @@ enum 
{

    IND_ISM_NUM_OBJECTS,

    IND_ISM_EXTENDED_FLAG = IND_ISM_NUM_OBJECTS + MAX_NUM_OBJECTS,

#ifdef FIX_379_EXT_METADATA

    IND_ISM_METADATA_FLAG,

#else

    IND_ISM_METADATA_FLAG = IND_ISM_EXTENDED_FLAG + MAX_NUM_OBJECTS, /* EN2VE: Is this not supposed to be in the loop part below, since it is one per ISM? */

#endif

    IND_ISM_VAD_FLAG = IND_ISM_METADATA_FLAG + MAX_NUM_OBJECTS,

    IND_ISM_NOISY_SPEECH_FLAG = IND_ISM_VAD_FLAG + MAX_NUM_OBJECTS,

    IND_ISM_SCE_ID_DTX,

lib_com/ivas_prot.h

+0 −4
Original line number Diff line number Diff line
@@ -832,13 +832,9 @@ ivas_error ivas_ism_metadata_dec( 
    int16_t nb_bits_metadata[],                                 /* o  : number of metadata bits                     */

    ISM_MODE ism_mode,                                          /* i  : ISM mode                                    */

    ISM_DTX_DATA_DEC hISMDTX,                                   /* i/o: ISM DTX structure                           */

#ifdef FIX_379_EXT_METADATA 

    const PARAM_ISM_CONFIG_HANDLE hParamIsm,                    /* i  : Param ISM Config Handle                     */

    int16_t *ism_extended_metadata_flag,                        /* i/o: Extended metadata active in renderer        */

    int16_t *ism_extmeta_cnt                                   /* i/o: Number of change frames observed            */

#else

    const PARAM_ISM_CONFIG_HANDLE hParamIsm                     /* i  : Param ISM Config Handle                     */

#endif

);

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -142,7 +142,6 @@ 
/*#define FIX_I4_OL_PITCH*/                             /* fix open-loop pitch used for EVS core switching */





#define FIX_379_EXT_METADATA                            /* Eri: Extended metadata issues */

#define FIX_379_ANGLE                                   /* Eri: Extended metadata issues related to angle structure */



#define NOKIA_PARAMBIN_REQULARIZATION                   /* Nokia: Contribution - Configured reqularization factor for parametric binauralizer. */

lib_dec/ivas_dec.c

+0 −8
Original line number Diff line number Diff line
@@ -150,22 +150,14 @@ ivas_error ivas_dec( 
        else if ( st_ivas->ism_mode == ISM_MODE_PARAM )

        {

            // VE: call ivas_ism_metadata_dec() with 'st_ivas' - TBD

#ifdef FIX_379_EXT_METADATA

            if ( ( error = ivas_ism_metadata_dec( ivas_total_brate, st_ivas->nchan_ism, &( st_ivas->nchan_transport ), st_ivas->hIsmMetaData, st_ivas->hSCE, st_ivas->bfi, nb_bits_metadata, st_ivas->ism_mode, st_ivas->hISMDTX, st_ivas->hDirAC->hParamIsm, &st_ivas->ism_extmeta_active, &st_ivas->ism_extmeta_cnt ) ) != IVAS_ERR_OK )

#else

            if ( ( error = ivas_ism_metadata_dec( ivas_total_brate, st_ivas->nchan_ism, &( st_ivas->nchan_transport ), st_ivas->hIsmMetaData, st_ivas->hSCE, st_ivas->bfi, nb_bits_metadata, st_ivas->ism_mode, st_ivas->hISMDTX, st_ivas->hDirAC->hParamIsm ) ) != IVAS_ERR_OK )

#endif

            {

                return error;

            }

        }

        else /* ISM_MODE_DISC */

        {

#ifdef FIX_379_EXT_METADATA

            if ( ( error = ivas_ism_metadata_dec( ivas_total_brate, st_ivas->nchan_ism, &( st_ivas->nchan_transport ), st_ivas->hIsmMetaData, st_ivas->hSCE, st_ivas->bfi, nb_bits_metadata, st_ivas->ism_mode, st_ivas->hISMDTX, NULL, &st_ivas->ism_extmeta_active, &st_ivas->ism_extmeta_cnt ) ) != IVAS_ERR_OK )

#else

            if ( ( error = ivas_ism_metadata_dec( ivas_total_brate, st_ivas->nchan_ism, &( st_ivas->nchan_transport ), st_ivas->hIsmMetaData, st_ivas->hSCE, st_ivas->bfi, nb_bits_metadata, st_ivas->ism_mode, st_ivas->hISMDTX, NULL ) ) != IVAS_ERR_OK )

#endif

            {

                return error;

            }