Commit e2bca22e authored by vaclav's avatar vaclav
Browse files

formatting

parent 75143651

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -160,7 +160,7 @@ 


#define MASA_AND_OBJECTS                                /* Nokia: Combination of MASA and objects */

#ifdef MASA_AND_OBJECTS

//#define OMASA_BRATE                                     /* VA: combined format bit-budget distribution */

#define OMASA_BRATE                                     /* VA: combined format bit-budget distribution */

#define MASAISM_EDIT_OBJECTS                            /* Nokia: Temporary command line editing of object directions in the decoder */

#endif

lib_enc/ivas_masa_enc.c

+3 −10
Original line number Diff line number Diff line
@@ -61,25 +61,18 @@ static int16_t encode_lfe_to_total_energy_ratio( MASA_ENCODER_HANDLE hMasa, BSTR 
#ifdef MASA_AND_OBJECTS

static void ivas_merge_masa_metadatas( MASA_ENCODER_HANDLE hMasa, IVAS_QMETADATA_HANDLE hQMeta );



static void ivas_encode_masaism_metadata( MASA_ENCODER_HANDLE hMasa,

                                          IVAS_QMETADATA_HANDLE hQMetaData, /* i/o: q_metadata handle                       */

                                          BSTR_ENC_HANDLE hMetaData,        /* i/o: metadata bitstream handle               */

                                          ISM_METADATA_HANDLE hIsmMeta[],   /* i/o: ISM metadata handles            */

                                          int16_t low_bitrate_mode,         /* i: is low bitrate more? 1/0          */

                                          int16_t omasa_nbands,

                                          int16_t omasa_nblocks



);

static void ivas_encode_masaism_metadata( MASA_ENCODER_HANDLE hMasa, IVAS_QMETADATA_HANDLE hQMetaData, BSTR_ENC_HANDLE hMetaData, ISM_METADATA_HANDLE hIsmMeta[], int16_t low_bitrate_mode, int16_t omasa_nbands, int16_t omasa_nblocks );



static void reduce_metadata_further( MASA_ENCODER_HANDLE hMasa, IVAS_QMETADATA_HANDLE hqmetadata, const IVAS_FORMAT ivas_format, const ISM_MODE ism_mode );





static void quantize_ratio_ism_vector( float *ratio_ism, int16_t *idx, int16_t no_ism, float masa_to_total_energy_ratio );



static int16_t index_slice_enum( const int16_t *ratio_ism_idx, int16_t no_ism );



static int16_t encode_ratio_ism_subframe( int16_t ratio_ism_idx[MASA_FREQUENCY_BANDS][MAX_NUM_OBJECTS], int16_t no_ism, int16_t numCodingBands, int16_t sf, int16_t ratio_ism_idx_prev_sf[MASA_FREQUENCY_BANDS][MAX_NUM_OBJECTS], BSTR_ENC_HANDLE hMetaData, const float *masa_to_total_energy_ratio );



static void transform_index_and_GR_encode( int16_t *diff_idx, int16_t len, int16_t GR_order, BSTR_ENC_HANDLE hMetaData );



static void transform_difference_index( int16_t *diff_idx, int16_t *idx, int16_t len );

#else

static void reduce_metadata_further( MASA_ENCODER_HANDLE hMasa, IVAS_QMETADATA_HANDLE hqmetadata, const IVAS_FORMAT ivas_format );