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

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

Merge remote-tracking branch 'origin/main' into 441-sba-binaural-output-levels-wrong-at-13-2-kbps-80-kbps
parents e4816f44 08d5f399

apps/encoder.c

+13 −0
Original line number Diff line number Diff line
@@ -1130,18 +1130,31 @@ static bool parseCmdlIVAS_enc( 
            {

                strncpy( stmp, argv[i], sizeof( stmp ) );

                stmp[sizeof( stmp ) - 1] = '\0';

#ifdef FIX_411_EVS_BE_TESTS_ON_WINDOWS_FAILING

                to_upper( stmp );

                if ( strcmp( stmp, "LO" ) == 0 )

#else

                to_upper( argv[i] );

                if ( strcmp( argv[i], "LO" ) == 0 )

#endif

                {

                    arg->caConfig.fec_indicator = IVAS_ENC_FEC_LO;

                }

#ifdef FIX_411_EVS_BE_TESTS_ON_WINDOWS_FAILING

                else if ( strcmp( stmp, "HI" ) == 0 )

#else

                else if ( strcmp( argv[i], "HI" ) == 0 )

#endif

                {

                    arg->caConfig.fec_indicator = IVAS_ENC_FEC_HI;

                }

                else

                {

#ifdef FIX_411_EVS_BE_TESTS_ON_WINDOWS_FAILING

                    arg->ca_config_file = argv[i];

#else

                    arg->ca_config_file = stmp;

#endif

                }

                i++;

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/bitstream.c

+25 −15
Original line number Diff line number Diff line
@@ -1914,7 +1914,11 @@ ivas_error preview_indices( 
                k = IVAS_FORMAT_SIGNALING_NBITS;

                if ( st_ivas->ivas_format == MASA_FORMAT )

                {

#ifdef COMBINED_FORMAT_SIGNALING

                    k = IVAS_FORMAT_SIGNALING_NBITS_EXTENDED;

#else

                    k = IVAS_FORMAT_SIGNALING_NBITS_SBA;

#endif

                }



                if ( total_brate < MIN_BRATE_MDCT_STEREO )
@@ -1954,9 +1958,15 @@ ivas_error preview_indices( 
        else if ( st_ivas->ivas_format == SBA_FORMAT )

        {

            /* Read SBA planar flag and SBA order */

#ifdef COMBINED_FORMAT_SIGNALING

            st_ivas->sba_planar = ( bit_stream[IVAS_FORMAT_SIGNALING_NBITS_EXTENDED] == 1 );

            st_ivas->sba_order = ( bit_stream[IVAS_FORMAT_SIGNALING_NBITS_EXTENDED + 2] == 1 );

            st_ivas->sba_order += 2 * ( bit_stream[IVAS_FORMAT_SIGNALING_NBITS_EXTENDED + 1] == 1 );

#else

            st_ivas->sba_planar = ( bit_stream[IVAS_FORMAT_SIGNALING_NBITS_SBA] == 1 );

            st_ivas->sba_order = ( bit_stream[IVAS_FORMAT_SIGNALING_NBITS_SBA + 2] == 1 );

            st_ivas->sba_order += 2 * ( bit_stream[IVAS_FORMAT_SIGNALING_NBITS_SBA + 1] == 1 );

#endif



            st_ivas->sba_analysis_order = ivas_sba_get_analysis_order( total_brate, st_ivas->sba_order );

lib_com/ivas_cnst.h

+4 −0
Original line number Diff line number Diff line
@@ -78,7 +78,11 @@ typedef enum 
 *----------------------------------------------------------------------------------*/



#define IVAS_FORMAT_SIGNALING_NBITS             2                           /* number of bits for signaling the IVAS format */

#ifdef COMBINED_FORMAT_SIGNALING

#define IVAS_FORMAT_SIGNALING_NBITS_EXTENDED    ( IVAS_FORMAT_SIGNALING_NBITS + 1 )

#else

#define IVAS_FORMAT_SIGNALING_NBITS_SBA         ( IVAS_FORMAT_SIGNALING_NBITS + 1 )

#endif





/*----------------------------------------------------------------------------------*

lib_com/ivas_fb_mixer.c

+14 −0
Original line number Diff line number Diff line
@@ -223,7 +223,11 @@ ivas_error ivas_FB_mixer_open( 
    }

    else

    {

#ifdef SBA_TD_RESIDUAL

        num_chs_alloc = 1; /* only W channel processed for predicting YZX */

#else

        num_chs_alloc = fb_cfg->num_out_chans;

#endif

    }



    for ( i = 0; i < num_chs_alloc; i++ )
@@ -386,7 +390,11 @@ void ivas_FB_mixer_close( 
    }

    else

    {

#ifdef SBA_TD_RESIDUAL

        num_chs_alloc = 1; /* only W channel processed for predicting YZX */

#else

        num_chs_alloc = fb_cfg->num_out_chans;

#endif

    }



    if ( hFbMixer != NULL )
@@ -502,7 +510,11 @@ void ivas_fb_mixer_pcm_ingest( 
    }

    else

    {

#ifdef SBA_TD_RESIDUAL

        num_chs_ingest = 1; /* forward Filterbank MDFT only on W */

#else

        num_chs_ingest = fb_cfg->num_out_chans;

#endif

    }



    for ( i = 0; i < fb_cfg->num_in_chans; i++ )
@@ -768,7 +780,9 @@ void ivas_fb_mixer_get_in_out_mapping( 
            for ( i = 1; i < fb_cfg->num_out_chans; i++ )

            {

                in_out_mixer_map[i][0] = 1;

#ifndef SBA_TD_RESIDUAL

                in_out_mixer_map[i][order[i]] = 1;

#endif

            }

        }

    }