Commit 3735486f authored by Mohammadreza Naghibzadeh's avatar Mohammadreza Naghibzadeh
Browse files

Merge remote-tracking branch 'origin/main' into 1793-fix-decoder-mc-to-mono-output-scaling 

# Conflicts:
#	lib_com/options.h
parents 7a9c1c4b d3b5c67f

.gitignore

0 → 100644
+86 −0
Original line number Diff line number Diff line 
# .gitignore for IVAS public collaboration Git repository



# Compiler output Unix

IVAS_cod

IVAS_dec

IVAS_rend

ISAR_post_rend

ambi_converter

obj/

*.a

*.o

*.P



# default CMake

build*/**/*



# Compiler output VS2017

IVAS_cod.exe

IVAS_dec.exe

IVAS_rend.exe

ISAR_post_rend.exe

ambi_converter.exe

*.user

.vs/

Debug_*/

Release_*/

*.obj

*.pdb



# Standalone TD object renderer

scripts/td_object_renderer/object_renderer_standalone/renderer_standalone

scripts/td_object_renderer/object_renderer_standalone/renderer_standalone.exe



# General/scripts

.DS_Store

.vscode

.cache

.idea

*.log

*.bak

.\#*

scripts/c-code_instrument/

scripts/ifdef_instrument.list

scripts/ref/

scripts/test/

scripts/out/

scripts/self_test_summary.txt

scripts/cppp/

binary/

tests/**/[c|d]ut

tests/**/ref

tests/*/testv

tests/hrtf_binary_loading/bitstream/*

tests/hrtf_binary_loading/dec_out_*/*

scripts/testv/*_cut*.pcm

scripts/testv/*_cut*.wav

scripts/testv/stvOMASA_*.met

scripts/testv/stvOMASA_*.csv

scripts/testv/stvOMASA_2ISM_1MASA1TC48c.wav

scripts/testv/stvOMASA_3ISM_1MASA1TC48c.wav

scripts/testv/stvO*

# default reference binary name

IVAS_cod_ref*

IVAS_dec_ref*

IVAS_rend_ref*

ISAR_post_rend_ref*



# Python files that pop up when running scripts

__pycache__/

*.py[cod]

*$py.class



# history

.history/



#externals

Externals/



# coan output files that are created when cleaning out switches

coan_out_*



# Additional ignored locations for the BASOP repo

/ci

/scripts

/tests

/pytest.ini

Workspace_msvc/ambi_converter.vcxproj

+4 −0
Original line number Diff line number Diff line
@@ -160,6 +160,10 @@ 
      <Project>{2FA8F384-0775-F3B7-F8C3-85209222FC70}</Project>

      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

    </ProjectReference>

    <ProjectReference Include="lib_debug.vcxproj">

      <Project>{54509728-928B-44D9-A118-A6F92F08B34F}</Project>

      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

    </ProjectReference>

  </ItemGroup>

  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

  <ImportGroup Label="ExtensionTargets">

apps/decoder.c

+4 −0
Original line number Diff line number Diff line
@@ -3487,7 +3487,11 @@ static void do_object_editing_fx( 
                if ( readInfo->obj_gain_relative[obj_idx] )

                {

                    /* gain: apply relative edit + saturation */

#ifdef FIX_2140_OBJECT_EDITING_SANITIZER_ISSUES

                    editableParameters->ism_metadata[obj_idx].gain_fx = L_max( L_min( L_shl_sat( Mpy_32_32( editableParameters->ism_metadata[obj_idx].gain_fx, (Word32) readInfo->obj_gain[obj_idx] * 536870912 ), 2 ), OBJ_EDIT_GAIN_MAX_FX ), OBJ_EDIT_GAIN_MIN_FX ); /* Q29*Q29 -> Q27 shift back to Q29 */

#else

                    editableParameters->ism_metadata[obj_idx].gain_fx = L_max( L_min( editableParameters->ism_metadata[obj_idx].gain_fx * (Word32) readInfo->obj_gain[obj_idx] * 536870912, OBJ_EDIT_GAIN_MAX_FX ), OBJ_EDIT_GAIN_MIN_FX ); /* Q29 */

