Commit cd731c72 authored by vaclav's avatar vaclav
Browse files

more editorial changes within MD5

parent c6c0d900

lib_com/ivas_ism_config.c

+2 −0
Original line number Diff line number Diff line
@@ -340,6 +340,7 @@ void ivas_ism_reset_metadata( 
    hIsmMeta->pitch = 0.0f;

    hIsmMeta->radius = 1.0f;

#endif



    return;

}
@@ -348,6 +349,7 @@ void ivas_ism_reset_metadata( 
 *

 * Reset ISm metadata parameters

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



void ivas_ism_reset_metadata_API(

    ISM_METADATA_HANDLE hIsmMeta /* i/o: ISM metadata handle     */

)

lib_com/ivas_rom_com.h

+2 −3
Original line number Diff line number Diff line
@@ -317,9 +317,8 @@ extern const float McMASA_LFEGain_vectors[64]; 


extern const float ism_azimuth_borders[4];

extern const float ism_elevation_borders[4];

#ifdef TD5

extern const float ism_radius_borders[4];

#endif // TD5





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

 * Param ISM ROM tables

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

lib_com/ivas_stat_com.h

+4 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ 
/*----------------------------------------------------------------------------------*

 * Declaration of ISm common (encoder & decoder) structure

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



#ifdef TD5

typedef struct

{
@@ -50,8 +51,10 @@ typedef struct 
    int16_t azimuth_diff_cnt;   /* FEC counter of consecutive differentially azimuth coded frames */

    int16_t last_elevation_idx; /* last frame index of coded elevation */

    int16_t elevation_diff_cnt; /* FEC counter of consecutive differentially elevation coded frames */



} ISM_METADATA_ANGLE, *ISM_METADATA_ANGLE_HANDLE;

#endif



/* ISM metadata handle (storage for one frame of read ISM metadata) */

typedef struct

{
@@ -73,6 +76,7 @@ typedef struct 
    int16_t last_elevation_idx; /* last frame index of coded elevation */

    int16_t elevation_diff_cnt; /* FEC counter of consecutive differentially elevation coded frames */

#endif



} ISM_METADATA_FRAME, *ISM_METADATA_HANDLE;

lib_dec/ivas_ism_dec.c

+0 −1
Original line number Diff line number Diff line
@@ -240,7 +240,6 @@ static ivas_error ivas_ism_bitrate_switching( 
 * - reconfigure the ISM format decoder

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



/*! r : ISM format mode */

ivas_error ivas_ism_dec_config(

    Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure              */

    const int16_t num_obj    /* i  : number of objects in the bitstream  */

lib_dec/ivas_ism_metadata_dec.c

+1 −0
Original line number Diff line number Diff line
@@ -265,6 +265,7 @@ ivas_error ivas_ism_metadata_dec( 
                        hIsmMetaData->azimuth = ism_dequant_meta( idx_azimuth, ism_azimuth_borders, 1 << ISM_AZIMUTH_NBITS );

                        hIsmMetaData->elevation = ism_dequant_meta( idx_elevation, ism_elevation_borders, 1 << ISM_ELEVATION_NBITS );



                        /* radius/raw/pitch dequantization */

                        if ( ism_extended_metadata_flag )

                        {

                            decode_angle_indices( st0, &( hIsmMetaData->angle[1] ), &flag_abs_orientation );