Commit 8cecc237 authored by advasila's avatar advasila
Browse files

remove two comments and move revert back to the initialization place of ism_is_edited

parent 0e182691

lib_dec/ivas_masa_dec.c

+13 −5
Original line number Diff line number Diff line
@@ -2363,7 +2363,7 @@ static int16_t ivas_decode_masaism_metadata( 


    nb_bits_read = *next_bit_pos;

    nbands = hQMetaData->q_direction->cfg.nbands;

    nblocks = hQMetaData->q_direction->cfg.nblocks; /* To do: what if other value than 4? */

    nblocks = hQMetaData->q_direction->cfg.nblocks; 



    /* Read MASA-to-total energy ratios */

    ivas_omasa_decode_masa_to_total( bit_stream, next_bit_pos, hQMetaData->masa_to_total_energy_ratio, nbands, nblocks );
@@ -2486,7 +2486,7 @@ static int16_t ivas_decode_masaism_metadata( 
    return ( nb_bits_read - *next_bit_pos );

}



#ifndef FIX_657_REMOVE_EDITING



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

 * ivas_omasa_set_edited_objects()

 *
@@ -2501,7 +2501,15 @@ void ivas_omasa_set_edited_objects( 
    MASA_ISM_DATA_HANDLE hMasaIsmData;



    hMasaIsmData = st_ivas->hMasaIsmData;



#ifdef FIX_657_REMOVE_EDITING

    if ( st_ivas->ism_mode != ISM_MASA_MODE_DISC && st_ivas->ism_mode != ISM_MASA_MODE_MASA_ONE_OBJ )

    {

        for ( dir = 0; dir < MAX_NUM_OBJECTS; dir++ )

        {

            hMasaIsmData->ism_is_edited[dir] = 0;

        }

    }

#else

    /* Set positions of the edited objects */

    if ( st_ivas->ism_mode == ISM_MASA_MODE_DISC )

    {
@@ -2549,8 +2557,8 @@ void ivas_omasa_set_edited_objects( 
            }

        }

    }



#endif

    return;

}

#endif



#endif

lib_enc/ivas_qmetadata_enc.c

+1 −1
Original line number Diff line number Diff line
@@ -6249,7 +6249,7 @@ static int16_t write_stream_dct_coeffs_omasa( 
    bits_pos = hMetaData->nb_bits_tot;

    if ( low_bitrate_mode == 1 )

    {

        max_bits = 50; /* To do : find optimal allowed value*/

        max_bits = 50; 

    }

    else

    {