Commit f31a5113 authored by vaclav's avatar vaclav
Browse files

formatting

parent 1d6ebb47

apps/encoder.c

+3 −3
Original line number Diff line number Diff line
@@ -97,6 +97,7 @@ typedef union _EncInputFormatConfig 
        IVAS_ENC_MASA_VARIANT masaVariant;

    } masa_ism;

#endif



} EncInputFormatConfig;



/* Struct for storing cmdln arguments */
@@ -542,7 +543,6 @@ int main( 
        }

    }





#ifdef MASA_AND_OBJECTS

    const int16_t numIsmInputs = ( arg.inputFormat == IVAS_ENC_INPUT_ISM || arg.inputFormat == IVAS_ENC_INPUT_MASA_ISM ) ? arg.inputFormatConfig.ism.numObjects : 0;

#else
@@ -1809,7 +1809,7 @@ static void usage_enc( void ) 
    fprintf( stdout, "                      for IVAS SBA, MASA, MC R=(13200, 16400, 24400, 32000, 48000, 64000, 80000, \n" );

    fprintf( stdout, "                                                96000, 128000, 160000, 192000, 256000, 384000, 512000) \n" );

#ifdef MASA_AND_OBJECTS

    fprintf( stdout, "                      for IVAS MASA and objects R = (13200, 16400, 24400, 32000, 48000, 64000, 96000, 128000, \n" );

    fprintf( stdout, "                      for IVAS objects-MASA R =(13200, 16400, 24400, 32000, 48000, 64000, 96000, 128000, \n" );

    fprintf( stdout, "                                                160000, 192000, 256000, 384000, 512000)\n" );

#endif

    fprintf( stdout, "                      Alternatively, R can be a bitrate switching file which consists of R values\n" );

lib_com/ivas_prot.h

+4 −4
Original line number Diff line number Diff line
@@ -5090,7 +5090,7 @@ ivas_error ivas_masa_encode( 
    const int16_t ism_imp                                       /* i  : importance of separated object                  */

#ifdef OMASA_ENERGIES

    ,

    int16_t  flag_omasa_brate                                   /* i: flag for using less bitrate for objects in OMASA  */

    const int16_t  flag_omasa_brate                             /* i  : flag for using less bitrate for objects in OMASA*/

#endif

#endif

);
@@ -5404,7 +5404,7 @@ ivas_error vbap_init_data( 
    const int16_t num_speaker_nodes                             /* i  : number of speaker nodes in the set                       */

#ifdef MASA_AND_OBJECTS

    ,

    const int16_t support_object_mode                           /* i  : init VBAP also for object panning mode                   */

    const IVAS_FORMAT ivas_format                               /* i  : IVAS format                                              */

#endif

);

lib_com/ivas_stat_com.h

+2 −0
Original line number Diff line number Diff line
@@ -455,6 +455,7 @@ typedef struct ivas_omasa_meta_struct 
    uint8_t num_dirs;

    MASA_DIRECTIONAL_SPATIAL_META directional_meta[MASA_MAXIMUM_DIRECTIONS];

    MASA_COMMON_SPATIAL_META common_meta;



} OMASA_SPATIAL_META, *OMASA_SPATIAL_META_HANDLE;

#endif
@@ -570,6 +571,7 @@ typedef struct ivas_masa_qmetadata_frame_struct 
#ifdef MASA_AND_OBJECTS

    float masa_to_total_energy_ratio[MAX_PARAM_SPATIAL_SUBFRAMES][MASA_FREQUENCY_BANDS]; /* TODO Nokia: This should be moved to some other place and reserved only when needed. */

#endif



} IVAS_QMETADATA, *IVAS_QMETADATA_HANDLE;

lib_dec/ivas_cpe_dec.c

+1 −0
Original line number Diff line number Diff line
@@ -83,6 +83,7 @@ ivas_error ivas_cpe_dec( 
    int32_t element_brate_ref;

#endif

#endif



    error = IVAS_ERR_OK;



    push_wmops( "ivas_cpe_dec" );

lib_dec/ivas_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -71,10 +71,10 @@ ivas_error ivas_dec( 
    float pan_left, pan_right;

    ivas_error error;

    float *p_output[MAX_OUTPUT_CHANNELS];



#ifdef MASA_AND_OBJECTS

    int32_t ism_total_brate;

#endif



    error = IVAS_ERR_OK;



    push_wmops( "ivas_dec" );