Commit ad09b997 authored by vaclav's avatar vaclav
Browse files

rename MASA_DECODER_EXT_OUT_META_HANDLE to IVAS_MASA_DECODER_EXT_OUT_META_HANDLE

parent 64d562a0

apps/decoder.c

+7 −7
Original line number Diff line number Diff line
@@ -1976,7 +1976,7 @@ static ivas_error initOnFirstGoodFrame( 
            if ( numInitialBadFrames > 0 )

            {

                /* Duplicate good first frame metadata to fill the beginning of stream. */

                MASA_DECODER_EXT_OUT_META_HANDLE hMasaExtOutMeta = NULL;

                IVAS_MASA_DECODER_EXT_OUT_META_HANDLE hMasaExtOutMeta = NULL;

                if ( ( error = IVAS_DEC_GetMasaMetadata( hIvasDec, &hMasaExtOutMeta, 0 ) ) != IVAS_ERR_OK )

                {

                    fprintf( stderr, "\nError in IVAS_DEC_GetMasaMetadata: %s\n", IVAS_DEC_GetErrorMessage( error ) );
@@ -2547,7 +2547,7 @@ static ivas_error decodeG192( 
            }

            else if ( bsFormat == IVAS_DEC_BS_MASA )

            {

                MASA_DECODER_EXT_OUT_META_HANDLE hMasaExtOutMeta;

                IVAS_MASA_DECODER_EXT_OUT_META_HANDLE hMasaExtOutMeta;

                if ( ( error = IVAS_DEC_GetMasaMetadata( hIvasDec, &hMasaExtOutMeta, 0 ) ) != IVAS_ERR_OK )

                {

                    fprintf( stderr, "\nError in IVAS_DEC_GetMasaMetadata: %s\n", IVAS_DEC_GetErrorMessage( error ) );
@@ -2709,7 +2709,7 @@ static ivas_error decodeG192( 
            }

            else if ( bsFormat == IVAS_DEC_BS_MASA )

            {

                MASA_DECODER_EXT_OUT_META_HANDLE hMasaExtOutMeta;

                IVAS_MASA_DECODER_EXT_OUT_META_HANDLE hMasaExtOutMeta;

                if ( ( error = IVAS_DEC_GetMasaMetadata( hIvasDec, &hMasaExtOutMeta, 0 ) ) != IVAS_ERR_OK )

                {

                    fprintf( stderr, "\nError in IVAS_DEC_GetMasaMetadata: %s\n", IVAS_DEC_GetErrorMessage( error ) );
@@ -3139,7 +3139,7 @@ static ivas_error decodeG192( 


            if ( bsFormat == IVAS_DEC_BS_MASA || bsFormat == IVAS_DEC_BS_MASA_ISM )

            {

                MASA_DECODER_EXT_OUT_META_HANDLE hMasaExtOutMeta;

                IVAS_MASA_DECODER_EXT_OUT_META_HANDLE hMasaExtOutMeta;

                if ( ( error = IVAS_DEC_GetMasaMetadata( hIvasDec, &hMasaExtOutMeta, 0 ) ) != IVAS_ERR_OK )

                {

                    fprintf( stderr, "\nError in IVAS_DEC_GetMasaMetadata: %s\n", IVAS_DEC_GetErrorMessage( error ) );
@@ -3746,7 +3746,7 @@ static ivas_error decodeVoIP( 


                if ( bsFormat == IVAS_DEC_BS_MASA || bsFormat == IVAS_DEC_BS_MASA_ISM )

                {

                    MASA_DECODER_EXT_OUT_META_HANDLE hMasaExtOutMeta;

                    IVAS_MASA_DECODER_EXT_OUT_META_HANDLE hMasaExtOutMeta;

                    if ( ( error = IVAS_DEC_GetMasaMetadata( hIvasDec, &hMasaExtOutMeta, 1 ) ) != IVAS_ERR_OK )

                    {

                        fprintf( stderr, "\nError in IVAS_DEC_GetMasaMetadata: %s\n", IVAS_DEC_GetErrorMessage( error ) );
@@ -4181,7 +4181,7 @@ static ivas_error decodeVariableSpeed( 


            if ( bsFormat == IVAS_DEC_BS_MASA || bsFormat == IVAS_DEC_BS_MASA_ISM )

            {

                MASA_DECODER_EXT_OUT_META_HANDLE hMasaExtOutMeta;

                IVAS_MASA_DECODER_EXT_OUT_META_HANDLE hMasaExtOutMeta;

                if ( ( error = IVAS_DEC_GetMasaMetadata( hIvasDec, &hMasaExtOutMeta, 1 ) ) != IVAS_ERR_OK )

                {

                    fprintf( stderr, "\nError in IVAS_DEC_GetMasaMetadata: %s\n", IVAS_DEC_GetErrorMessage( error ) );
@@ -4357,7 +4357,7 @@ static ivas_error decodeVariableSpeed( 


            if ( bsFormat == IVAS_DEC_BS_MASA || bsFormat == IVAS_DEC_BS_MASA_ISM )

            {

                MASA_DECODER_EXT_OUT_META_HANDLE hMasaExtOutMeta;

                IVAS_MASA_DECODER_EXT_OUT_META_HANDLE hMasaExtOutMeta;

                if ( ( error = IVAS_DEC_GetMasaMetadata( hIvasDec, &hMasaExtOutMeta, 0 ) ) != IVAS_ERR_OK )

                {

                    fprintf( stderr, "\nError in IVAS_DEC_GetMasaMetadata: %s\n", IVAS_DEC_GetErrorMessage( error ) );

apps/renderer.c

+1 −1
Original line number Diff line number Diff line
@@ -1984,7 +1984,7 @@ int main( 
        {

            IVAS_REND_AudioConfigType inputType1;

            IVAS_REND_AudioConfigType inputType2;

            MASA_DECODER_EXT_OUT_META_HANDLE hMetaOutput;

            IVAS_MASA_DECODER_EXT_OUT_META_HANDLE hMetaOutput;

            int16_t numInputFormats;



            inputType1 = IVAS_REND_AUDIO_CONFIG_TYPE_UNKNOWN;

lib_com/common_api_types.h

+1 −1
Original line number Diff line number Diff line
@@ -203,7 +203,7 @@ typedef enum 
} IVAS_HEAD_ORIENT_TRK_T;



typedef struct ivas_masa_metadata_frame_struct *IVAS_MASA_METADATA_HANDLE;

typedef struct ivas_masa_decoder_ext_out_meta_struct *MASA_DECODER_EXT_OUT_META_HANDLE;

typedef struct ivas_masa_decoder_ext_out_meta_struct *IVAS_MASA_DECODER_EXT_OUT_META_HANDLE;



typedef struct TDREND_HRFILT_FiltSet_struct *IVAS_DEC_HRTF_HANDLE;

typedef struct ivas_hrtfs_crend_structure *IVAS_DEC_HRTF_CREND_HANDLE;

lib_dec/lib_dec.h

+1 −1
Original line number Diff line number Diff line
@@ -225,7 +225,7 @@ ivas_error IVAS_DEC_GetObjectMetadata( 
/*! r: error code */

ivas_error IVAS_DEC_GetMasaMetadata(

    IVAS_DEC_HANDLE hIvasDec,                          /* i/o: IVAS decoder handle                                              */

    MASA_DECODER_EXT_OUT_META_HANDLE *hMasaExtOutMeta, /* o  : pointer to handle, which will be set to point to metadata from the most recently decoded frame */

    IVAS_MASA_DECODER_EXT_OUT_META_HANDLE *hMasaExtOutMeta, /* o  : pointer to handle, which will be set to point to metadata from the most recently decoded frame */

    uint8_t getFromJbmBuffer                           /* i  : get metadata from a JBM buffer                                   */

);

lib_rend/ivas_stat_rend.h

+2 −0
Original line number Diff line number Diff line
@@ -1630,6 +1630,8 @@ typedef enum 
 * Multichannel MASA (McMASA) analysis structure

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



typedef struct ivas_masa_decoder_ext_out_meta_struct *MASA_DECODER_EXT_OUT_META_HANDLE;



typedef struct ivas_mcmasa_ana_data_structure

{

    int16_t nbands;