Commit afb6e620 authored by Vladimir Malenovsky's avatar Vladimir Malenovsky
Browse files

remove all temporary fixes

parent d2d5f416

apps/decoder.c

+136 −20
Original line number Diff line number Diff line
@@ -175,15 +175,25 @@ typedef struct 


static bool parseCmdlIVAS_dec( int16_t argc, char **argv, DecArguments *arg );

static void usage_dec( void );

#ifdef FIX_FLOAT_1539_G192_FORMAT_SWITCH

static ivas_error decodeG192( DecArguments arg, BS_READER_HANDLE hBsReader, IVAS_DEC_HRTF_BINARY_WRAPPER *hHrtfBinary, RotFileReader *headRotReader, RotFileReader *externalOrientationFileReader, RotFileReader *refRotReader, Vector3PairFileReader *referenceVectorReader, ObjectEditFileReader *objectEditFileReader, ISAR_SPLIT_REND_BITS_DATA *splitRendBits, IVAS_DEC_HANDLE *phIvasDec, int16_t *pcmBuf );

#else

static ivas_error decodeG192( DecArguments arg, BS_READER_HANDLE hBsReader, IVAS_DEC_HRTF_BINARY_WRAPPER *hHrtfBinary, RotFileReader *headRotReader, RotFileReader *externalOrientationFileReader, RotFileReader *refRotReader, Vector3PairFileReader *referenceVectorReader, ObjectEditFileReader *objectEditFileReader, ISAR_SPLIT_REND_BITS_DATA *splitRendBits, IVAS_DEC_HANDLE hIvasDec, int16_t *pcmBuf );

#endif

#ifdef FIX_FMSW_DEC

static ivas_error decodeVoIP( DecArguments arg, BS_READER_HANDLE hBsReader, IVAS_DEC_HRTF_BINARY_WRAPPER *hHrtf, RotFileReader *headRotReader, RotFileReader *externalOrientationFileReader, RotFileReader *refRotReader, Vector3PairFileReader *referenceVectorReader, ObjectEditFileReader *objectEditFileReader, ISAR_SPLIT_REND_BITS_DATA *splitRendBits, IVAS_DEC_HANDLE *phIvasDec, int16_t *pcmBuf );

#else

static ivas_error decodeVoIP( DecArguments arg, BS_READER_HANDLE hBsReader, IVAS_DEC_HRTF_BINARY_WRAPPER *hHrtf, RotFileReader *headRotReader, RotFileReader *externalOrientationFileReader, RotFileReader *refRotReader, Vector3PairFileReader *referenceVectorReader, ObjectEditFileReader *objectEditFileReader, ISAR_SPLIT_REND_BITS_DATA *splitRendBits, IVAS_RENDER_CONFIG_DATA *renderConfig, IVAS_DEC_HANDLE *phIvasDec, int16_t *pcmBuf );

#endif

static ivas_error load_hrtf_from_file( IVAS_DEC_HRTF_BINARY_WRAPPER *hHrtfBinary, IVAS_DEC_HANDLE hIvasDec, const IVAS_AUDIO_CONFIG OutputConfig, const int32_t output_Fs );

#ifdef DEBUGGING

static ivas_error printBitstreamInfoVoip( DecArguments arg, BS_READER_HANDLE hBsReader, IVAS_DEC_HANDLE hIvasDec );

static int16_t app_own_random( int16_t *seed );

#endif

static void do_object_editing( IVAS_EDITABLE_PARAMETERS *editableParameters, ObjectEditFileReader *objectEditFileReader );

#ifndef FIX_FMSW_DEC

static ivas_error restartDecoder( IVAS_DEC_HANDLE *phIvasDec, const IVAS_DEC_MODE decMode, DecArguments *arg, IVAS_RENDER_CONFIG_DATA *renderConfig, IVAS_CUSTOM_LS_DATA *hLsCustomData );

#endif





