Commit 35d18c1f authored by emerit's avatar emerit
Browse files

on going

parent 8d8ddffa

apps/encoder.c

+2 −2
Original line number Diff line number Diff line
@@ -609,7 +609,7 @@ int main( 
     * - Write the parameters into output bitstream file

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



    while ( 1 )

    while ( 1 && frame <= 60 )

    {

        /* Read the input data */

        if ( ( error = AudioFileReader_read( audioReader, pcmBuf, pcmBufSize, &numSamplesRead ) ) != IVAS_ERR_OK )

lib_com/ivas_cnst.h

+7 −4
Original line number Diff line number Diff line
@@ -374,19 +374,22 @@ typedef enum 
enum

{

    IND_ISM_NUM_OBJECTS,

#ifdef ISM_NON_DIEGETIC_PAN    

#ifdef ISM_NON_DIEGETIC_PAN_SID    

    IND_ISM_METADATA_FLAG = IND_ISM_NUM_OBJECTS + MAX_NUM_OBJECTS,   

    IND_ISM_VAD_FLAG = IND_ISM_METADATA_FLAG + MAX_NUM_OBJECTS,

    IND_ISM_NOISY_SPEECH_FLAG,

#else

    IND_ISM_EXTENDED_FLAG = IND_ISM_NUM_OBJECTS + MAX_NUM_OBJECTS,

#ifdef ISM_NON_DIEGETIC_PAN    

    IND_ISM_EXTENDED_NDP_FLAG, 

#endif    

    IND_ISM_METADATA_FLAG,

    IND_ISM_VAD_FLAG = IND_ISM_METADATA_FLAG + MAX_NUM_OBJECTS,

    IND_ISM_NOISY_SPEECH_FLAG = IND_ISM_VAD_FLAG + MAX_NUM_OBJECTS,

#endif    

    IND_ISM_SCE_ID_DTX,

    IND_ISM_DTX_COH_SCA,

#ifdef ISM_NON_DIEGETIC_PAN    

#ifdef ISM_NON_DIEGETIC_PAN_SID    

    IND_ISM_EXTENDED_FLAG = IND_ISM_DTX_COH_SCA + MAX_NUM_OBJECTS,

    IND_ISM_EXTENDED_NDP_FLAG, 

    /* ------------- loop for objects -------------- */

lib_com/ivas_ism_com.c

+2 −2
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ ivas_error ivas_ism_config( 
        {

            nb_bits_metadata[0] += ISM_EXTENDED_METADATA_BITS;

#ifdef ISM_NON_DIEGETIC_PAN

            if ( ism_extended_metadata_flag )

            if ( ism_extended_metadata_flag & 0x2 )

            {

                nb_bits_metadata[0] += ISM_METADATA_IS_NDP_BITS;

            }

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -145,7 +145,7 @@ 
#define NON_DIEGETIC_PAN

#define FIX_CRASH_EVS_BITSTREAM_WITH_OUTPUT

#define ISM_NON_DIEGETIC_PAN

#define ISM_NON_DIEGETIC_PAN_SID

//#define ISM_NON_DIEGETIC_PAN_SID



#define FIX_CLANG_WARNING

lib_dec/ivas_ism_metadata_dec.c

+21 −16
Original line number Diff line number Diff line
@@ -225,7 +225,7 @@ ivas_error ivas_ism_metadata_dec( 
        }





#ifdef ISM_NON_DIEGETIC_PAN

#ifdef ISM_NON_DIEGETIC_PAN_SID

        /* Read ISM present flags (one per object) */

        for ( ch = 0; ch < *nchan_transport; ch++ )

        {
@@ -250,12 +250,18 @@ ivas_error ivas_ism_metadata_dec( 
        }

#endif



#ifndef ISM_NON_DIEGETIC_PAN

#ifndef ISM_NON_DIEGETIC_PAN_SID



        /* read extended metadata presence flag */

        if ( ism_total_brate >= ISM_EXTENDED_METADATA_BRATE )

        {

            ism_extmeta_bitstream = get_next_indice( st0, ISM_EXTENDED_METADATA_BITS );

#ifdef ISM_NON_DIEGETIC_PAN

            if ( ism_extmeta_bitstream )

            {

                ism_extmeta_bitstream += get_next_indice( st0, ISM_METADATA_IS_NDP_BITS );

            }

#endif

        }

        /* Apply hysteresis in case rate switching causes fluctuation in presence of extended metadata */

        if ( *ism_extmeta_active == -1 || *ism_extmeta_active == ism_extmeta_bitstream ) /* If first frame or bitstream matches internal state */
@@ -275,7 +281,7 @@ ivas_error ivas_ism_metadata_dec( 
#endif





#ifndef ISM_NON_DIEGETIC_PAN

#ifndef ISM_NON_DIEGETIC_PAN_SID

        /* Read ISM present flags (one per object) */

        for ( ch = 0; ch < *nchan_transport; ch++ )

        {
@@ -313,7 +319,7 @@ ivas_error ivas_ism_metadata_dec( 
        }





#ifdef ISM_NON_DIEGETIC_PAN

#ifdef ISM_NON_DIEGETIC_PAN_SID

        /* read extended metadata presence flag */

        if ( ism_total_brate >= ISM_EXTENDED_METADATA_BRATE )

        {
@@ -1076,10 +1082,9 @@ void ivas_ism_metadata_sid_dec( 


        for ( ch = 0; ch < nchan_ism; ch++ )

        {



            hIsmMetaData = hIsmMeta[ch];

            if ( md_diff_flag[ch] == 1 )

            {

                hIsmMetaData = hIsmMeta[ch];

#ifdef ISM_NON_DIEGETIC_PAN_SID

                if ( ism_extmeta_bitstream )

                {