Commit 28fc7054 authored by Lauros Pajunen's avatar Lauros Pajunen
Browse files

OMASA EXT output

parent 430c803b

apps/decoder.c

+50 −0
Original line number Diff line number Diff line
@@ -2031,6 +2031,7 @@ static ivas_error initOnFirstGoodFrame( 
            {

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

                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 ) );
@@ -2039,7 +2040,12 @@ static ivas_error initOnFirstGoodFrame( 


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

                {

#ifdef OMASA_EXT_OUTPUT

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

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

#else

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

#endif

                    {

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

                        return error;
@@ -2546,13 +2552,28 @@ 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

                int16_t fullDelayNumSamples[3];

                float delayMs;



                /* delayNumSamples is zeroed, and delayNumSamples_orig is updated only on first good frame, so need to re-fetch delay info */

                if ( ( error = IVAS_DEC_GetDelay( hIvasDec, fullDelayNumSamples, &delayTimeScale ) ) != IVAS_ERR_OK )

                {

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

                }

#endif

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

                {

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

                    goto cleanup;

                }



#ifdef OMASA_EXT_OUTPUT

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

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

#else

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

#endif

                {

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

                    goto cleanup;
@@ -2687,13 +2708,27 @@ 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

                int16_t fullDelayNumSamples[3];

                float delayMs;



                if ( ( error = IVAS_DEC_GetDelay( hIvasDec, fullDelayNumSamples, &delayTimeScale ) ) != IVAS_ERR_OK )

                {

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

                }

#endif

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

                {

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

                    goto cleanup;

                }



#ifdef OMASA_EXT_OUTPUT

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

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

#else

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

#endif

                {

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

                    goto cleanup;
@@ -3368,13 +3403,28 @@ 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

                    int16_t fullDelayNumSamples[3];

                    float delayMs;



                    /* delayNumSamples_orig is fetched only for the first good frame, but here the delay can change between frames, so need to re-fetch */

                    if ( ( error = IVAS_DEC_GetDelay( hIvasDec, fullDelayNumSamples, &delayTimeScale ) ) != IVAS_ERR_OK )

                    {

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

                    }

#endif

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

                    {

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

                        goto cleanup;

                    }



#ifdef OMASA_EXT_OUTPUT

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

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

#else

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

#endif

                    {

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

                        goto cleanup;

apps/renderer.c

+4 −0
Original line number Diff line number Diff line
@@ -2125,7 +2125,11 @@ int main( 
                }

            }



#ifdef 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 )

#endif

            {

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

            }

lib_com/ivas_cnst.h

+6 −0
Original line number Diff line number Diff line
@@ -118,7 +118,13 @@ typedef enum 
    RENDERER_NON_DIEGETIC_DOWNMIX,

    RENDERER_OSBA_STEREO,

    RENDERER_OSBA_AMBI,

#ifdef OMASA_EXT_OUTPUT

    RENDERER_OSBA_LS,

    RENDERER_OMASA_OBJECT_EXT,

    RENDERER_OMASA_MIX_EXT

#else

    RENDERER_OSBA_LS

#endif

} RENDERER_TYPE;



#ifdef SPLIT_REND_WITH_HEAD_ROT

lib_com/ivas_prot.h

+24 −0
Original line number Diff line number Diff line
@@ -5792,6 +5792,30 @@ void ivas_omasa_rearrange_channels( 
    const int16_t output_frame                                  /* i  : output frame length per channel         */

);



#ifdef OMASA_EXT_OUTPUT

ivas_error ivas_omasa_combine_separate_ism_with_masa_open(

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

);



void ivas_omasa_combine_separate_ism_with_masa(

    Decoder_Struct *st_ivas,                                    /* i/o: IVAS decoder handle             */

    float *output[],                                            /* o  : output synthesis signal         */

    const int16_t nchan_ism,                                    /* i  : number of ISMs                  */

    const int16_t output_frame                                  /* i  : output frame length per channel */

);



ivas_error ivas_omasa_render_objects_from_mix_open(

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

);



void ivas_omasa_render_objects_from_mix(

    Decoder_Struct *st_ivas,                                    /* i/o: IVAS decoder handle             */

    float *output[],                                            /* o  : output synthesis signal         */

    const int16_t nchan_ism,                                    /* i  : number of ISMs                  */

    const int16_t output_frame                                  /* i  : output frame length per channel */

);



#endif

void ivas_omasa_dirac_rend_jbm(

    Decoder_Struct *st_ivas,                                    /* i/o: IVAS decoder handle                     */

    const uint16_t nSamplesAsked,                               /* i  : number of samples requested             */

lib_com/options.h

+2 −0
Original line number Diff line number Diff line
@@ -174,6 +174,8 @@ 
#define NONBE_FIX_968_ISM_BRIR_WITH_HEADROTATION_5MS_FIX      /* FhG : issue #968: differences between 5ms and 20ms rendering for discrete ISM with BRIR and head rotation*/

#define NONBE_FIX_977_OSBA_GAIN_MISMATCH                      /* Dlb : issue 977 : Output gain mismatch for different bit rates in OSBA */



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



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



/* ################## End DEVELOPMENT switches ######################### */