Commit a0fdc85f authored by vaclav's avatar vaclav
Browse files

build warnings

parent b12b6b9a

lib_enc/ivas_masa_enc.c

+18 −27
Original line number Diff line number Diff line
@@ -67,20 +67,6 @@ static void reduce_metadata_further( MASA_ENCODER_HANDLE hMasa, IVAS_QMETADATA_H 
#endif

);



static void quantize_ratio_ism_vector( const float *ratio_ism, int16_t *idx, const int16_t nchan_ism, const float masa_to_total_energy_ratio, const int16_t idx_sep_object );



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



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



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



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



static void independent_coding_ratio_ism_idx( const int16_t ratio_ism_idx[MASA_FREQUENCY_BANDS][MAX_NUM_OBJECTS], const float *masa_to_total_energy_ratio, const int16_t nchan_ism, const int16_t numCodingBands, const int16_t bits_index, BSTR_ENC_HANDLE hMetaData );



static void remove_sep_obj( int16_t *diff_idx, const int16_t nchan_ism, const int16_t idx_sep_obj );



#else

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

#endif
@@ -764,6 +750,7 @@ ivas_error ivas_masa_enc_config( 
    {

#ifdef FIX_382_MASA_META_FRAMING_ASYNC

        detect_framing_async( hMasa ); /* detect the offset, set 1sf/4sf mode based on this. potentially also shift the metadata using a history buffer */



        if ( hMasa->data.sync_state.frame_mode == MASA_FRAME_1SF && hMasa->data.sync_state.prev_offset != 0 )

        {

            /* average over sub-frames */
@@ -2871,7 +2858,7 @@ static void transform_index_and_GR_encode( 
    int16_t *diff_idx,        /* i  : differenc eindex to encode    */

    const int16_t len,        /* i  : input length                  */

    const int16_t GR_order,   /* i  : GR order                      */

    BSTR_ENC_HANDLE hMetaData /* i/o: bitstream                     */

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

)

{

    int16_t i;
@@ -2893,7 +2880,7 @@ static void transform_index_and_GR_encode( 
static int16_t try_differential(

    const int16_t numCodingBands,

    const float *masa_to_total_energy_ratio,

    const int16_t ratio_ism_idx[MASA_FREQUENCY_BANDS][MAX_NUM_OBJECTS],

    int16_t ratio_ism_idx[MASA_FREQUENCY_BANDS][MAX_NUM_OBJECTS],

    const int16_t nchan_ism,

    const int16_t bits_index,

    int16_t *p_b_signif )
@@ -2945,7 +2932,7 @@ static void differential_coding_first_subframe( 
    BSTR_ENC_HANDLE hMetaData,

    const float *masa_to_total_energy_ratio,

    const int16_t b_signif,

    const int16_t ratio_ism_idx[MASA_FREQUENCY_BANDS][MAX_NUM_OBJECTS],

    int16_t ratio_ism_idx[MASA_FREQUENCY_BANDS][MAX_NUM_OBJECTS],

    const int16_t nchan_ism,

    const int16_t numCodingBands,

    const int16_t bits_index )
@@ -2982,12 +2969,12 @@ static void differential_coding_first_subframe( 




static void independent_coding_ratio_ism_idx(

    const int16_t ratio_ism_idx[MASA_FREQUENCY_BANDS][MAX_NUM_OBJECTS], /* i  : ISM ratios                */

    int16_t ratio_ism_idx[MASA_FREQUENCY_BANDS][MAX_NUM_OBJECTS], /* i  : ISM ratios                */

    const float *masa_to_total_energy_ratio,                      /* i  : MASA to total ratios      */

    const int16_t nchan_ism,                                      /* i  : number of objects         */

    const int16_t numCodingBands,                                 /* i  : number of subbands        */

    const int16_t bits_index,                                     /* i  : number of bits per index  */

    BSTR_ENC_HANDLE hMetaData                                           /* i/o: bitstream                 */

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

)

{

    int16_t b, index;
@@ -3040,14 +3027,16 @@ static void estimate_bits_subband_ism_ratio( 


    /* take difference with respect to previous subframe */

    v_sub_s( ratio_ism_idx, ratio_ism_idx_ref, diff_idx, nchan_ism );



    if ( shift_one )

    {

        remove_sep_obj( diff_idx, nchan_ism, idx_sep_obj );

    }



    /* transform difference index into positive */

    transform_difference_index( diff_idx, diff_idx, nchan_ism - 1 - shift_one );

    /* GR encoding */



    /* GR encoding */

    for ( i = 0; i < nchan_ism - 1 - shift_one; i++ )

    {

        nbits0 += ivas_qmetadata_encode_extended_gr_length( diff_idx[i], 100, 0 );
@@ -3062,11 +3051,11 @@ static void estimate_bits_subband_ism_ratio( 




static int16_t encode_ratio_ism_subframe(

    const int16_t ratio_ism_idx[MASA_FREQUENCY_BANDS][MAX_NUM_OBJECTS],

    int16_t ratio_ism_idx[MASA_FREQUENCY_BANDS][MAX_NUM_OBJECTS],

    const int16_t nchan_ism,

    const uint8_t numCodingBands,

    const int16_t sf,

    const int16_t ratio_ism_idx_prev_sf[MASA_FREQUENCY_BANDS][MAX_NUM_OBJECTS],

    int16_t ratio_ism_idx_prev_sf[MASA_FREQUENCY_BANDS][MAX_NUM_OBJECTS],

    BSTR_ENC_HANDLE hMetaData,

    const float *masa_to_total_energy_ratio,

    const int16_t shift_one,
@@ -3289,6 +3278,7 @@ static int16_t encode_ratio_ism_subframe( 
                    {

                        /* take difference with respect to previous subframe */

                        v_sub_s( ratio_ism_idx[0], ratio_ism_idx_prev_sf[0], diff_idx, nchan_ism );



                        if ( shift_one )

                        {

                            remove_sep_obj( diff_idx, nchan_ism, idx_sep_obj_local );
@@ -3478,8 +3468,10 @@ static void ivas_encode_masaism_metadata( 
                    assert( ( hMasa->data.energy_ratio_ism[sf][band][obj] >= 0 ) && ( hMasa->data.energy_ratio_ism[sf][band][obj] <= 1 ) );

                    ratio_ism[band][obj] = hMasa->data.energy_ratio_ism[sf][band][obj];

                }



                /* Quantize ISM ratios */

                quantize_ratio_ism_vector( ratio_ism[band], ratio_ism_idx[band], hMasa->data.nchan_ism, hQMetaData->masa_to_total_energy_ratio[sf][band], idx_separated_object );



                if ( n_ism_tmp == numCodingBands && ratio_ism_idx[band][idx_separated_object] != 0 && hQMetaData->masa_to_total_energy_ratio[sf][band] < MASA2TOTAL_THR )

                {

                    i = 0;
@@ -3553,7 +3545,6 @@ static void ivas_encode_masaism_metadata( 
                encode_ratio_ism_subframe( ratio_ism_idx, hMasa->data.nchan_ism, numCodingBands, sf, ratio_ism_idx_prev_sf, hMetaData, hQMetaData->masa_to_total_energy_ratio[sf], 0, idx_separated_object );

            }





            /* calculate quantized ISM ratios */

            /* save previous subframe indexes */

            for ( band = 0; band < numCodingBands; band++ )