#endif

                }

                else

                {

apps/renderer.c

+53 −5
Original line number Diff line number Diff line
@@ -3108,6 +3108,13 @@ void getMetadataFromFileReader( 
        fprintf( stderr, "\nError (%s) while reading ISM metadata from: %s\n\n", ivas_error_to_string( error ), IsmFileReader_getFilePath( ismReader ) );

        exit( -1 );

    }

#ifdef FIX_2084_FLOATING_POINT_LEFTOVERS

    objectMetadataBuffer->positions[objIdx].azimuth_fx = ismMetadata.azimuth_fx;

    objectMetadataBuffer->positions[objIdx].elevation_fx = ismMetadata.elevation_fx;

    objectMetadataBuffer->positions[objIdx].radius_fx = ismMetadata.radius_fx;

    objectMetadataBuffer->positions[objIdx].yaw_fx = ismMetadata.yaw_fx;

    objectMetadataBuffer->positions[objIdx].pitch_fx = ismMetadata.pitch_fx;

#else

    objectMetadataBuffer->positions[objIdx].azimuth_fx = (Word32) ( ismMetadata.azimuth * ( 1 << 22 ) );

    objectMetadataBuffer->positions[objIdx].elevation_fx = (Word32) ( ismMetadata.elevation * ( 1 << 22 ) );

    objectMetadataBuffer->positions[objIdx].radius_fx = (Word16) ( ismMetadata.radius * ( 1 << 9 ) );
@@ -3119,6 +3126,7 @@ void getMetadataFromFileReader( 
    objectMetadataBuffer->positions[objIdx].radius = ismMetadata.radius;

    objectMetadataBuffer->positions[objIdx].yaw = ismMetadata.yaw;

    objectMetadataBuffer->positions[objIdx].pitch = ismMetadata.pitch;

#endif

    objectMetadataBuffer->positions[objIdx].non_diegetic_flag = ismMetadata.non_diegetic_flag;



    return;
@@ -3172,20 +3180,50 @@ static void IsmPositionProvider_getNextFrame( 
        /* Otherwise fall back to default position */

        else

        {

#ifdef FIX_2084_FLOATING_POINT_LEFTOVERS

            objectMetadataBuffer->positions[objIdx].azimuth_fx = 0;

            objectMetadataBuffer->positions[objIdx].elevation_fx = 0;

            objectMetadataBuffer->positions[objIdx].radius_fx = 512; // 1.f in Q9

            objectMetadataBuffer->positions[objIdx].yaw_fx = 0;

            objectMetadataBuffer->positions[objIdx].pitch_fx = 0;

            objectMetadataBuffer->positions[objIdx].non_diegetic_flag = 0;

#else

            objectMetadataBuffer->positions[objIdx].azimuth = 0.0f;

            objectMetadataBuffer->positions[objIdx].elevation = 0.0f;

            objectMetadataBuffer->positions[objIdx].radius = 1.0f;

            objectMetadataBuffer->positions[objIdx].yaw = 0.0f;

            objectMetadataBuffer->positions[objIdx].pitch = 0.0f;

            objectMetadataBuffer->positions[objIdx].azimuth_fx = 0;

            objectMetadataBuffer->positions[objIdx].elevation_fx = 0;

            objectMetadataBuffer->positions[objIdx].radius_fx = 512;

            objectMetadataBuffer->positions[objIdx].yaw_fx = 0;

            objectMetadataBuffer->positions[objIdx].pitch_fx = 0;

            objectMetadataBuffer->positions[objIdx].non_diegetic_flag = 0;

#endif

        }



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

#ifdef FIX_2084_FLOATING_POINT_LEFTOVERS

        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 ) )

        {

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

        }



        /* Clamp elevation to lie within [-90, 90] range (can't be wrapped easily) */

        objectMetadataBuffer->positions[objIdx].elevation_fx = L_min( L_max( objectMetadataBuffer->positions[objIdx].elevation_fx, -DEG_90_IN_Q22 ), DEG_90_IN_Q22 );



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

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

        {

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

        }

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

        {

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

        }



        /* Clamp pitch to lie within [-90, 90] range (can't be wrapped easily) */

        objectMetadataBuffer->positions[objIdx].pitch_fx = L_min( L_max( objectMetadataBuffer->positions[objIdx].pitch_fx, -DEG_90_IN_Q22 ), DEG_90_IN_Q22 );

#else

        while ( objectMetadataBuffer->positions[objIdx].azimuth < 0.0f )

        {

            objectMetadataBuffer->positions[objIdx].azimuth += 360.0f;
@@ -3213,6 +3251,7 @@ static void IsmPositionProvider_getNextFrame( 
        objectMetadataBuffer->positions[objIdx].pitch = min( max( objectMetadataBuffer->positions[objIdx].pitch, -90 ), 90 );

        objectMetadataBuffer->positions[objIdx].yaw_fx = (Word32) ( ( objectMetadataBuffer->positions[objIdx].yaw ) * ( 1 << Q22 ) );

        objectMetadataBuffer->positions[objIdx].pitch_fx = (Word32) ( ( objectMetadataBuffer->positions[objIdx].pitch ) * ( 1 << Q22 ) );

#endif

    }



    ++positionProvider->frameCounter;
@@ -3517,6 +3556,14 @@ static void parseObjectPosition( 
        exit( -1 );

    }



#ifdef FIX_2084_FLOATING_POINT_LEFTOVERS

    position->azimuth_fx = (Word32) ( meta_prm[0] * ( 1 << Q22 ) );   /* Q22 */

    position->elevation_fx = (Word32) ( meta_prm[1] * ( 1 << Q22 ) ); /* Q22 */

    position->radius_fx = (Word16) ( meta_prm[2] * ( 1 << Q9 ) );     /* Q9 */

    position->yaw_fx = (Word32) ( meta_prm[5] * ( 1 << Q22 ) );       /* Q22 */

    position->pitch_fx = (Word32) ( meta_prm[6] * ( 1 << Q22 ) );     /* Q22 */

    position->non_diegetic_flag = (Word16) meta_prm[7];

#else

    position->azimuth = meta_prm[0];

    position->elevation = meta_prm[1];

    position->azimuth_fx = (Word32) ( meta_prm[0] * ( 1 << 22 ) );
@@ -3525,6 +3572,7 @@ static void parseObjectPosition( 
    position->yaw = meta_prm[5];

    position->pitch = meta_prm[6];

    position->non_diegetic_flag = (int16_t) meta_prm[7];

#endif



    return;

}

lib_com/common_api_types.h

+2 −0
Original line number Diff line number Diff line
@@ -133,6 +133,7 @@ typedef struct _IVAS_ISM_METADATA 
    Word32 gainFactor_fx; /* Q29 */

    Word32 yaw_fx;        /* Q22 */

    Word32 pitch_fx;      /* Q22 */

#ifndef FIX_2084_FLOATING_POINT_LEFTOVERS

    float azimuth;

    float elevation;

    float radius;
@@ -140,6 +141,7 @@ typedef struct _IVAS_ISM_METADATA 
    float gainFactor;

    float yaw;

    float pitch;

#endif

    Word16 non_diegetic_flag;

    Word32 gain_fx; /* Q29 */