Commit 9016d88e authored by vasilache's avatar vasilache
Browse files

Merge branch 'main' into 1231-align-with-basop-for-masa2total-ratios-threshold

parents 7b17bf7d 406569eb

.gitlab-ci.yml

+2 −0
Original line number Diff line number Diff line
@@ -1460,6 +1460,7 @@ ivas-conformance: 
    - mkdir testvec/bin    

    - cp    -force -ErrorAction Ignore scripts/testv/* testvec/testv

    - cp -r -force -ErrorAction Ignore scripts/ls_layouts testvec

    - cp -r -force -ErrorAction Ignore scripts/object_edit testvec

    - cp -r -force -ErrorAction Ignore scripts/switchPaths testvec

    - cp -r -force -ErrorAction Ignore scripts/trajectories testvec

    - cp -r -force -ErrorAction Ignore scripts/binauralRenderer_interface/binaural_renderers_hrtf_data testvec/binauralRenderer_interface
@@ -1546,6 +1547,7 @@ ivas-conformance-linux: 
    - mkdir testvec/bin    

    - cp -r scripts/testv/* testvec/testv

    - cp -r scripts/ls_layouts testvec

    - cp -r scripts/object_edit testvec

    - cp -r scripts/switchPaths testvec

    - cp -r scripts/trajectories testvec

    - cp -r scripts/binauralRenderer_interface/binaural_renderers_hrtf_data testvec/binauralRenderer_interface

apps/decoder.c

+40 −31
Original line number Diff line number Diff line
@@ -202,11 +202,7 @@ static int16_t app_own_random( int16_t *seed ); 
static IVAS_DEC_FORCED_REND_MODE parseForcedRendModeDec( char *forcedRendModeChar );

#endif

#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE

#ifdef NONBE_FIX_1255_OBJ_EDIT_JBM

static void do_object_editing( IVAS_EDITABLE_PARAMETERS *editableParameters, const int16_t num_subframes, ObjectEditFileReader *objectEditFileReader );

#else

static void do_object_editing( IVAS_EDITABLE_PARAMETERS *editableParameters, ObjectEditFileReader *objectEditFileReader );

#endif

#else

static void do_object_editing( IVAS_EDITABLE_PARAMETERS *editableParameters );

#endif
@@ -2003,7 +1999,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 +2024,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 ) );
@@ -2475,11 +2488,7 @@ static ivas_error decodeG192( 


                    /* Do object metadata editing here ... */

#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE

#ifdef NONBE_FIX_1255_OBJ_EDIT_JBM

                    do_object_editing( &editableParameters, num_subframes, objectEditFileReader );

#else

                    do_object_editing( &editableParameters, objectEditFileReader );

#endif

#else

                    do_object_editing( &editableParameters );

#endif
@@ -3288,20 +3297,17 @@ static ivas_error decodeVoIP( 
        }



