Commit 1cdc6b59 authored by vaclav's avatar vaclav
Browse files

- Merge remote-tracking branch 'remotes/origin/main' into... 

- Merge remote-tracking branch 'remotes/origin/main' into 1955-basop-PortMr2077-from-float-revision-of-common-api-types
parents 6117eda0 b0ef1efb

Workspace_msvc/lib_util.vcxproj

+2 −0
Original line number Diff line number Diff line
@@ -120,6 +120,7 @@ 
    <ClCompile Include="..\lib_util\masa_file_reader.c" />

    <ClCompile Include="..\lib_util\masa_file_writer.c" />

    <ClCompile Include="..\lib_util\mime_io.c" />

    <ClCompile Include="..\lib_util\obj_edit_file_reader.c" />

    <ClCompile Include="..\lib_util\render_config_reader.c" />

    <ClCompile Include="..\lib_util\rotation_file_reader.c" />

    <ClCompile Include="..\lib_util\rtpdump.c" />
@@ -144,6 +145,7 @@ 
    <ClInclude Include="..\lib_util\jbm_file_writer.h" />

    <ClInclude Include="..\lib_util\ls_custom_file_reader.h" />

    <ClInclude Include="..\lib_util\mime_io.h" />

    <ClInclude Include="..\lib_util\obj_edit_file_reader.h" />

    <ClInclude Include="..\lib_util\masa_file_reader.h" />

    <ClInclude Include="..\lib_util\masa_file_writer.h" />

    <ClInclude Include="..\lib_util\render_config_reader.h" />

apps/decoder.c

+296 −25

File changed.

Preview size limit exceeded, changes collapsed.

lib_com/common_api_types.h

+3 −2
Original line number Diff line number Diff line
@@ -142,7 +142,7 @@ typedef struct _IVAS_ISM_METADATA 
    float pitch;

    Word16 non_diegetic_flag;

#ifdef OBJ_EDITING_API

    Word32 gain_fx; // Q29

    Word32 gain_fx; /* Q29 */

#endif



} IVAS_ISM_METADATA;
@@ -152,7 +152,8 @@ typedef struct _IVAS_EDITABLE_PARAMETERS 
{

    Word16 num_obj;

    IVAS_ISM_METADATA ism_metadata[IVAS_MAX_NUM_OBJECTS];

    Word32 gain_bed_fx; // Q29

    Word32 gain_bed_fx; /* Q29 */



} IVAS_EDITABLE_PARAMETERS;

#endif

lib_com/ivas_error.h

+14 −0
Original line number Diff line number Diff line
@@ -77,6 +77,12 @@ typedef enum 
    IVAS_ERR_EXT_ORIENTATION_NOT_SUPPORTED,

    IVAS_ERR_DIRECTIVITY_NOT_SUPPORTED,

    IVAS_ERR_ACOUSTIC_ENVIRONMENT_NOT_SUPPORTED,

#ifdef OBJ_EDITING_API

    IVAS_ERR_OBJECTS_EDITING_NOT_SUPPORTED,

#endif

#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE

    IVAS_ERR_OBJECTS_EDITING_AND_PANNING_NOT_SUPPORTED,

#endif

    IVAS_ERR_INVALID_HRTF,

    IVAS_ERR_INVALID_HRTF_SAMPLING_RATE,

    IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA,
@@ -249,6 +255,14 @@ static inline const char *ivas_error_to_string( ivas_error error_code ) 
            return "Directivity not supported";

        case IVAS_ERR_ACOUSTIC_ENVIRONMENT_NOT_SUPPORTED:

            return "Acoustic environment not supported";

#ifdef OBJ_EDITING_API

        case IVAS_ERR_OBJECTS_EDITING_NOT_SUPPORTED:

            return "Objects editing not supported";

#endif

#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE

        case IVAS_ERR_OBJECTS_EDITING_AND_PANNING_NOT_SUPPORTED:

            return "Wrong use of both Object editing and Non-diegetic panning";

#endif

        case IVAS_ERR_INVALID_HRTF:

            return "Unsupported HRTF filter set";

        case IVAS_ERR_INVALID_HRTF_SAMPLING_RATE:

lib_com/ivas_ism_com_fx.c

+8 −0
Original line number Diff line number Diff line
@@ -472,13 +472,21 @@ void ivas_ism_reset_metadata( 


#ifdef OBJ_EDITING_API

    hIsmMeta->edited_gain_fx = ONE_IN_Q29;

    move32();

    hIsmMeta->edited_azimuth_fx = 0;

    move32();

    hIsmMeta->edited_elevation_fx = 0;

    move32();

    hIsmMeta->edited_pitch_fx = 0;

    move32();

    hIsmMeta->edited_yaw_fx = 0;

    move32();

    hIsmMeta->edited_radius_fx = ONE_IN_Q9;

    move32();

    hIsmMeta->gain_fx = ONE_IN_Q29;

    move32();

    hIsmMeta->non_diegetic_flag = 0;

    move16();

#endif



    return;