Commit 6ecadcf4 authored by Jouni Paulus's avatar Jouni Paulus
Browse files

Merge branch... 

Merge branch '1261-msan-in-masa-ext-metadata-delay-buffer-indexing-when-starting-with-bad-frames-and-no_delay_cmp' into 'main'

[NON-BE] Resolve #1261 "MSAN in MASA EXT metadata delay buffer indexing when starting with bad frames and no_delay_cmp"

See merge request !1965
parents 5e1729e2 09b6746a

apps/decoder.c

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

            {

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

#ifdef NONBE_FIX_1261_MASA_EXT_META_JBM

                int16_t fullDelayNumSamplesLocal[3];

                int32_t delayTimeScaleLocal;

                float delayMs;

                IVAS_MASA_DECODER_EXT_OUT_META_HANDLE hMasaExtOutMeta;

                hMasaExtOutMeta = NULL;



                /* fullDelayNumSamples is zeroed so need to re-fetch delay info */

                if ( ( error = IVAS_DEC_GetDelay( hIvasDec, fullDelayNumSamplesLocal, &delayTimeScaleLocal ) ) != IVAS_ERR_OK )

                {

                    fprintf( stderr, "\nUnable to get delay of decoder: %s\n", ivas_error_to_string( error ) );

                }

                delayMs = (float) ( fullDelayNumSamplesLocal[0] ) / (float) ( delayTimeScaleLocal );

#else

                IVAS_MASA_DECODER_EXT_OUT_META_HANDLE hMasaExtOutMeta = NULL;

#endif



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

                {
@@ -2013,7 +2028,9 @@ static ivas_error initOnFirstGoodFrame( 


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

                {

#ifndef NONBE_FIX_1261_MASA_EXT_META_JBM

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

#endif

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

                    {

                        fprintf( stderr, "\nError writing MASA metadata to file: %s\n", MasaFileWriter_getFilePath( *ppMasaWriter ) );

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -174,6 +174,7 @@ 
#define NONBE_FIX_1255_OBJ_EDIT_JBM                     /* VA: issue 1255: restore object editing in JBM */

#define NONBE_FIX_1189_GSC_IVAS_OMASA                   /* VA: Fix for issue 1189: Bitstream desynchornization due to reading/writing of the GSC_IVAS_mode parameter */

#define NONBE_1214_PLC_LSF_MEMORY                       /* VA: issue 1224: reset ACELP PLC FEC memory in case of switching from MDCT stereo to TD/DFT stereo */

#define NONBE_FIX_1261_MASA_EXT_META_JBM                /* Nokia: issue #1261: MASA metadata EXT output delay buffer init in JBM */



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