#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE

        if ( arg.objEditEnabled && ( arg.objEditFileName != NULL ) )

        {

#ifdef NONBE_FIX_1255_OBJ_EDIT_JBM

            if ( frame * num_subframes % IVAS_MAX_PARAM_SPATIAL_SUBFRAMES == 0 )

            {

        if ( arg.objEditEnabled && arg.objEditFileName != NULL && vec_pos_update == 0 )

#else

        if ( arg.objEditEnabled && ( arg.objEditFileName != NULL ) )

#endif

        {

            if ( ( error = ObjectEditFileReader_readNextFrame( objectEditFileReader ) ) != IVAS_ERR_OK )

            {

                fprintf( stderr, "\nError: could not read object editing instructions from file: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );

                return error;

            }

#ifdef NONBE_FIX_1255_OBJ_EDIT_JBM

            }

#endif

        }

#endif
@@ -3406,11 +3412,7 @@ static ivas_error decodeVoIP( 


                /* Do object metadata editing here ... */

#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE

#ifdef NONBE_FIX_1255_OBJ_EDIT_JBM

                do_object_editing( &editableParameters, num_subframes, objectEditFileReader );

#else

                do_object_editing( &editableParameters, objectEditFileReader );

#endif

#else

                do_object_editing( &editableParameters );

#endif
@@ -3541,17 +3543,32 @@ static ivas_error decodeVoIP( 
            }

        }



#ifdef NONBE_FIX_1255_OBJ_EDIT_JBM

        vec_pos_update = ( vec_pos_update + 1 ) % vec_pos_len;

#else

        if ( !arg.quietModeEnabled )

        {

            fprintf( stdout, "%-8d\b\b\b\b\b\b\b\b", frame );

        }

        vec_pos_update = ( vec_pos_update + 1 ) % vec_pos_len;

        frame++;

#endif

        if ( vec_pos_update == 0 )

        {

            systemTime_ms += vec_pos_len * systemTimeInc_ms;

        }



#ifdef NONBE_FIX_1255_OBJ_EDIT_JBM

        if ( vec_pos_update == 0 )

        {

            frame++;

            if ( !arg.quietModeEnabled )

            {

                fprintf( stdout, "%-8d\b\b\b\b\b\b\b\b", frame );

            }

        }

#endif



#ifdef WMOPS

        update_mem();

        update_wmops();
@@ -3715,9 +3732,6 @@ cleanup: 
static void do_object_editing(

#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE

    IVAS_EDITABLE_PARAMETERS *editableParameters,

#ifdef NONBE_FIX_1255_OBJ_EDIT_JBM

    const int16_t num_subframes,

#endif

    ObjectEditFileReader *objectEditFileReader )

#else

    IVAS_EDITABLE_PARAMETERS *editableParameters )
@@ -3816,12 +3830,7 @@ static void do_object_editing( 
        /* breakover object gains */

        for ( obj_idx = 0; obj_idx < editableParameters->num_obj; obj_idx++ )

        {

#ifdef NONBE_FIX_1255_OBJ_EDIT_JBM

            editableParameters->ism_metadata[obj_idx].gain = 0.5f + (float) ( ( ( frame * num_subframes / IVAS_MAX_PARAM_SPATIAL_SUBFRAMES ) + obj_idx * 50 ) % 250 ) / 250.0f;



#else

            editableParameters->ism_metadata[obj_idx].gain = 0.5f + (float) ( ( frame + obj_idx * 50 ) % 250 ) / 250.0f;

#endif

        }



        editableParameters->gain_bed = 0.5f;

lib_com/ivas_prot.h

+2 −0
Original line number Diff line number Diff line
@@ -5592,7 +5592,9 @@ void ivas_osba_stereo_add_channels( 
    const float gain,                                           /* i  : gain bed value                          */

    const int16_t nchan_out,                                    /* i  : number of output channels               */

    const int16_t nchan_ism,                                    /* i  : number of ISM channels                  */

#ifndef NONBE_FIX_1262_OSBA_STEREO

    const int16_t ism_mode,                                     /* i  : ISM mode                                */

#endif

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

);

lib_com/options.h

+4 −1
Original line number Diff line number Diff line
@@ -172,7 +172,10 @@ 
#define NONBE_1217_OBJ_EDIT_FOA                         /* VA/Nokia: isse 1217: fix crash in object editing to FOA output in ParamISM */

#define NONBE_1215_FIX_JBM_MAX_SCALING                  /* FhG: issue 1215: Fix assert hit in a specific VoIP decoder config. Caused by integer overflow in max scaling calculation. */

#define NONBE_FIX_1255_OBJ_EDIT_JBM                     /* VA: issue 1255: restore object editing in JBM */



#define NONBE_FIX_1262_OSBA_STEREO                      /* FhG: issue 1262: Fix missing scaling factor for OSBA stereo output */

#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 */



#define NONBE_1231_BASOP_819_THRESHOLD_MASA2TOTAL        /* Nokia: add fix for precision limitation in comparison with masa2total energy ratio threshold to be aligned with BASOP*/

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

lib_dec/acelp_core_dec.c

+4 −0
Original line number Diff line number Diff line
@@ -483,7 +483,11 @@ ivas_error acelp_core_dec( 


        if ( st->element_mode > EVS_MONO && st->idchan == 0 && !( st->core_brate == FRAME_NO_DATA || st->core_brate == SID_2k40 ) && !tdm_low_rate_mode )

        {

#ifdef NONBE_FIX_1189_GSC_IVAS_OMASA

            if ( st->coder_type == AUDIO || ( st->coder_type == INACTIVE && st->inactive_coder_type_flag ) )

#else

            if ( st->coder_type == AUDIO || ( st->coder_type == INACTIVE && st->total_brate <= MAX_GSC_INACTIVE_BRATE ) )

#endif

            {

                st->GSC_IVAS_mode = get_next_indice( st, 2 );

            }