Commit fc70f3d1 authored by hmund's avatar hmund
Browse files

Merge branch 'main' into dlb_sba_encoder_complexity_opt

parents 5bc2007f 884471d4

apps/renderer.c

+3 −3
Original line number Diff line number Diff line
@@ -1787,7 +1787,7 @@ IsmPositionProvider *IsmPositionProvider_open( 
    IsmPositionProvider *ipp;

    uint16_t i;



    ipp = (IsmPositionProvider *) malloc_( sizeof( IsmPositionProvider ) );

    ipp = (IsmPositionProvider *) malloc( sizeof( IsmPositionProvider ) );

    ipp->frameCounter = 0;

    ipp->numObjects = 0;
@@ -2182,8 +2182,8 @@ static void parseIsm( 
    if ( parseUint32( line, &numberOfObjectPositionsToRead ) == 0 )

    {

        positionProvider->numPositions[idx] = numberOfObjectPositionsToRead;

        positionProvider->positions[idx] = malloc_( numberOfObjectPositionsToRead * sizeof( IVAS_REND_AudioObjectPosition ) );

        positionProvider->positionDurations[idx] = malloc_( numberOfObjectPositionsToRead * sizeof( uint16_t ) );

        positionProvider->positions[idx] = malloc( numberOfObjectPositionsToRead * sizeof( IVAS_REND_AudioObjectPosition ) );

        positionProvider->positionDurations[idx] = malloc( numberOfObjectPositionsToRead * sizeof( uint16_t ) );



        for ( i = 0; i < numberOfObjectPositionsToRead; ++i )

        {

lib_com/options.h

+3 −1
Original line number Diff line number Diff line
@@ -185,6 +185,8 @@ 


#define FIX_440_PARAM_ISM_DIR_NOISE                     /* FhG: Issue 440: Fix directional background noise becoming diffuse in ParamISM */



#define FIX_447_PARAMBIN_MASA_REGU_FAC                  /* Nokia: Issue 447: Fix issue by adjusting regularization factor minimum value. */



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

/* clang-format on */

#endif

lib_rend/ivas_dirac_dec_binaural_functions.c

+11 −0
Original line number Diff line number Diff line
@@ -2936,6 +2936,12 @@ static 


    if ( ivas_format == MASA_FORMAT )

    {

#ifdef FIX_447_PARAMBIN_MASA_REGU_FAC

        if ( ivas_total_brate >= IVAS_160k )

        {

            reqularizationFactor = 0.4f;

        }

#else

        if ( ivas_total_brate >= IVAS_256k )

        {

            reqularizationFactor = 0.2f;
@@ -2948,6 +2954,7 @@ static 
        {

            reqularizationFactor = 0.4f;

        }

#endif

        else if ( ivas_total_brate == IVAS_128k )

        {

            reqularizationFactor = 0.5f;
@@ -2970,7 +2977,11 @@ static 
    {

        if ( ivas_total_brate >= IVAS_96k )

        {

#ifdef FIX_447_PARAMBIN_MASA_REGU_FAC

            reqularizationFactor = 0.4f;

#else

            reqularizationFactor = 0.3f;

#endif

        }

        else if ( ivas_total_brate >= IVAS_80k )

        {