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

remove header from prot.h

parent 8cecc237

lib_com/ivas_prot.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -5795,11 +5795,11 @@ void ivas_omasa_separate_object_render( 
    float output_f[][L_FRAME48k],                               /* i/o: output signals                          */

    float output_f[][L_FRAME48k],                               /* i/o: output signals                          */

    const int16_t output_frame                                  /* i  : output frame length per channel         */

    const int16_t output_frame                                  /* i  : output frame length per channel         */

);

);



#ifndef FIX__657_REMOVE_EDITING

void ivas_omasa_set_edited_objects(

void ivas_omasa_set_edited_objects(

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

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

);

);



#endif

void ivas_omasa_encode_masa_to_total(

void ivas_omasa_encode_masa_to_total(

    IVAS_QMETADATA_HANDLE hQMetaData,

    IVAS_QMETADATA_HANDLE hQMetaData,

    BSTR_ENC_HANDLE hMetaData,

    BSTR_ENC_HANDLE hMetaData,

lib_dec/ivas_masa_dec.c

+5 −13
Original line number Original line Diff line number Diff line
@@ -2486,7 +2486,7 @@ static int16_t ivas_decode_masaism_metadata( 
    return ( nb_bits_read - *next_bit_pos );

    return ( nb_bits_read - *next_bit_pos );

}

}







#ifndef FIX_657_REMOVE_EDITING

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

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

 * ivas_omasa_set_edited_objects()

 * ivas_omasa_set_edited_objects()

 *

 *
@@ -2497,19 +2497,11 @@ void ivas_omasa_set_edited_objects( 
    Decoder_Struct *st_ivas /* i/o: IVAS decoder structure */

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

)

)

{

{



    int16_t dir, sf;

    int16_t dir, sf;

    MASA_ISM_DATA_HANDLE hMasaIsmData;

    MASA_ISM_DATA_HANDLE hMasaIsmData;





    hMasaIsmData = st_ivas->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 */

    /* Set positions of the edited objects */

    if ( st_ivas->ism_mode == ISM_MASA_MODE_DISC )

    if ( st_ivas->ism_mode == ISM_MASA_MODE_DISC )

    {

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

            }

        }

        }

    }

    }

#endif



    return;

    return;

}

}



#endif

#endif
 
#endif