Commit b861b739 authored by Tapani Pihlajakuja's avatar Tapani Pihlajakuja
Browse files

Merge remote-tracking branch 'origin/main' into... 

Merge remote-tracking branch 'origin/main' into 1362-omasa-rendering-to-masa-1tc-makes-objects-on-the-right-side-disappear
parents 01239f2a bd9d3b1a

apps/renderer.c

+23 −0
Original line number Diff line number Diff line
@@ -68,6 +68,10 @@ 
#define IVAS_MAX16B_FLT 32767.0f

#define IVAS_MIN16B_FLT ( -32768.0f )



#ifdef NONBE_1359_FIX_IVASREND_OMASA_BINAURAL_LOUDNESS

#define OMASA_TDREND_MATCHING_GAIN_DB ( -2.0f )

#endif



#if !defined( DEBUGGING ) && !defined( WMOPS )

static

#endif
@@ -1153,20 +1157,39 @@ int main( 
        }

    }



#ifndef NONBE_1359_FIX_IVASREND_OMASA_BINAURAL_LOUDNESS

    /* Set the total number of objects */

#endif

    if ( args.inConfig.numAudioObjects > 0 )

    {

#ifdef NONBE_1359_FIX_IVASREND_OMASA_BINAURAL_LOUDNESS

        /* Set the total number of objects */

#endif

        if ( ( error = IVAS_REND_SetTotalNumberOfObjects( hIvasRend, args.inConfig.numAudioObjects ) ) != IVAS_ERR_OK )

        {

            fprintf( stderr, "\nError in IVAS_REND_SetTotalNumberOfObjects(): %s\n", ivas_error_to_string( error ) );

            goto cleanup;

        }



#ifdef NONBE_1359_FIX_IVASREND_OMASA_BINAURAL_LOUDNESS

        /* Set the metadata delay for objects */

#endif

        if ( ( error = IVAS_REND_SetIsmMetadataDelay( hIvasRend, args.syncMdDelay ) ) != IVAS_ERR_OK )

        {

            fprintf( stderr, "\nError in IVAS_REND_SetIsmMetadataDelay(): %s\n", ivas_error_to_string( error ) );

            goto cleanup;

        }

#ifdef NONBE_1359_FIX_IVASREND_OMASA_BINAURAL_LOUDNESS



        /* For OMASA input and BINAURAL output, apply a gain to objects to match the loudness with MASA part */

        if ( args.inConfig.numMasaBuses > 0 && args.outConfig.audioConfig == IVAS_AUDIO_CONFIG_BINAURAL )

        {

            for ( i = 0; i < args.inConfig.numAudioObjects; ++i )

            {

                args.inConfig.audioObjects[i].gain_dB += OMASA_TDREND_MATCHING_GAIN_DB;

            }

        }

#endif

    }



    IVAS_REND_LfePanMtx lfePanMatrix;

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -176,6 +176,7 @@ 
#define NONBE_FIX_TCX5_INTERLEAVING_FOR_FS_IN_UNEQUAL_FS_OUT /* FhG: apply correct TCX5 grouping/interleaving when input_fs != output_fs */

#define NONBE_1339_FIXOSBA_EXT_LOUDNESS                 /* FhG: issue 1339: apply scaling with EXT output in OSBA high-BR mode */

#define NONBE_1352_HARMONIZE_OSBA_LOUDNESS             /* FhG: do not scale OSBA inputs by 0.5 any more */

#define NONBE_1359_FIX_IVASREND_OMASA_BINAURAL_LOUDNESS /* Nokia: issue 1339: Apply scaling to the object-part of OMASA for binaural rendering in IVAS_rend. */

#define NONBE_1362_FIX_OMASA_TO_MASA1_RENDERING         /* Nokia: Fix OMASA to MASA1 rendering in IVAS_rend */



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

lib_com/tools.c

+3 −1
Original line number Diff line number Diff line
@@ -1743,9 +1743,11 @@ int16_t is_numeric_float( 
    float x )

{

#ifdef CODE_IMPROVEMENTS

    int16_t retval;

#define WMC_TOOL_SKIP

    return (int16_t) ( !isnan( x ) && !isinf( x ) );

    retval = (int16_t) ( !isnan( x ) && !isinf( x ) );

#undef WMC_TOOL_SKIP

    return retval;

#else

#ifndef BASOP_NOGLOB

    union float_int

lib_rend/lib_rend.c

+7 −3
Original line number Diff line number Diff line
@@ -3308,11 +3308,15 @@ static void *getInputByIndex( 
        case IVAS_REND_AUDIO_CONFIG_TYPE_MASA:

            return (input_masa *) inputsArray + index;

        default:

            break;

    }



    /* this should be unreachable */

    assert( 0 );



    /* include a final return to make the linter happy and avoid problems with wmc_tool (see #1355) */

    return NULL;

}

}

#endif



static ivas_error findFreeInputSlot(