Commit 4e6c3b5e authored by Jouni Paulus's avatar Jouni Paulus
Browse files

rename switch to include issue number: NONBE_FIX_984_OMASA_EXT_OUTPUT

parent 20c86c68

apps/decoder.c

+7 −7
Original line number Diff line number Diff line
@@ -2080,7 +2080,7 @@ static ivas_error initOnFirstGoodFrame( 


                for ( int16_t j = 0; j < numInitialBadFrames; ++j )

                {

#ifdef OMASA_EXT_OUTPUT

#ifdef NONBE_FIX_984_OMASA_EXT_OUTPUT

                    float delayMs = (float) ( pFullDelayNumSamples[0] ) / (float) ( *delayTimeScale );

                    if ( ( error = MasaFileWriter_writeFrame( *ppMasaWriter, hMasaExtOutMeta, &delayMs ) ) != IVAS_ERR_OK )

#else
@@ -2592,7 +2592,7 @@ static ivas_error decodeG192( 
            if ( bsFormat == IVAS_DEC_BS_MASA || bsFormat == IVAS_DEC_BS_MASA_ISM )

            {

                IVAS_MASA_DECODER_EXT_OUT_META_HANDLE hMasaExtOutMeta;

#ifdef OMASA_EXT_OUTPUT

#ifdef NONBE_FIX_984_OMASA_EXT_OUTPUT

                int16_t fullDelayNumSamples[3];

                float delayMs;
@@ -2608,7 +2608,7 @@ static ivas_error decodeG192( 
                    goto cleanup;

                }



#ifdef OMASA_EXT_OUTPUT

#ifdef NONBE_FIX_984_OMASA_EXT_OUTPUT

                delayMs = (float) ( fullDelayNumSamples[0] ) / (float) ( delayTimeScale );

                if ( ( error = MasaFileWriter_writeFrame( masaWriter, hMasaExtOutMeta, &delayMs ) ) != IVAS_ERR_OK )

#else
@@ -2748,7 +2748,7 @@ static ivas_error decodeG192( 
            if ( bsFormat == IVAS_DEC_BS_MASA || bsFormat == IVAS_DEC_BS_MASA_ISM )

            {

                IVAS_MASA_DECODER_EXT_OUT_META_HANDLE hMasaExtOutMeta;

#ifdef OMASA_EXT_OUTPUT

#ifdef NONBE_FIX_984_OMASA_EXT_OUTPUT

                int16_t fullDelayNumSamples[3];

                float delayMs;
@@ -2763,7 +2763,7 @@ static ivas_error decodeG192( 
                    goto cleanup;

                }



#ifdef OMASA_EXT_OUTPUT

#ifdef NONBE_FIX_984_OMASA_EXT_OUTPUT

                delayMs = (float) ( fullDelayNumSamples[0] ) / (float) ( delayTimeScale );

                if ( ( error = MasaFileWriter_writeFrame( masaWriter, hMasaExtOutMeta, &delayMs ) ) != IVAS_ERR_OK )

#else
@@ -3443,7 +3443,7 @@ static ivas_error decodeVoIP( 
                if ( bsFormat == IVAS_DEC_BS_MASA || bsFormat == IVAS_DEC_BS_MASA_ISM )

                {

                    IVAS_MASA_DECODER_EXT_OUT_META_HANDLE hMasaExtOutMeta;

#ifdef OMASA_EXT_OUTPUT

#ifdef NONBE_FIX_984_OMASA_EXT_OUTPUT

                    int16_t fullDelayNumSamples[3];

                    float delayMs;
@@ -3459,7 +3459,7 @@ static ivas_error decodeVoIP( 
                        goto cleanup;

                    }



#ifdef OMASA_EXT_OUTPUT

#ifdef NONBE_FIX_984_OMASA_EXT_OUTPUT

                    delayMs = (float) ( fullDelayNumSamples[0] ) / (float) ( delayTimeScale );

                    if ( ( error = MasaFileWriter_writeFrame( masaWriter, hMasaExtOutMeta, &delayMs ) ) != IVAS_ERR_OK )

#else

apps/renderer.c

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

            }



#ifdef OMASA_EXT_OUTPUT

#ifdef NONBE_FIX_984_OMASA_EXT_OUTPUT

            if ( ( error = MasaFileWriter_writeFrame( masaWriter, hMetaOutput, NULL ) ) != IVAS_ERR_OK ) /* NULL -> use default metadata delay settings */

#else

            if ( ( error = MasaFileWriter_writeFrame( masaWriter, hMetaOutput ) ) != IVAS_ERR_OK )

lib_com/ivas_cnst.h

+1 −1
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ typedef enum 
    RENDERER_NON_DIEGETIC_DOWNMIX,

    RENDERER_OSBA_STEREO,

    RENDERER_OSBA_AMBI,

#ifdef OMASA_EXT_OUTPUT

#ifdef NONBE_FIX_984_OMASA_EXT_OUTPUT

    RENDERER_OSBA_LS,

    RENDERER_OMASA_OBJECT_EXT,

    RENDERER_OMASA_MIX_EXT

lib_com/ivas_prot.h

+1 −1
Original line number Diff line number Diff line
@@ -5795,7 +5795,7 @@ void ivas_omasa_rearrange_channels( 
    const int16_t output_frame                                  /* i  : output frame length per channel         */

);



#ifdef OMASA_EXT_OUTPUT

#ifdef NONBE_FIX_984_OMASA_EXT_OUTPUT

ivas_error ivas_omasa_combine_separate_ism_with_masa_open(

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

);

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -184,7 +184,7 @@ 
#define NONBE_FIX_947_STEREO_DMX_EVS_POC                      /* Orange: Fix clicks on POC */  

#define NONBE_FIX_947_STEREO_DMX_EVS_PHA                      /* Orange: Fix issues on PHA */                                                                                        



#define OMASA_EXT_OUTPUT                                      /* Nokia: complete the OMASA EXT output implementation */

#define NONBE_FIX_984_OMASA_EXT_OUTPUT                        /* Nokia: issue #984: complete the OMASA EXT output implementation */



/* ##################### End NON-BE switches ########################### */