Commit 222b8461 authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

Merge branch 'main' of forge.3gpp.org:ivas-codec-pc/ivas-codec into... 

Merge branch 'main' of forge.3gpp.org:ivas-codec-pc/ivas-codec into 1141-no-objects-rendered-in-osba-disc-to-binaural_room
parents 0fef1844 ea539458

apps/encoder.c

+10 −1
Original line number Diff line number Diff line
@@ -1519,6 +1519,7 @@ static bool parseCmdlIVAS_enc( 
                {

                    fprintf( stderr, "Error: Too low number of ISM channels specified!\n\n" );

                    usage_enc();

                    return false;

                }

                else

                {
@@ -1530,6 +1531,7 @@ static bool parseCmdlIVAS_enc( 
                    {

                        fprintf( stderr, "Error: Too high number of ISM channels!\n\n" );

                        usage_enc();

                        return false;

                    }

                }

            }
@@ -1537,6 +1539,7 @@ static bool parseCmdlIVAS_enc( 
            {

                fprintf( stderr, "Error: Number of ISM channels not specified!\n\n" );

                usage_enc();

                return false;

            }

            if ( i < argc - 4 )

            {
@@ -1556,7 +1559,7 @@ static bool parseCmdlIVAS_enc( 
                    default:

                        fprintf( stderr, "Error: MASA channels must be 1 or 2.\n\n" );

                        usage_enc();

                        break;

                        return false;

                }

            }
@@ -1581,6 +1584,7 @@ static bool parseCmdlIVAS_enc( 
                {

                    fprintf( stderr, "Error: not enough arguments\n\n" );

                    usage_enc();

                    return false;

                }

            }
@@ -1593,6 +1597,7 @@ static bool parseCmdlIVAS_enc( 
            {

                fprintf( stderr, "Error: not enough MASA arguments\n\n" );

                usage_enc();

                return false;

            }

        }

        else if ( strcmp( to_upper( argv[i] ), "-ISM_SBA" ) == 0 )
@@ -1611,6 +1616,7 @@ static bool parseCmdlIVAS_enc( 
                {

                    fprintf( stderr, "Error: Too low number of ISM channels specified!\n\n" );

                    usage_enc();

                    return false;

                }

                else

                {
@@ -1622,6 +1628,7 @@ static bool parseCmdlIVAS_enc( 
                    {

                        fprintf( stderr, "Error: Too high number of ISM channels!\n\n" );

                        usage_enc();

                        return false;

                    }

                }

            }
@@ -1629,6 +1636,7 @@ static bool parseCmdlIVAS_enc( 
            {

                fprintf( stderr, "Error: Number of ISM channels not specified!\n\n" );

                usage_enc();

                return false;

            }



            if ( i < argc - 4 )
@@ -1680,6 +1688,7 @@ static bool parseCmdlIVAS_enc( 
                {

                    fprintf( stderr, "Error: not enough arguments\n\n" );

                    usage_enc();

                    return false;

                }

            }

        }

lib_com/options.h

+2 −0
Original line number Diff line number Diff line
@@ -164,6 +164,7 @@ 
#define FLOAT_FIX_POINT_HRTF_FILE_FORMAT                /* allows reading floation or fix point hrtf binary file format */

#define FIX_1138_SBA_EXT_ERROR_PRINTOUT                 /* VA: issue 1138: Fix SBA EXT output call of audioCfg2channels() */

#define FIX_1117_ISAR_MALLOC                            /* VA: issue 1117: call ISAR malloc() only at the initialization. */

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



/* #################### End BE switches ################################## */
@@ -172,6 +173,7 @@ 
/* all switches in this category should start with "NONBE_" */



#define NON_BE_FIX_1137_GSC_IVAS_FXFLT_DECODING               /* VA: Add fix point bit allocation for special GSC mode such that float and fixed point have the same final bit allocation */

#define NONBE_FIX_1132_THRESHOLD_POW_IN_SWB_TBE               /* VA: issue 1132: prevent division by extremely low energy value in SWB TBE */

#define NONBE_FIX_1141_OSBA_ROOM_RENDERING                    /* FhG: Fix for issue 1141: render objects in OSBA decoder with room effect */



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

lib_dec/lib_dec.c

+8 −0
Original line number Diff line number Diff line
@@ -2589,6 +2589,14 @@ ivas_error IVAS_DEC_VoIP_GetSamples( 
        return IVAS_ERR_WRONG_PARAMS;

    }



#ifdef TMP_FIX_1119_SPLIT_RENDERING_VOIP

    if ( hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM ||

         hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED )

    {

        return IVAS_ERROR( IVAS_ERR_NOT_IMPLEMENTED, "Split rendering is not integrated with VoIP mode" );

    }

#endif



    /* make sure that the FIFO after decoder/scaler contains at least one sound card frame (i.e. 20ms) */

    while ( nSamplesRendered < nSamplesPerChannel )

    {

lib_dec/swb_tbe_dec.c

+20 −0
Original line number Diff line number Diff line
@@ -328,6 +328,15 @@ void wb_tbe_dec( 
        prev_pow = sum2_f( shaped_wb_excitation, L_SHB_LAHEAD / 4 );

        curr_pow = sum2_f( shaped_wb_excitation + L_SHB_LAHEAD / 4, L_SHB_LAHEAD / 4 );



#ifdef NONBE_FIX_1132_THRESHOLD_POW_IN_SWB_TBE

        if ( st->element_mode > EVS_MONO )

        {

            /* prevent too low values of energy */

            prev_pow = max( 0.00001f, prev_pow );

            curr_pow = max( 0.00001f, curr_pow );

        }

#endif



        if ( voice_factors[0] > 0.75f )

        {

            curr_pow *= 0.25;
@@ -341,6 +350,7 @@ void wb_tbe_dec( 
        {

            scale = (float) sqrt( curr_pow / prev_pow );

        }



        for ( i = 0; i < L_SHB_LAHEAD / 4 - 1; i++ )

        {

            shaped_wb_excitation[i] *= scale;
@@ -1059,9 +1069,19 @@ void swb_tbe_dec( 
        }



        mvr2r( shaped_shb_excitationTemp, &shaped_shb_excitation[L_SHB_LAHEAD], L_FRAME16k );



        prev_pow = sum2_f( shaped_shb_excitation, L_SHB_LAHEAD + 10 );

        curr_pow = sum2_f( shaped_shb_excitation + L_SHB_LAHEAD + 10, L_SHB_LAHEAD + 10 );



#ifdef NONBE_FIX_1132_THRESHOLD_POW_IN_SWB_TBE

        if ( st->element_mode > EVS_MONO )

        {

            /* prevent too low values of energy */

            prev_pow = max( 0.00001f, prev_pow );

            curr_pow = max( 0.00001f, curr_pow );

        }

#endif



        if ( voice_factors[0] > 0.75f )

        {

            curr_pow *= 0.25;

lib_enc/swb_tbe_enc.c

+18 −0
Original line number Diff line number Diff line
@@ -383,6 +383,15 @@ void wb_tbe_enc( 
    prev_pow = sum2_f( shaped_wb_excitation, L_SHB_LAHEAD / 4 );

    curr_pow = sum2_f( shaped_wb_excitation + L_SHB_LAHEAD / 4, L_SHB_LAHEAD / 4 );



#ifdef NONBE_FIX_1132_THRESHOLD_POW_IN_SWB_TBE

    if ( st->element_mode > EVS_MONO )

    {

        /* prevent too low values of energy */

        prev_pow = max( 0.00001f, prev_pow );

        curr_pow = max( 0.00001f, curr_pow );

    }

#endif



    if ( voice_factors[0] > 0.75f )

    {

        curr_pow = (float) ( curr_pow * 0.25 );
@@ -1060,6 +1069,15 @@ void swb_tbe_enc( 
        prev_pow = sum2_f( shaped_shb_excitation, L_SHB_LAHEAD + 10 );

        curr_pow = sum2_f( shaped_shb_excitation + L_SHB_LAHEAD + 10, L_SHB_LAHEAD + 10 );



#ifdef NONBE_FIX_1132_THRESHOLD_POW_IN_SWB_TBE

        if ( st->element_mode > EVS_MONO )

        {

            /* prevent too low values of energy */

            prev_pow = max( 0.00001f, prev_pow );

            curr_pow = max( 0.00001f, curr_pow );

        }

#endif



        if ( voice_factors[0] > 0.75f )

        {

            curr_pow = (float) ( curr_pow * 0.25 );