Commit e24cc969 authored by emerit's avatar emerit
Browse files

Merge branch... 

Merge branch 'float-1548-Harmonize-non-diegetic-panning-law-in-ISM-and-renderer' of https://forge.3gpp.org/rep/sa4/audio/ivas-basop into float-1548-Harmonize-non-diegetic-panning-law-in-ISM-and-renderer
parents 183ef5e3 6ba7db7e

apps/encoder.c

+0 −18
Original line number Diff line number Diff line
@@ -45,9 +45,7 @@ 
#include "masa_file_reader.h"

#include "rotation_file_reader.h"

#include "ivas_rtp_file.h"

#ifdef FIX_1527_CMR_BITRATE_IDX

#include "requests_file_reader.h"

#endif

#include "wmc_auto.h"
@@ -168,9 +166,7 @@ typedef struct 
    char *sceneOrientationTrajFileName;

    char *deviceOrientationTrajFileName;



#ifdef FIX_1527_CMR_BITRATE_IDX

    char *requestsFileName;

#endif

} EncArguments;
@@ -227,9 +223,7 @@ int main( 
    uint8_t au[IVAS_MAX_BITS_PER_FRAME / 8];

    IVAS_RTP ivasRtp = { 0 };



#ifdef FIX_1527_CMR_BITRATE_IDX

    ReqFileReader *requestsFileReader = NULL;

#endif

    /* Ideally ssrc is negotiated via SDP and sequence number is radomized but we

       use fixed seed for random num generator for regression based tests. Any realtime

       application should implement this initialization seperately */
@@ -667,7 +661,6 @@ int main( 
        }

    }



#ifdef FIX_1527_CMR_BITRATE_IDX

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

     * Open remote requests file for rtp packing (E-bytes)

     *------------------------------------------------------------------------------------------*/
@@ -679,7 +672,6 @@ int main( 
            goto cleanup;

        }

    }

#endif



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

     * Run the encoder
@@ -890,7 +882,6 @@ int main( 
                }

            }



#ifdef FIX_1527_CMR_BITRATE_IDX

            if ( requestsFileReader )

            {

                if ( ( error = ReadNextRequests( requestsFileReader, ivasRtp.remoteRequests, &ivasRtp.remoteRequestBitmap ) ) != IVAS_ERR_OK )
@@ -899,7 +890,6 @@ int main( 
                    goto cleanup;

                }

            }

#endif



            if ( ( error = IVAS_ENC_EncodeFrameToCompact( hIvasEnc, pcmBuf, pcmBufSize, au, &numBits ) ) != IVAS_ERR_OK )

            {
@@ -996,12 +986,10 @@ cleanup: 
        fclose( f_bitrateProfile );

    }



#ifdef FIX_1527_CMR_BITRATE_IDX

    if ( requestsFileReader )

    {

        RequestsFileReader_close( &requestsFileReader );

    }

