Commit bf73c65a authored by Marek Szczerba's avatar Marek Szczerba
Browse files

Merge branch 'main' into 109-harmonize-head-and-orientation-tracking

parents 72b457e5 40b89b30

apps/decoder.c

+77 −9
Original line number Diff line number Diff line
@@ -1229,9 +1229,17 @@ static ivas_error initOnFirstGoodFrame( 
    }

    else

    {

#ifdef BINAURALIZATION_DELAY_REPORT

        pFullDelayNumSamples[0] = 0;

#else

        *pFullDelayNumSamples = 0;

#endif

    }

#ifdef BINAURALIZATION_DELAY_REPORT

    *pRemainingDelayNumSamples = pFullDelayNumSamples[0];

#else

    *pRemainingDelayNumSamples = *pFullDelayNumSamples;

#endif



    if ( ( error = IVAS_DEC_GetNumOutputChannels( hIvasDec, pNumOutChannels ) ) != IVAS_ERR_OK )

    {
@@ -1385,7 +1393,11 @@ static ivas_error decodeG192( 
    int16_t numInitialBadFrames = 0; /* Number of bad frames received until first good frame is decoded */

    int16_t nOutChannels = 0;

    int16_t delayNumSamples = -1;

#ifdef BINAURALIZATION_DELAY_REPORT

    int16_t delayNumSamples_orig[3]; /* stores: overall delay, dec+rend delay, and binauralization delay */

#else

    int16_t delayNumSamples_orig = 0;

#endif

    int16_t nOutSamples = 0;

    int32_t delayTimeScale = 0;

    ivas_error error = IVAS_ERR_UNKNOWN;
@@ -1408,6 +1420,10 @@ static ivas_error decodeG192( 
        fprintf( stdout, "\n-- Start the decoder (quiet mode) --\n\n" );

    }



#ifdef BINAURALIZATION_DELAY_REPORT

    delayNumSamples_orig[0] = -1;

#endif



#ifdef WMOPS

    reset_stack();

    reset_wmops();
@@ -1527,7 +1543,11 @@ static ivas_error decodeG192( 
                    arg,

                    numInitialBadFrames,

                    nOutSamples,

#ifdef BINAURALIZATION_DELAY_REPORT

                    delayNumSamples_orig,

#else

                    &delayNumSamples_orig,

#endif

                    &delayNumSamples,

                    &delayTimeScale,

                    &bsFormat,
@@ -1628,13 +1648,39 @@ static ivas_error decodeG192( 
#endif

    }



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

     * Add zeros at the end to have equal length of synthesized signals

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



#ifdef BINAURALIZATION_DELAY_REPORT

    memset( pcmBuf, 0, delayNumSamples_orig[0] * nOutChannels * sizeof( int16_t ) );

    if ( ( error = AudioFileWriter_write( afWriter, pcmBuf, delayNumSamples_orig[0] * nOutChannels ) ) != IVAS_ERR_OK )

#else

    memset( pcmBuf, 0, delayNumSamples_orig * nOutChannels * sizeof( int16_t ) );

    if ( ( error = AudioFileWriter_write( afWriter, pcmBuf, delayNumSamples_orig * nOutChannels ) ) != IVAS_ERR_OK )

#endif

    {

        fprintf( stderr, "\nError writing output file: %s\n", ivas_error_to_string( error ) );

        goto cleanup;

    }



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

     * Printouts after decoding has finished

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



    if ( !arg.quietModeEnabled )

    {

#ifdef BINAURALIZATION_DELAY_REPORT

        printf( "\n\nDecoder+renderer delay: %4.2f ms   (%3u samples at timescale %5u)\n", 1000.f * delayNumSamples_orig[1] / (float) delayTimeScale, delayNumSamples_orig[1], delayTimeScale );



        if ( delayNumSamples_orig[2] > 0 )

        {

            printf( "HRIR/BRIR delay:        %4.2f ms   (%3u samples at timescale %5u)\n", 1000.f * delayNumSamples_orig[2] / (float) delayTimeScale, delayNumSamples_orig[2], delayTimeScale );

            printf( "Total delay:            %4.2f ms   (%3u samples at timescale %5u)\n", 1000.f * delayNumSamples_orig[0] / (float) delayTimeScale, delayNumSamples_orig[0], delayTimeScale );

        }

#else

        fprintf( stdout, "\nDecoder delay:          %-5u [samples]  - Timescale: %5u\n", delayNumSamples_orig, delayTimeScale );

#endif

    }



    /* Print output metadata file name(s) */
@@ -1654,14 +1700,6 @@ static ivas_error decodeG192( 
        }

    }



    /* add zeros at the end to have equal length of synthesized signals */

    memset( pcmBuf, 0, delayNumSamples_orig * nOutChannels * sizeof( int16_t ) );

    if ( ( error = AudioFileWriter_write( afWriter, pcmBuf, delayNumSamples_orig * nOutChannels ) ) != IVAS_ERR_OK )

    {

        fprintf( stderr, "\nError writing output file: %s\n", ivas_error_to_string( error ) );

        goto cleanup;

    }



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

     * Close files and deallocate resources

     *------------------------------------------------------------------------------------------*/
@@ -1831,7 +1869,11 @@ static ivas_error decodeVoIP( 
#endif

    JbmOffsetFileWriter *jbmOffsetWriter = NULL;



#ifdef BINAURALIZATION_DELAY_REPORT

    int16_t delayNumSamples_orig[3]; /* stores: overall delay, dec+rend delay, and binauralization delay */

#else

    int16_t delayNumSamples_orig = -1;

#endif

    int16_t delayNumSamples = -1;

    int32_t delayTimeScale = -1;
@@ -1845,11 +1887,15 @@ static ivas_error decodeVoIP( 


    IVAS_DEC_BS_FORMAT bsFormat = IVAS_DEC_BS_UNKOWN;

    IsmFileWriter *ismWriters[IVAS_MAX_NUM_OBJECTS];



    for ( int16_t i = 0; i < IVAS_MAX_NUM_OBJECTS; ++i )

    {

        ismWriters[i] = NULL;

    }



#ifdef BINAURALIZATION_DELAY_REPORT

    delayNumSamples_orig[0] = -1;

#endif



    rtpdumpDepacker.rtpdump = NULL;

    switch ( arg.inputFormat )
@@ -2046,7 +2092,11 @@ static ivas_error decodeVoIP( 
                    arg,

                    numInitialBadFrames,

                    nOutSamples,

#ifdef BINAURALIZATION_DELAY_REPORT

                    delayNumSamples_orig,

#else

                    &delayNumSamples_orig,

#endif

                    &delayNumSamples,

                    &delayTimeScale,

                    &bsFormat,
@@ -2099,9 +2149,17 @@ static ivas_error decodeVoIP( 
#endif

    }



    /* add zeros at the end to have equal length of synthesized signals */

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

     * Add zeros at the end to have equal length of synthesized signals

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



#ifdef BINAURALIZATION_DELAY_REPORT

    memset( pcmBuf, 0, delayNumSamples_orig[0] * nOutChannels * sizeof( int16_t ) );

    if ( ( error = AudioFileWriter_write( afWriter, pcmBuf, delayNumSamples_orig[0] * nOutChannels ) ) != IVAS_ERR_OK )

#else

    memset( pcmBuf, 0, delayNumSamples_orig * nOutChannels * sizeof( int16_t ) );

    if ( ( error = AudioFileWriter_write( afWriter, pcmBuf, delayNumSamples_orig * nOutChannels ) ) != IVAS_ERR_OK )

#endif

    {

        fprintf( stderr, "\nError writing output file: %s\n", ivas_error_to_string( error ) );

        goto cleanup;
@@ -2113,7 +2171,17 @@ static ivas_error decodeVoIP( 


    if ( !arg.quietModeEnabled )

    {

#ifdef BINAURALIZATION_DELAY_REPORT

        printf( "\n\nDecoder+renderer delay: %4.2f ms   (%3u samples at timescale %5u)\n", 1000.f * delayNumSamples_orig[1] / (float) delayTimeScale, delayNumSamples_orig[1], delayTimeScale );



        if ( delayNumSamples_orig[2] > 0 )

        {

            printf( "HRIR/BRIR delay:        %4.2f ms   (%3u samples at timescale %5u)\n", 1000.f * delayNumSamples_orig[2] / (float) delayTimeScale, delayNumSamples_orig[2], delayTimeScale );

            printf( "Total delay:            %4.2f ms   (%3u samples at timescale %5u)\n", 1000.f * delayNumSamples_orig[0] / (float) delayTimeScale, delayNumSamples_orig[0], delayTimeScale );

        }

#else

        printf( "\nDecoder delay:       %5u [samples]  - Timescale: %5u\n", delayNumSamples_orig, delayTimeScale );

#endif

    }



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

lib_com/delay_comp.c

+9 −4
Original line number Diff line number Diff line
@@ -54,8 +54,11 @@ int32_t get_delay( 
    const int16_t enc_dec,          /* i  : encoder/decoder flag                */

    const int32_t io_fs,            /* i  : input/output sampling frequency     */

    const IVAS_FORMAT ivas_format,  /* i  : IVAS format                         */

    HANDLE_CLDFB_FILTER_BANK hCldfb,  /* i  : Handle of Cldfb analysis            */

    HANDLE_CLDFB_FILTER_BANK hCldfb /* i  : Handle of Cldfb analysis            */

#ifndef BINAURALIZATION_DELAY_REPORT

    ,

    const int32_t binaural_latency_ns /* i  : binaural renderer HRTF delay in ns  */

#endif

)

{

    int32_t delay = 0;
@@ -100,8 +103,10 @@ int32_t get_delay( 
                delay += IVAS_FB_DEC_DELAY_NS;

            }



#ifndef BINAURALIZATION_DELAY_REPORT

            /* compensate for binauralization delay */

            delay += binaural_latency_ns;

#endif

        }

    }

lib_com/hp50.c

+0 −1
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ 
    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0

  ====================================================================================*/



#include "typedef.h"

#include <stdint.h>

#include "options.h"

#ifdef DEBUGGING

lib_com/ivas_entropy_coder_common.c

+4 −4
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ int16_t ivas_map_num_pred_r_to_idx( 
                pred_r_to_idx = PRED_Q_31;

                break;

            default:

                assert( "Forbidden value for prediction quantization strategy index" );

                assert( !"Forbidden value for prediction quantization strategy index" );

                break;

        }

    }
@@ -145,7 +145,7 @@ int16_t ivas_map_num_pred_r_to_idx( 
                pred_r_to_idx = PRED_Q_21_ACTIVE_W;

                break;

            default:

                assert( "Forbidden value for prediction quantization strategy index" );

                assert( !"Forbidden value for prediction quantization strategy index" );

                break;

        }

    }
@@ -179,7 +179,7 @@ int16_t ivas_map_num_drct_r_to_idx( 
            drct_r_to_idx = DRCT_Q_11;

            break;

        default:

            assert( "Forbidden value for DRCT quantization strategy index" );

            assert( !"Forbidden value for DRCT quantization strategy index" );

            break;

    }

    return drct_r_to_idx;
@@ -217,7 +217,7 @@ int16_t ivas_map_num_decd_r_to_idx( 
            decd_r_to_idx = DECD_Q_11;

            break;

        default:

            assert( "Forbidden value for DECD quantization strategy index" );

            assert( !"Forbidden value for DECD quantization strategy index" );

            break;

    }

lib_com/ivas_rom_com.h

+0 −1
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ 
#include "options.h"

#include "cnst.h"

#include "ivas_cnst.h"

#include "typedef.h"

#include "stat_com.h"

#include "ivas_stat_com.h"

#ifdef DEBUGGING