Commit 7a3216a3 authored by multrus's avatar multrus
Browse files

turn avg_elevation_index_initial, avg_elevation_offset into uint16_t

parent b9e29d83

lib_enc/ivas_qmetadata_enc.c

+7 −2
Original line number Diff line number Diff line
@@ -2551,7 +2551,12 @@ static int16_t ivas_qmetadata_entropy_encode_dir( 
    float avg_direction_vector[3], direction_vector[3], avg_azimuth, avg_elevation;

    int16_t avg_azimuth_alphabet, avg_elevation_alphabet;

    uint16_t avg_azimuth_index, avg_elevation_index;

#ifdef FIX_635_UBSAN_UNDEFINED_BEHAVIOUR_QMETA

    uint16_t avg_elevation_index_initial, avg_elevation_offset;

    int16_t avg_elevation_index_projected;

#else

    int16_t avg_elevation_index_initial, avg_elevation_offset, avg_elevation_index_projected;

#endif

    int16_t avg_azimuth_index_initial, avg_azimuth_offset, avg_azimuth_index_projected;



    int16_t elevation_bits_ec_best, azimuth_bits_ec_best;
@@ -2710,11 +2715,11 @@ static int16_t ivas_qmetadata_entropy_encode_dir( 
#ifdef FIX_635_UBSAN_UNDEFINED_BEHAVIOUR_QMETA

            if ( q_direction->cfg.mc_ls_setup != MC_LS_SETUP_INVALID )

            {

                avg_elevation_index = (uint16_t) ( avg_elevation_index_initial + avg_elevation_offset );

                avg_elevation_index = avg_elevation_index_initial + avg_elevation_offset;

            }

            else

            {

                avg_elevation_index = (uint16_t) ( avg_elevation_index_initial + ivas_qmetadata_dereorder_generic( avg_elevation_offset ) );

                avg_elevation_index = avg_elevation_index_initial + (uint16_t) ivas_qmetadata_dereorder_generic( avg_elevation_offset );

            }



            avg_elevation_index = (uint16_t) ( ( avg_elevation_index + avg_elevation_alphabet ) % avg_elevation_alphabet );