#endif



    if ( sceneOrientationFileReader )

    {
@@ -1049,9 +1037,7 @@ static bool parseCmdlIVAS_enc( 
    /*-----------------------------------------------------------------*

     * Set default values

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

#ifdef FIX_1527_CMR_BITRATE_IDX

    memset( arg, 0, sizeof( *arg ) );

#endif



    arg->inputWavFilename = NULL;

    arg->outputBitstreamFilename = NULL;
@@ -1918,7 +1904,6 @@ static bool parseCmdlIVAS_enc( 
            arg->deviceOrientationTrajFileName = argv[i];

            i++;

        }

#ifdef FIX_1527_CMR_BITRATE_IDX

        else if ( strcmp( argv_to_upper, "-REQUESTS" ) == 0 )

        {

            i++;
@@ -1931,7 +1916,6 @@ static bool parseCmdlIVAS_enc( 
            arg->requestsFileName = argv[i];

            i++;

        }

#endif



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

         * Option not recognized
@@ -2151,9 +2135,7 @@ static void usage_enc( void ) 
    fprintf( stdout, "                      EVS RTP Payload Format is used. Optional N represents number of frames per RTP packet\n" );

    fprintf( stdout, "-scene_orientation  : Scene orientation trajectory file. Only used with rtpdump output.\n" );

    fprintf( stdout, "-device_orientation : Device orientation trajectory file. Only used with rtpdump output.\n" );

#ifdef FIX_1527_CMR_BITRATE_IDX

    fprintf( stdout, "-requests           : Remote requests file, Only used with rtpdump output.\n" );

#endif



    fprintf( stdout, "\n" );

apps/renderer.c

+13 −24
Original line number Diff line number Diff line
@@ -1251,7 +1251,7 @@ int main( 
    /* Set reverb room size if specified */

    if ( args.reverbRoomSize != IVAS_ROOM_SIZE_AUTO )

    {

        if ( ( IVAS_REND_SetReverbRoomSize( hIvasRend, args.reverbRoomSize ) ) != IVAS_ERR_OK )

        if ( ( error = IVAS_REND_SetReverbRoomSize( hIvasRend, args.reverbRoomSize ) ) != IVAS_ERR_OK )

        {

            fprintf( stderr, "\nError setting reverb room size\n" );

            goto cleanup;
@@ -3133,21 +3133,13 @@ static void IsmPositionProvider_getNextFrame( 
            objectMetadataBuffer->positions[objIdx].non_diegetic_flag = 0;

        }



        /* Wrap azimuth to lie within (-180, 180] range */



#ifdef FIX_1548_HARMONIZE_NON_DIEGETIC_PANNING_LAW

        IF( objectMetadataBuffer->positions[objIdx].non_diegetic_flag )

        {

            while ( LT_32( objectMetadataBuffer->positions[objIdx].azimuth_fx, -DEG_180_IN_Q22 ) )

            {

                objectMetadataBuffer->positions[objIdx].azimuth_fx = L_add( objectMetadataBuffer->positions[objIdx].azimuth_fx, DEG_360_IN_Q22 );

            }

            while ( GE_32( objectMetadataBuffer->positions[objIdx].azimuth_fx, DEG_180_IN_Q22 ) )

            {

                objectMetadataBuffer->positions[objIdx].azimuth_fx = L_sub( objectMetadataBuffer->positions[objIdx].azimuth_fx, DEG_360_IN_Q22 );

            }

        }

        ELSE

        {

        /* Wrap azimuth to lie within (0, 360] range */

#else

        /* Wrap azimuth to lie within (-180, 180] range */

#endif



        while ( LT_32( objectMetadataBuffer->positions[objIdx].azimuth_fx, 0 ) )

        {

            objectMetadataBuffer->positions[objIdx].azimuth_fx = L_add( objectMetadataBuffer->positions[objIdx].azimuth_fx, DEG_360_IN_Q22 );
@@ -3156,14 +3148,11 @@ static void IsmPositionProvider_getNextFrame( 
        {

            objectMetadataBuffer->positions[objIdx].azimuth_fx = L_sub( objectMetadataBuffer->positions[objIdx].azimuth_fx, DEG_360_IN_Q22 );

        }

        }

#else

        while ( LT_32( objectMetadataBuffer->positions[objIdx].azimuth_fx, 0 ) )

        {

            objectMetadataBuffer->positions[objIdx].azimuth_fx = L_add( objectMetadataBuffer->positions[objIdx].azimuth_fx, DEG_360_IN_Q22 );

        }

        while ( GE_32( objectMetadataBuffer->positions[objIdx].azimuth_fx, DEG_360_IN_Q22 ) )



#ifdef FIX_1548_HARMONIZE_NON_DIEGETIC_PANNING_LAW

        IF( objectMetadataBuffer->positions[objIdx].non_diegetic_flag && objectMetadataBuffer->positions[objIdx].azimuth_fx >= DEG_180_IN_Q22 )

        {

            /* Wrap azimuth to lie within [-180, 180) range for non-diegetic panning */

            objectMetadataBuffer->positions[objIdx].azimuth_fx = L_sub( objectMetadataBuffer->positions[objIdx].azimuth_fx, DEG_360_IN_Q22 );

        }

#endif

lib_com/basop_util.c

+0 −2
Original line number Diff line number Diff line
@@ -714,7 +714,6 @@ Word16 getScaleFactor16( /* o: measured headroom in range [ 
    return i;

}



#ifdef OPTIMIZE_FFT_STACK

/* o: measured headroom in range [0..31], 0 if all x[i] == 0 */

Word16 getScaleFactor32_cmplx(

    cmplx *x,          /* i: array containing 32-bit data */
@@ -772,7 +771,6 @@ Word16 getScaleFactor32_cmplx( 


    return s_min( i_re, i_im );

}

#endif





/********************************************************************/

lib_com/basop_util.h

+0 −2
Original line number Diff line number Diff line
@@ -221,13 +221,11 @@ Word16 getScaleFactor16( 
    const Word16 *x,      /* i: array containing 16-bit data */

    const Word16 len_x ); /* i: length of the array to scan  */



#ifdef OPTIMIZE_FFT_STACK

/* o: measured headroom in range [0..31], 0 if all x[i] == 0 */

Word16 getScaleFactor32_cmplx(

    cmplx *x,          /* i: array containing 32-bit data */

    const Word16 len_x /* i: length of the array to scan  */

);

#endif



/********************************************************************/

/*!

lib_com/edct_fx.c

+15 −366

File changed.

Preview size limit exceeded, changes collapsed.