Commit aa6aa774 authored by vaclav's avatar vaclav
Browse files

rename remaining comments 'ISm' -> 'ISM'

parent fb2788bc

apps/decoder.c

+1 −1
Original line number Diff line number Diff line
@@ -1714,7 +1714,7 @@ static ivas_error decodeG192( 
            }

        }



        /* Write ISm metadata to external file(s) */

        /* Write ISM metadata to external file(s) */

        if ( decodedGoodFrame && arg.outputFormat == IVAS_DEC_OUTPUT_EXT )

        {

            if ( bsFormat == IVAS_DEC_BS_OBJ )

apps/encoder.c

+1 −1
Original line number Diff line number Diff line
@@ -706,7 +706,7 @@ int main( 
        }

#endif



        /* Read ISm input metadata */

        /* Read ISM input metadata */

        for ( i = 0; i < numIsmInputs; ++i )

        {

            if ( ismReaders[i] == NULL )

apps/renderer.c

+1 −1
Original line number Diff line number Diff line
@@ -1918,7 +1918,7 @@ void getMetadataFromFileReader( 


    if ( ( error = IsmFileReader_readNextFrame( ismReader, &ismMetadata ) ) != IVAS_ERR_OK )

    {

        fprintf( stderr, "\nError (%s) while reading ism metadata from: %s\n\n", ivas_error_to_string( error ), IsmFileReader_getFilePath( ismReader ) );

        fprintf( stderr, "\nError (%s) while reading ISM metadata from: %s\n\n", ivas_error_to_string( error ), IsmFileReader_getFilePath( ismReader ) );

        exit( -1 );

    }

lib_com/ivas_cnst.h

+3 −3
Original line number Diff line number Diff line
@@ -293,7 +293,7 @@ typedef enum 




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

 * ISm Constants

 * ISM Constants

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



#define ISM_NB_BITS_METADATA_NOMINAL            ( ( SCE_CORE_16k_LOW_LIMIT - ACELP_16k_LOW_LIMIT ) / FRAMES_PER_SEC ) /* nominal number of metadata bits - used for configuration of Core-Coder modules */
@@ -353,13 +353,13 @@ typedef enum 
} ISM_MODE;





/* ISm metadata bitstream */

/* ISM metadata bitstream */

enum

{

    IND_ISM_NUM_OBJECTS,

#ifdef TD5

    IND_ISM_EXTENDED_FLAG = IND_ISM_NUM_OBJECTS + MAX_NUM_OBJECTS,

    IND_ISM_METADATA_FLAG = IND_ISM_EXTENDED_FLAG + MAX_NUM_OBJECTS, /* EN2VE: Is this not supposed to be in the loop part below, since it is one per ISm? */

    IND_ISM_METADATA_FLAG = IND_ISM_EXTENDED_FLAG + MAX_NUM_OBJECTS, /* EN2VE: Is this not supposed to be in the loop part below, since it is one per ISM? */

#else

    IND_ISM_METADATA_FLAG = IND_ISM_NUM_OBJECTS + MAX_NUM_OBJECTS,

#endif

lib_com/ivas_ism_com.c

+17 −15
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ 


#define FRMS_PER_SECOND ( 1000000000 / FRAME_SIZE_NS )



#define BRATE_ISM_INACTIVE 2450 /* CoreCoder bitrate in ISm inactive frames */

#define BRATE_ISM_INACTIVE 2450 /* CoreCoder bitrate in ISM inactive frames */

#define BITS_ISM_INACTIVE  ( BRATE_ISM_INACTIVE / FRMS_PER_SECOND )



#define BETA_ISM_LOW_IMP    0.6f
@@ -88,7 +88,7 @@ static void bitbudget_to_brate( 
 *-------------------------------------------------------------------*/



ivas_error ivas_ism_config(

    const int32_t ism_total_brate,           /* i  : ISms total bitrate           */

    const int32_t ism_total_brate,           /* i  : ISM total bitrate              */

    const int16_t nchan_transport,           /* i  : number of transport channels   */

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

    ISM_METADATA_HANDLE hIsmMeta[],          /* i/o: ISM metadata handles           */
@@ -129,7 +129,7 @@ ivas_error ivas_ism_config( 
    bits_element[n_ISms - 1] += bits_ism % n_ISms;

    bitbudget_to_brate( bits_element, element_brate, n_ISms );



    /* count ISm common signaling bits */

    /* count ISM common signaling bits */

    if ( hIsmMeta != NULL )

    {

#ifdef TD5
@@ -296,7 +296,7 @@ ivas_error ivas_ism_config( 
#ifdef DEBUGGING

                        if ( bits_CoreCoder[ch] == SID_2k40 / FRAMES_PER_SEC )

                        {

                            printf( "\nWarning: ISm bitbudget equal to SID!\n" );

                            printf( "\nWarning: ISM bitbudget equal to SID!\n" );

                        }

#endif

                        break;
@@ -315,7 +315,7 @@ ivas_error ivas_ism_config( 
        tmpL = sum_l( total_brate, n_ISms ) + bits_side * FRMS_PER_SECOND;

        if ( sum_l( element_brate, n_ISms ) != tmpL )

        {

            return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "\nError: Mismatch in ISm bit-budget distribution. Exiting!\n" );

            return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "\nError: Mismatch in ISM bit-budget distribution. Exiting!\n" );

        }

    }

#endif
@@ -327,7 +327,7 @@ ivas_error ivas_ism_config( 
/*-------------------------------------------------------------------*

 * ivas_ism_reset_metadata()

 *

 * Reset ISm metadata parameters

 * Reset ISM metadata parameters

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



void ivas_ism_reset_metadata(
@@ -345,10 +345,11 @@ void ivas_ism_reset_metadata( 
    return;

}





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

 * ivas_ism_reset_metadata_API()

 *

 * Reset ISm metadata parameters

 * Reset ISM metadata parameters

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



void ivas_ism_reset_metadata_API(
@@ -361,6 +362,7 @@ void ivas_ism_reset_metadata_API( 
    return;

}





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

 * ism_quant_meta()

 *