Commit d2abc884 authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

Merge branch 'update-basop-ci-branch' into 'basop-ci-branch' 

[CI] update BASOP page with sticky header 2

See merge request !1955
parents ac112e4c 2159a7f6

apps/decoder.c

+34 −7
Original line number Diff line number Diff line
@@ -202,7 +202,11 @@ 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
@@ -2471,7 +2475,11 @@ 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
@@ -3048,7 +3056,7 @@ static ivas_error decodeVoIP( 


    bool bitstreamReadDone = false;



    bool parameterAvailableForEditing = false;

    bool parametersAvailableForEditing = false;

    uint16_t nSamplesRendered = 0;



    vec_pos_update = 0;
@@ -3282,11 +3290,18 @@ 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 )

            {

#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
@@ -3344,7 +3359,7 @@ static ivas_error decodeVoIP( 
        while ( nSamplesRendered < nOutSamples )

        {

#ifdef SUPPORT_JBM_TRACEFILE

            if ( ( error = IVAS_DEC_VoIP_GetSamples( hIvasDec, nOutSamples, IVAS_DEC_PCM_INT16, (void *) pcmBuf, writeJbmTraceFileFrameWrapper, jbmTraceWriter, &bitstreamReadDone, &nSamplesRendered, &parameterAvailableForEditing, systemTime_ms ) ) != IVAS_ERR_OK )

            if ( ( error = IVAS_DEC_VoIP_GetSamples( hIvasDec, nOutSamples, IVAS_DEC_PCM_INT16, (void *) pcmBuf, writeJbmTraceFileFrameWrapper, jbmTraceWriter, &bitstreamReadDone, &nSamplesRendered, &parametersAvailableForEditing, systemTime_ms ) ) != IVAS_ERR_OK )

#else

            if ( ( error = IVAS_DEC_VoIP_GetSamples( hIvasDec, nOutSamples, IVAS_DEC_PCM_INT16, (void *) pcmBuf, &bitstreamReadDone, &nSamplesRendered, &parameterAvailableForEditing, systemTime_ms ) ) != IVAS_ERR_OK )

#endif
@@ -3378,7 +3393,7 @@ static ivas_error decodeVoIP( 
            }



            /* Object metadata editing */

            if ( arg.objEditEnabled && parameterAvailableForEditing == true )

            if ( arg.objEditEnabled && parametersAvailableForEditing == true )

            {

                IVAS_EDITABLE_PARAMETERS editableParameters;
@@ -3391,7 +3406,11 @@ 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
@@ -3696,6 +3715,9 @@ 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 )
@@ -3794,7 +3816,12 @@ 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;

apps/renderer.c

+0 −4
Original line number Diff line number Diff line
@@ -737,10 +737,8 @@ int main( 
        lfeRoutingConfigs[i] = NULL;

    }



#ifdef FIX_1225_DISCLAIMER

    IVAS_REND_PrintDisclaimer();



#endif

    CmdlnArgs args = parseCmdlnArgs( argc, argv );



    if ( args.nonDiegeticPan && !( ( args.inConfig.numAudioObjects == 0 && args.inConfig.multiChannelBuses[0].audioConfig == IVAS_AUDIO_CONFIG_MONO ) ||
@@ -898,7 +896,6 @@ int main( 
        exit( -1 );

    }



#ifdef FIX_1225_DISCLAIMER

    fprintf( stdout, "Input audio file:       %s\n", args.inputFilePath );

    fprintf( stdout, "Output audio file:      %s\n\n", args.outputFilePath );
@@ -940,7 +937,6 @@ int main( 
        goto cleanup;

    }



#endif

    if ( !isEmptyString( args.customHrtfFilePath ) )

    {

        if ( hrtfFileReader_open( args.customHrtfFilePath, &hrtfFileReader ) != IVAS_ERR_OK )

ci/basop-pages/create_report_pages.py

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ SUBPAGE_TMPL_CSS = """ 
.tbase .tleft{text-align:left;horizontal-align:bottom}

.tbase .tincrease{text-align:left;background-color:#ff5500;border-color:inherit;font-weight:bold;}

.tbase .treduce{text-align:left;background-color:#acff00;border-color:inherit;font-weight:bold;}



thead {position:sticky;top:0;background-color:#ffffffd0}

.arrowup {font-weight:bold;font-size:200%;}

.arrowdown {font-weight:bold;font-size:200%;}

</style>

lib_com/disclaimer.c

+0 −4
Original line number Diff line number Diff line
@@ -47,11 +47,7 @@ int16_t print_disclaimer( FILE *fPtr ) 
{



    fprintf( fPtr, "\n==================================================================================================\n" );

#ifdef FIX_1225_DISCLAIMER

    fprintf( fPtr, " \n IVAS Codec Version IVAS-FL-2.0\n" );

#else

    fprintf( fPtr, " IVAS Codec Baseline\n" );

#endif

    fprintf( fPtr, " \n" );

    fprintf( fPtr, " Based on EVS Codec (Floating Point) 3GPP TS26.443 Nov 04, 2021,\n" );

    fprintf( fPtr, " Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0\n" );

lib_com/options.h

+2 −4
Original line number Diff line number Diff line
@@ -160,9 +160,6 @@ 


/*#define FIX_I4_OL_PITCH*/                             /* fix open-loop pitch used for EVS core switching */

#define TMP_FIX_1119_SPLIT_RENDERING_VOIP               /* FhG: Add error check for unsupported config: split rendering with VoIP mode */

#define FIX_1225_DISCLAIMER                             /* VA: issue 1225: Add disclaimer for external renderer + Add info about IVAS reference version */

#define FIX_1179_USAN_PHASEECU                          /* Eri: issue 1179:  better handling of 16 bit wrap around for very long(>200ms) FER-bursts   */

#define FIX_1249_REMOVE_OBSOLETE_ALLRAD_MATRIX          /* VA: issue 1249: remove obsolete code around ALLRAD decoder matrix */

#define FIX_1217_OBJECT_EDIT_FILE_INTERFACE             /* Nokia: issue #1217: add decoder functionality to read object edit instructions from a file */



/* #################### End BE switches ################################## */
@@ -174,8 +171,9 @@ 


#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_1230_DECODE_MASA_ISM_AZIMUTH_PREC_FROM_BASOP        /* Nokia: Fixes ivas_decode_masaism_metadata decision logic change due to precision difference; this is the fix in floating point */

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



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