/*------------------------------------------------------------------------------------------*
@@ -611,6 +621,14 @@ int main( 
            goto cleanup;

        }



#ifdef FIX_2500_RENDCONF_REFACTOR

        if ( RenderConfigReader_checkValues( renderConfigReader ) != IVAS_ERR_OK )

        {

            fprintf( stderr, "Invalid renderer configuration parameters\n\n" );

            goto cleanup;

        }

#endif



        aeCount = RenderConfigReader_getAcousticEnvironmentCount( renderConfigReader );

        if ( aeCount > 0 )

        {
@@ -690,6 +708,13 @@ int main( 


        if ( arg.outputConfig == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB )

        {

#ifdef FIX_2500_RENDCONF_REFACTOR

            if ( ( error = IVAS_DEC_GetAcousticEnvironment( hIvasDec, aeID, &renderConfig.roomAcoustics ) ) != IVAS_ERR_OK )

            {

                fprintf( stderr, "Failed to get acoustic environment with ID: %d\n\n", aeID );

                goto cleanup;

            }

#else

            if ( ( error = IVAS_DEC_GetAcousticEnvironment( hIvasDec, aeID, &renderConfig.roomAcoustics ) ) == IVAS_ERR_OK )

            {

                if ( RenderConfigReader_checkValues( &renderConfig ) != IVAS_ERR_OK )
@@ -703,6 +728,7 @@ int main( 
                fprintf( stderr, "Failed to get acoustic environment with ID: %d\n\n", aeID );

                goto cleanup;

            }

#endif

        }



        /* ISAR frame size is set from command line, not renderer config file.
@@ -775,11 +801,19 @@ int main( 


    if ( arg.voipMode )

    {

#ifdef FIX_FMSW_DEC

        error = decodeVoIP( arg, hBsReader, &hHrtfBinary, headRotReader, externalOrientationFileReader, refRotReader, referenceVectorReader, objectEditFileReader, &splitRendBits, &hIvasDec, pcmBuf );

#else

        error = decodeVoIP( arg, hBsReader, &hHrtfBinary, headRotReader, externalOrientationFileReader, refRotReader, referenceVectorReader, objectEditFileReader, &splitRendBits, &renderConfig, &hIvasDec, pcmBuf );

#endif

    }

    else

    {

#ifdef FIX_FLOAT_1539_G192_FORMAT_SWITCH

        error = decodeG192( arg, hBsReader, &hHrtfBinary, headRotReader, externalOrientationFileReader, refRotReader, referenceVectorReader, objectEditFileReader, &splitRendBits, &hIvasDec, pcmBuf );

#else

        error = decodeG192( arg, hBsReader, &hHrtfBinary, headRotReader, externalOrientationFileReader, refRotReader, referenceVectorReader, objectEditFileReader, &splitRendBits, hIvasDec, pcmBuf );

#endif

    }



    if ( error == IVAS_ERR_OK || error == IVAS_ERR_END_OF_FILE )
@@ -1957,6 +1991,7 @@ static ivas_error initOnFirstGoodFrame( 
        uint16_t rtpDecSeed = RANDOM_INITSEED_DEC;

        uint32_t ssrc = ( (uint32_t) IVAS_RTP_OwnRandom( &rtpDecSeed ) & 0x0000FFFF ) | ( (uint32_t) IVAS_RTP_OwnRandom( &rtpDecSeed ) << 16 );

        uint16_t seqNumInitVal = IVAS_RTP_OwnRandom( &rtpDecSeed );

        uint8_t payloadType = DEFAULT_IVAS_PAYLOAD_TYPE; /* Dynamic PT are in range [96, 127] */



        if ( ( error = IVAS_DEC_GetDelay( hIvasDec, delayNumSamples_temp, &delayTimeScale_temp ) ) != IVAS_ERR_OK )

        {
@@ -1993,7 +2028,7 @@ static ivas_error initOnFirstGoodFrame( 




            /* Split Rendering RTPDump Output file */

            if ( ( error = IVAS_RTP_WRITER_Init( srRtp, arg.outputWavFilename, 1000 / ( IVAS_NUM_FRAMES_PER_SEC * splitRendCodecFrameSizeMs ), ssrc, seqNumInitVal ) ) != IVAS_ERR_OK )

            if ( ( error = IVAS_RTP_WRITER_Init( srRtp, arg.outputWavFilename, 1000 / ( IVAS_NUM_FRAMES_PER_SEC * splitRendCodecFrameSizeMs ), payloadType, ssrc, seqNumInitVal ) ) != IVAS_ERR_OK )

            {

                fprintf( stderr, "\nError: Can't open SR output bitstream file for RTP output %s \n\n", arg.outputWavFilename );

                return error;
@@ -2225,7 +2260,11 @@ static ivas_error decodeG192( 
    Vector3PairFileReader *referenceVectorReader,

    ObjectEditFileReader *objectEditFileReader,

    ISAR_SPLIT_REND_BITS_DATA *splitRendBits,

#ifdef FIX_FLOAT_1539_G192_FORMAT_SWITCH

    IVAS_DEC_HANDLE *phIvasDec,

#else

    IVAS_DEC_HANDLE hIvasDec,

#endif

    int16_t *pcmBuf )



{
@@ -2233,6 +2272,9 @@ static ivas_error decodeG192( 
    uint16_t bit_stream[IVAS_MAX_BITS_PER_FRAME + 4 * 8];

    int16_t i, num_bits;

    int16_t bfi = 0;

#ifdef FIX_FLOAT_1539_G192_FORMAT_SWITCH

    IVAS_DEC_HANDLE hIvasDec = *phIvasDec;

#endif

#ifdef DEBUGGING

    int16_t fec_seed = 12558; /* FEC_SEED */

#endif
@@ -2263,6 +2305,9 @@ static ivas_error decodeG192( 
    int16_t vec_pos_update, vec_pos_len;

    SplitFileReadWrite *splitRendWriter = NULL;

    int16_t isSplitRend, isSplitCoded;

#ifdef FIX_FLOAT_1539_G192_FORMAT_SWITCH

    bool restartNeeded;

#endif



#ifdef VARIABLE_SPEED_DECODING

    if ( arg.tsmEnabled )
@@ -2315,6 +2360,14 @@ static ivas_error decodeG192( 
            fprintf( stderr, "Failed to read renderer configuration from file %s\n\n", arg.renderConfigFilename );

            goto cleanup;

        }



#ifdef FIX_2500_RENDCONF_REFACTOR

        if ( RenderConfigReader_checkValues( renderConfigReader ) != IVAS_ERR_OK )

        {

            fprintf( stderr, "Invalid renderer configuration parameters\n\n" );

            goto cleanup;

        }

#endif

    }



    for ( i = 0; i < IVAS_MAX_NUM_OBJECTS; ++i )
@@ -2514,6 +2567,13 @@ static ivas_error decodeG192( 
                            arg.aeSequence.selected = 0;

                        }

                        arg.aeSequence.frameCounter = 0;

#ifdef FIX_2500_RENDCONF_REFACTOR

                        if ( ( error = RenderConfigReader_getAcousticEnvironment( renderConfigReader, arg.aeSequence.pID[arg.aeSequence.selected], &renderConfig.roomAcoustics ) ) != IVAS_ERR_OK )

                        {

                            fprintf( stderr, "Failed to get acoustic environment with ID %d\n\n", arg.aeSequence.pID[arg.aeSequence.selected] );

                            goto cleanup;

                        }

#else

                        if ( ( error = RenderConfigReader_getAcousticEnvironment( renderConfigReader, arg.aeSequence.pID[arg.aeSequence.selected], &renderConfig.roomAcoustics ) ) == IVAS_ERR_OK )

                        {

                            if ( RenderConfigReader_checkValues( &renderConfig ) != IVAS_ERR_OK )
@@ -2527,6 +2587,7 @@ static ivas_error decodeG192( 
                            fprintf( stderr, "Failed to get acoustic environment with ID %d\n\n", arg.aeSequence.pID[arg.aeSequence.selected] );

                            goto cleanup;

                        }

#endif

                        if ( ( error = IVAS_DEC_FeedRenderConfig( hIvasDec, renderConfig ) ) != IVAS_ERR_OK )

                        {

                            fprintf( stderr, "\nIVAS_DEC_FeedRenderConfig failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );
@@ -2594,6 +2655,45 @@ static ivas_error decodeG192( 
                    return error;

                }



#ifdef FIX_FLOAT_1539_G192_FORMAT_SWITCH

                if ( ( error = IVAS_DEC_isRestartNeeded( hIvasDec, &restartNeeded ) ) != IVAS_ERR_OK )

                {

                    return error;

                }



                if ( restartNeeded )

                {

#ifdef FIX_FMSW_DEC

                    if ( ( error = IVAS_DEC_Restart( hIvasDec, IVAS_DEC_MODE_IVAS ) ) != IVAS_ERR_OK ) /* note: only switching within IVAS formats is supported in G.192 */

                    {

                        fprintf( stderr, "\nIVAS_DEC_Restart restart failed: %s\n", IVAS_DEC_GetErrorMessage( error ) );

                        goto cleanup;

                    }

#else

                    IVAS_DEC_BS_FORMAT tempFormat;

                    if ( ( error = IVAS_DEC_GetFormat( hIvasDec, &tempFormat ) ) != IVAS_ERR_OK )

                    {

                        fprintf( stderr, "\nError in IVAS_DEC_GetFormat, code: %d\n", error );

                        goto cleanup;

                    }

                    IVAS_DEC_MODE codecMode = ( tempFormat == IVAS_DEC_BS_MONO ) ? IVAS_DEC_MODE_EVS : IVAS_DEC_MODE_IVAS;

                    error = restartDecoder(

                        &hIvasDec,

                        codecMode,

                        &arg,

                        NULL, /* ToDo : Provide rendererConfig */

                        NULL  /* ToDo : Provide LS Custom Data */

                    );

                    if ( error != IVAS_ERR_OK )

                    {

                        fprintf( stderr, "\nFailed to restart decoder\n" );

                        goto cleanup;

                    }

                    *phIvasDec = hIvasDec; /* Update for main()' s free */

#endif

                }

#endif



                /* Placeholder for memory reallocation */

                /* ... */
@@ -3059,7 +3159,7 @@ static ivas_error printBitstreamInfoVoip( 
{

    bool previewFailed = true;

    ivas_error error = IVAS_ERR_OK;

    IVAS_RTP ivasRtp;

    IVAS_RTP ivasRtp = { 0 };

    uint8_t au[( IVAS_MAX_BITS_PER_FRAME + 7 ) >> 3];

    int16_t auSizeBits;

    uint8_t *auPtr = NULL;
@@ -3165,7 +3265,9 @@ static ivas_error decodeVoIP( 
    Vector3PairFileReader *referenceVectorReader,

    ObjectEditFileReader *objectEditFileReader,

    ISAR_SPLIT_REND_BITS_DATA *splitRendBits,

#ifndef FIX_FMSW_DEC

    IVAS_RENDER_CONFIG_DATA *renderConfig,

#endif

    IVAS_DEC_HANDLE *phIvasDec,

    int16_t *pcmBuf )

{
@@ -3323,6 +3425,15 @@ static ivas_error decodeVoIP( 


        /* EVS RTP payload format has timescale 16000, JBM uses 1000 internally */

        rtpTimeStamp = rtpTimeStamp / 16;



#ifdef FIX_FMSW_DEC_2

        arg.decMode = ( ivasRtp.codecId == IVAS_RTP_EVS ) ? IVAS_DEC_MODE_EVS : IVAS_DEC_MODE_IVAS;

        if ( ( error = IVAS_DEC_Restart( hIvasDec, arg.decMode ) ) != IVAS_ERR_OK ) /* note: when the RTP bitstream starts with EVS, do the restart */

        {

            fprintf( stderr, "\nIVAS_DEC_Restart restart failed: %s\n", IVAS_DEC_GetErrorMessage( error ) );

            goto cleanup;

        }

#endif

    }

    if ( error != IVAS_ERR_OK )

    {
@@ -3356,6 +3467,14 @@ static ivas_error decodeVoIP( 
        /* restart decoder in case of format switching */

        if ( ivasRtp.restartNeeded )

        {

#ifdef FIX_FMSW_DEC

            arg.decMode = ( ivasRtp.codecId == IVAS_RTP_EVS ) ? IVAS_DEC_MODE_EVS : IVAS_DEC_MODE_IVAS;

            if ( ( error = IVAS_DEC_Restart( hIvasDec, arg.decMode ) ) != IVAS_ERR_OK ) /* note: switching between EVS and IVAS is supported in RTP */

            {

                fprintf( stderr, "\nIVAS_DEC_Restart restart failed: %s\n", IVAS_DEC_GetErrorMessage( error ) );

                goto cleanup;

            }

#else

            IVAS_DEC_MODE newDecModeInPacket = ( ivasRtp.codecId == IVAS_RTP_EVS ) ? IVAS_DEC_MODE_EVS : IVAS_DEC_MODE_IVAS;

            if ( ( error = restartDecoder(

                       &hIvasDec,
@@ -3370,7 +3489,10 @@ static ivas_error decodeVoIP( 
            }



            *phIvasDec = hIvasDec; /* Update for main()' s free */

#endif

            ivasRtp.restartNeeded = false;

            bitstreamReadDone = false;

            parametersAvailableForEditing = false;

        }



        /* reference vector */
@@ -3599,6 +3721,13 @@ static ivas_error decodeVoIP( 


                if ( restartNeeded )

                {

#ifdef FIX_FMSW_DEC

                    if ( ( error = IVAS_DEC_Restart( hIvasDec, IVAS_DEC_MODE_IVAS ) ) != IVAS_ERR_OK ) /* note: only switching within IVAS formats is supported in non-RTP VoIP */

                    {

                        fprintf( stderr, "\nIVAS_DEC_Restart restart failed: %s\n", IVAS_DEC_GetErrorMessage( error ) );

                        goto cleanup;

                    }

#else

                    IVAS_DEC_BS_FORMAT tempBsFormat;

                    if ( ( error = IVAS_DEC_GetFormat( hIvasDec, &tempBsFormat ) ) != IVAS_ERR_OK )

                    {
@@ -3619,6 +3748,9 @@ static ivas_error decodeVoIP( 
                        goto cleanup;

                    }

                    *phIvasDec = hIvasDec; /* Update for main()' s free */

#endif

                    bitstreamReadDone = false;

                    parametersAvailableForEditing = false;

                }



                /* Placeholder for memory reallocation */
@@ -3791,18 +3923,7 @@ static ivas_error decodeVoIP( 
        }

        else if ( decodedGoodFrame )

        {

#ifdef FIX_RENDER_FRAME_SIZE_IN_RTP_SR

            if ( splitRendBits->codec == ISAR_SPLIT_REND_CODEC_LCLD )

            {

                srInfo.bitrateKbps = splitRendBits->bits_written * 1000 / splitRendBits->codec_frame_size_ms;

            }

            else

            {

                srInfo.bitrateKbps = splitRendBits->bits_written * 1000 / splitRendBits->isar_frame_size_ms;

            }

#else

            srInfo.bitrateKbps = splitRendBits->bits_written * 1000 / splitRendBits->codec_frame_size_ms;

#endif

            srInfo.codec = ( splitRendBits->codec == ISAR_SPLIT_REND_CODEC_LC3PLUS ) ? IVAS_SR_TRANSPORT_LC3PLUS : IVAS_SR_TRANSPORT_LCLD;

            srInfo.codecFrameSizeMs = (uint32_t) splitRendBits->codec_frame_size_ms;
@@ -4315,7 +4436,7 @@ static ivas_error load_hrtf_from_file( 
    return IVAS_ERR_OK;

}





#ifndef FIX_FMSW_DEC

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

 * restartDecoder()

 *
@@ -4388,12 +4509,6 @@ static ivas_error restartDecoder( 
        }

    }



    if ( ( error = IVAS_DEC_PrintConfig( hIvasDec, 1, arg->voipMode ) ) != IVAS_ERR_OK )

    {

        fprintf( stderr, "\nIVAS_DEC_PrintConfig failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );

        goto cleanup;

    }



    /* ISAR frame size is set from command line, not renderer config file.

     * This will be ignored if output format is not split rendering. */

    if ( renderConfig != NULL )
@@ -4426,4 +4541,5 @@ cleanup: 
    return error;

}



#endif

#undef WMC_TOOL_SKIP

apps/isar_post_rend.c

+29 −29
Original line number Diff line number Diff line
@@ -740,9 +740,6 @@ static ivas_error parseSRParamsFile( 
    int16_t *lc3plusHighRes )

{

    FILE *fParamSR = fopen( srParamsFilePath, "r" );

    ivas_error error = IVAS_ERR_OK;

    IVAS_RTP srRtp = { 0 };



    if ( NULL == fParamSR )

    {

        fprintf( stderr, "error in opening srParams File %s)\n", srParamsFilePath );
@@ -783,7 +780,10 @@ static ivas_error parseSRParamsFile( 


    fclose( fParamSR );



    {

        /* Peek the RTP stream to ascertain the codec and codec_frame_size */

        ivas_error error = IVAS_ERR_OK;

        IVAS_RTP srRtp = { 0 };

        if ( ( error = IVAS_RTP_READER_Init( &srRtp, rtpFilePath, NULL, false, NULL ) ) != IVAS_ERR_OK )

        {

            fprintf( stderr, "error in IVAS_RTP_READER_Init() for sr RTP peek: %d\n", error );
@@ -815,8 +815,8 @@ static ivas_error parseSRParamsFile( 
                break;

            }

        }



        IVAS_RTP_Term( &srRtp );

    }



    return IVAS_ERR_OK;

}

lib_com/options.h

+16 −3
Original line number Diff line number Diff line
@@ -161,14 +161,27 @@ 
/*#define FIX_I4_OL_PITCH*/                             /* fix open-loop pitch used for EVS core switching */

#define TMP_1342_WORKAROUND_DEC_FLUSH_BROKEN_IN_SR      /* FhG: Temporary workaround for incorrect implementation of decoder flush with split rendering */

#define NONBE_1122_KEEP_EVS_MODE_UNCHANGED              /* FhG: Disables fix for issue 1122 in EVS mode to keep BE tests green. This switch should be removed once the 1122 fix is added to EVS via a CR.  */

#define FIX_FLOAT_1535_ARI_RES_Q_CLEANUP                /* FhG: remove dead code from tcx_ari_res_Q_spec() */

#define FIX_RENDER_FRAME_SIZE_IN_RTP_SR                 /* Dolby: Fix incorrect setting for render frame size and codec frame size in SR RTP */

#define FIX_FLOAT_1539_G192_FORMAT_SWITCH               /* Nokia: reintroduce format switching for g192 bitstreams */

#define FIX_2095_REMOVE_UNUSED_ISAR_TABLES              /* Dolby: remove unused ISAR */

#define FIX_FLOAT_1582_STEREO_DFT_QUANTIZE_ITD          /* FhG: float issue 1582: Remove unncessary statement from stereo_dft_quantize_itd() */

#define FIX_1585_ASAN_FORMAT_SW_ALT                     /* VA,FhG: float issues 1585,1593: alternative fix memory leaks with format switching */

#define FIX_2570_BUF_OVFL                               /* Orange: basop issue 2570: global-buffer-overflow in lib_rend/ivas_objectRenderer_sources_fx.c */



/* #################### End BE switches ################################## */



/* #################### Start NON-BE switches ############################ */

/* any switch which is non-be wrt. TS 26.258 V3.0 */

#define FIX_FLOAT_1493_MASA_ENCODE_STABILITY_IMPROVE    /* Nokia: float issue 1493: Improves float decision stability in MASA encoding by adjusting reduction code */



#define FIX_1521_SBA_LOUDNESS_STEREO                    /* FhG: issue 1521: Fix loudness for SBA to stereo rendering */

#define FIX_2500_RENDCONF_REFACTOR                      /* Eri: Basop issue #2500: Renderer configuration range check before conversion to fixed point. Harmonize between BASOP/float */

#define FIX_BASOP_2023_TDREND_DISTATT_PRECISION         /* Eri: Basop issue 2023: Distance attenuation scaling, synch with BASOP updates and adding clamping of distance att input and listener position  */

#define FIX_1576_LCLD_CRASH_DIFFERENT_CODEC_ISAR_FRAME_SIZE  /* Dolby: float issue 1576: fix for crash in LCLD mode when codec frame size is less than isar frame size */

#define FIX_1452_DEFAULT_REVERB                         /* Nokia/Philips/FhG: Fix default room presets and their usage in renderer */

#define FIX_1559                                        /* Eri/FhG: fix for Issue 1559 in FD CNG with bitrate/bw switching */

#define FIX_FMSW_DEC                                    /* float issue 1542: fix JBM issue in format switching */

#define FIX_FMSW_DEC_2                                  /* float issue 1575: fix crash for format switching when bitsream starts with EVS */

#define FIX_1548_HARMONIZE_NON_DIEGETIC_PANNING_LAW     /* Orange: float issue 1548: Harmonize non diegetic panning law in ISM and renderers */

#define FIX_FLOAT_1578_OMASA_REND_SPIKES                /* Nokia: Float issue 1578: Fix spikes and collapsed perception in OMASA/MASA rendering to FOA/HOA */



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

lib_isar/isar_splitRendererPre.c

+0 −2
Original line number Diff line number Diff line
@@ -1858,10 +1858,8 @@ ivas_error splitRendLc3plusEncodeAndWrite( 
    pBits->bits_written += 8 * lc3plusBitstreamSize;

    pBits->codec = ISAR_SPLIT_REND_CODEC_LC3PLUS;

    pBits->pose_correction = hSplitBin->multiBinPoseData.poseCorrectionMode;

#ifndef FIX_RENDER_FRAME_SIZE_IN_RTP_SR

    pBits->codec_frame_size_ms = (int16_t) ( hSplitBin->hLc3plusEnc->config.lc3plus_frame_duration_us / 1000 );

    pBits->isar_frame_size_ms = (int16_t) ( hSplitBin->hLc3plusEnc->config.isar_frame_duration_us / 1000 );

#endif

    pBits->lc3plus_highres = hSplitBin->hLc3plusEnc->config.high_res_mode_enabled;



    return IVAS_ERR_OK;

lib_isar/lib_isar_pre_rend.c

+19 −6
Original line number Diff line number Diff line
@@ -153,10 +153,29 @@ ivas_error ISAR_PRE_REND_open( 
        }

        else

        {

#ifndef FIX_1576_LCLD_CRASH_DIFFERENT_CODEC_ISAR_FRAME_SIZE

            int16_t iNumBlocksPerFrame;

            iNumBlocksPerFrame = ( CLDFB_NO_COL_MAX * pSplitRendConfig->codec_frame_size_ms ) / 20;

#else

            int16_t iNumBlocksPerFrame, iNumLCLDIterationsPerFrame;

            if ( pSplitRendConfig->codec_frame_size_ms > 0 )

            {

                iNumLCLDIterationsPerFrame = (int16_t) pSplitRendConfig->isar_frame_size_ms / ( pSplitRendConfig->codec_frame_size_ms );

                iNumLCLDIterationsPerFrame = max( 1, iNumLCLDIterationsPerFrame );

                iNumBlocksPerFrame = CLDFB_NO_COL_MAX * pSplitRendConfig->codec_frame_size_ms / 20;

            }

            else

            {

                iNumLCLDIterationsPerFrame = 1;

                iNumBlocksPerFrame = CLDFB_NO_COL_MAX;

            }

#endif



#ifndef FIX_1576_LCLD_CRASH_DIFFERENT_CODEC_ISAR_FRAME_SIZE

            if ( ( error = isar_splitBinLCLDEncOpen( &hSplitBinRend->hSplitBinLCLDEnc, output_Fs, BINAURAL_CHANNELS, isar_get_lcld_bitrate( pSplitRendConfig->splitRendBitRate, hSplitBinRend->multiBinPoseData.poseCorrectionMode ), iNumBlocksPerFrame, 1 ) ) != IVAS_ERR_OK )

#else

            if ( ( error = isar_splitBinLCLDEncOpen( &hSplitBinRend->hSplitBinLCLDEnc, output_Fs, BINAURAL_CHANNELS, isar_get_lcld_bitrate( pSplitRendConfig->splitRendBitRate, hSplitBinRend->multiBinPoseData.poseCorrectionMode ), iNumBlocksPerFrame, iNumLCLDIterationsPerFrame ) ) != IVAS_ERR_OK )

#endif

            {

                return error;

            }
@@ -329,18 +348,12 @@ ivas_error ISAR_PRE_REND_MultiBinToSplitBinaural( 
    {

        pBits->codec = splitCodec;

        pBits->pose_correction = hSplitBin->multiBinPoseData.poseCorrectionMode;

#ifdef FIX_RENDER_FRAME_SIZE_IN_RTP_SR

        pBits->codec_frame_size_ms = codec_frame_size_ms;

        pBits->isar_frame_size_ms = isar_frame_size_ms;

#endif



        if ( splitCodec == ISAR_SPLIT_REND_CODEC_LCLD )

        {

            available_bits = ( SplitRendBitRate * hSplitBin->hSplitBinLCLDEnc->iNumBlocks * hSplitBin->hSplitBinLCLDEnc->iNumIterations ) / ( 16 * FRAMES_PER_SEC );

            available_bits -= pBits->bits_written;

#ifndef FIX_RENDER_FRAME_SIZE_IN_RTP_SR

            pBits->codec_frame_size_ms = codec_frame_size_ms;

#endif

            isar_splitBinLCLDEncProcess( hSplitBin->hSplitBinLCLDEnc, Cldfb_In_BinReal, Cldfb_In_BinImag, available_bits, pBits );

        }

        else