Commit 38814d96 authored by vaclav's avatar vaclav
Browse files

- Merge remote-tracking branch 'remotes/origin/ivas-float-update' into... 

- Merge remote-tracking branch 'remotes/origin/ivas-float-update' into 1955-ref-PortMr2077-from-float-revision-of-common-api-types
parents b7d9cc05 0d2bfef5

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" />
@@ -145,6 +146,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 −61

File changed.

Preview size limit exceeded, changes collapsed.

lib_com/common_api_types.h

+1 −0
Original line number Diff line number Diff line
@@ -143,6 +143,7 @@ typedef struct _IVAS_EDITABLE_PARAMETERS 
    int16_t num_obj;

    IVAS_ISM_METADATA ism_metadata[IVAS_MAX_NUM_OBJECTS];

    float gain_bed;



} 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,
@@ -255,6 +261,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_prot.h

+22 −14
Original line number Diff line number Diff line
@@ -854,7 +854,7 @@ void ivas_jbm_dec_feed_tc_to_renderer( 
);



#ifdef OBJ_EDITING_API

void ivas_jbm_dec_prepare_renderer(

void ivas_dec_prepare_renderer(

    Decoder_Struct *st_ivas                                     /* i/o: IVAS decoder structure                                      */

);

#endif
@@ -1074,11 +1074,6 @@ ivas_error ivas_ism_metadata_dec( 
    DEC_CORE_HANDLE st0                                         /* i  : core-coder handle                           */

);



#ifdef OBJ_EDITING_API

void ivas_ism_renderer_update_md(

	Decoder_Struct *st_ivas                                     /* i/o:  main IVAS decoder handle                   */

);

#endif



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

 * Parametric ISM prototypes
@@ -1146,18 +1141,18 @@ void ivas_ism_dec_digest_tc( 


void ivas_param_ism_dec_digest_tc(

    Decoder_Struct *st_ivas,                                    /* i/o: IVAS decoder handle                         */

    const uint16_t nCldfbSlots,                                 /* i  : number of CLFBS slots in the transport channels         */

    const uint16_t nCldfbSlots,                                 /* i  : number of CLDFB slots in transport channels */

    float *transport_channels_f[]                               /* i  : synthesized core-coder transport channels/DirAC output  */

);



#ifdef OBJ_EDITING_API

void ivas_param_ism_dec_dequant_md(

    Decoder_Struct *st_ivas 

    Decoder_Struct *st_ivas                                     /* i/o: IVAS decoder handle                         */

);



void ivas_param_ism_dec_prepare_renderer(

    Decoder_Struct *st_ivas,                                    /* i/o: IVAS decoder handle                         */

    const uint16_t nCldfbSlots                                  /* i  : number of CLFBS slots in the transport channels         */

    const uint16_t nCldfbSlots                                  /* i  : number of CLDFB slots in transport channels */

);

#endif
@@ -3842,7 +3837,7 @@ void ivas_mc_paramupmix_dec_read_BS( 


void ivas_mc_paramupmix_dec_digest_tc(

    Decoder_Struct *st_ivas,                                    /* i/o: IVAS decoder handle                             */

    const uint8_t nCldfbSlots,                                  /* i  : number of CLFBS slots in the transport channels */

    const uint8_t nCldfbSlots,                                  /* i  : number of CLDFB slots in transport channels     */

    const int16_t nSamplesForRendering                          /* i  : number of samples provided                      */

);
@@ -3912,14 +3907,14 @@ void ivas_param_mc_dec_read_BS( 


void ivas_param_mc_dec_digest_tc(

    Decoder_Struct *st_ivas,                                    /* i/o: IVAS decoder handle                                 */

    const uint8_t nCldfbSlots,                                  /* i  : number of CLFBS slots in the transport channels     */

    float *transport_channels_f[]                               /* i  : synthesized core-coder transport channels/DirAC output*/

    const uint8_t nCldfbSlots,                                  /* i  : number of CLDFB slots in transport channels         */

    float *p_data_f[]                                           /* i/o: synthesized core-coder transport channels/DirAC output*/

);



#ifdef OBJ_EDITING_API

void ivas_param_mc_dec_prepare_renderer(

    Decoder_Struct *st_ivas,                                    /* i/o: IVAS decoder handle                                 */

    const uint8_t nCldfbSlots                                   /* i  : number of CLFBS slots in the transport channels     */

    const uint8_t nCldfbSlots                                   /* i  : number of CLDFB slots in transport channels         */

);

#endif
@@ -5638,6 +5633,17 @@ ivas_error ivas_osba_render_sf( 
    float *output_f[]                                           /* o  : rendered time signal                    */

);



#ifdef OBJ_EDITING_API

void ivas_osba_stereo_add_channels(

    float *tc_f[],                                              /* i  : transport channels                      */

    float *output_f[],                                          /* i/o: output channels                         */

    const float gain,                                           /* i  : gain bed value                          */

    const int16_t nchan_out,                                    /* i  : number of output channels               */

    const int16_t nchan_ism,                                    /* i  : number of ISM channels                  */

    const int16_t ism_mode,                                     /* i  : ISM mode                                */

    const int16_t n_samples_to_render                           /* i  : output frame length per channel         */

);

#else

void ivas_osba_stereo_add_channels(

    float *tc_f[],                                              /* i  : transport channels                      */

    float *output_f[],                                          /* i/o: output channels                         */
@@ -5646,6 +5652,7 @@ void ivas_osba_stereo_add_channels( 
    const int16_t nchan_ism,                                    /* i  : number of ISM channels                  */

    const int16_t n_samples_to_render                           /* i  : output frame length per channel         */

);

#endif



void ivas_osba_data_close(

    SBA_ISM_DATA_HANDLE *hSbaIsmData                            /* i/o: OSBA rendering handle                   */
@@ -5656,6 +5663,7 @@ ISM_MODE ivas_osba_ism_mode_select( 
	const int16_t nchan_ism                                     /* i  : number of input ISM's   */

);





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

* OMASA prototypes

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