Commit 1934333f authored by EMERIT Marc INNOV/IT-S's avatar EMERIT Marc INNOV/IT-S
Browse files

Merge branch 'orange/no-diegetic-pan-with-radius' of... 

Merge branch 'orange/no-diegetic-pan-with-radius' of forge.3gpp.org:ivas-codec-pc/ivas-codec into orange/no-diegetic-pan-with-radius
parents ed828fa8 7ebf5138

lib_com/ivas_stat_com.h

+6 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ 
/*----------------------------------------------------------------------------------*

 * Declaration of ISm common (encoder & decoder) structure

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



#ifdef TD5

typedef struct

{
@@ -73,6 +74,11 @@ typedef struct 
    int16_t last_elevation_idx; /* last frame index of coded elevation */

    int16_t elevation_diff_cnt; /* FEC counter of consecutive differentially elevation coded frames */

#endif

#ifdef ISM_NO_DIEGETIC_PAN

    float no_diegetic_pan;

    int16_t last_no_diegetic_pan_idx; /* last frame index of coded no diegetic pan */

    int16_t no_diegetic_pan_diff_cnt; /* FEC counter of consecutive differentially no diegetic pan coded frames */

#endif

} ISM_METADATA_FRAME, *ISM_METADATA_HANDLE;

lib_enc/ivas_ism_metadata_enc.c

+9 −3
Original line number Diff line number Diff line
@@ -218,6 +218,9 @@ ivas_error ivas_ism_metadata_enc( 
#else

    int16_t idx_azimuth, idx_azimuth_abs = 0, flag_abs_azimuth[MAX_NUM_OBJECTS], nbits_diff_azimuth;

    int16_t idx_elevation, idx_elevation_abs = 0, flag_abs_elevation[MAX_NUM_OBJECTS], nbits_diff_elevation;

#endif

#ifdef ISM_NO_DIEGETIC_PAN

    int16_t idx_no_diegetic_pan_abs = 0, flag_abs_no_diegetic_pan[MAX_NUM_OBJECTS];

#endif

    float valQ;

    ISM_METADATA_HANDLE hIsmMetaData;
@@ -261,7 +264,9 @@ ivas_error ivas_ism_metadata_enc( 
    set_s( flag_abs_azimuth_orientation, 0, num_obj );

    set_s( flag_abs_radius, 0, num_obj );

#endif



#ifdef ISM_NO_DIEGETIC_PAN

    set_s( flag_abs_no_diegetic_pan, 0, num_obj );

#endif



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

     * Set Metadata presence / importance flag
@@ -419,9 +424,10 @@ ivas_error ivas_ism_metadata_enc( 
#ifdef ISM_NO_DIEGETIC_PAN

            if ( hIsmMeta[ch]->ism_metadata_flag == 2 )

            {

                if ( ism_mode == ISM_MODE_DISC )

                if ( ism_mode == ISM_MODE_DISC && ism_extended_metadata_flag )

                {

                    idx_radius_abs = usquant( hIsmMetaData->radius, &valQ, ISM_NO_DIEGETIC_PAN_MIN, ISM_RADIUS_DELTA, 1 << ISM_RADIUS_NBITS );

                    idx_no_diegetic_pan_abs = usquant( hIsmMetaData->no_diegetic_pan, &valQ, ISM_NO_DIEGETIC_PAN_MIN, ISM_NO_DIEGETIC_PAN_DELTA, 1 << ISM_NO_DIEGETIC_PAN_NBITS );

                    encode_no_diegetic_pan( hBstr, &hIsmMetaData->last_no_diegetic_pan_idx, &hIsmMetaData->no_diegetic_pan_diff_cnt, hIsmMetaData->last_ism_metadata_flag, idx_no_diegetic_pan_abs, &flag_abs_no_diegetic_pan[ch] );

                }

            }

            else

scripts/td_object_renderer/example_kit/config_directivity.cfg

0 → 100755
+3 −0
Original line number Diff line number Diff line 
[general]

directivity = [0.0, 360.0, 0.2512];

scripts/td_object_renderer/example_kit/enc.bash

0 → 100755
+15 −0
Original line number Diff line number Diff line 
#!/bin/bash -x



BIN=../../..



BR=128000





# 4 ISm with metadata

$BIN/IVAS_cod -ism +4 md_1.csv md_2_no_diegetic_pan_left.csv md_3.csv md_4.csv $BR 48 test_4_ism_with_on_no_diegetic.wav bit

$BIN/IVAS_dec -render_config config_directivity.cfg -t head_tracking_move_forward.csv BINAURAL 48 bit out.wav

$BIN/IVAS_rend -i test_4_ism_with_on_no_diegetic.wav -if ISM4 -im md_1.csv md_2_no_diegetic_pan_left.csv md_3.csv md_4.csv -o out_rend.wav -of BINAURAL -fs 48 -tf head_tracking_move_forward.csv -render_config config_directivity.cfg 





$BIN/IVAS_dec BINAURAL 48 bit out_no_tf.wav

$BIN/IVAS_rend -i test_4_ism_with_on_no_diegetic.wav -if ISM4 -im md_1.csv md_2_no_diegetic_pan_left.csv md_3.csv md_4.csv -o out_rend_no_tf.wav -of BINAURAL -fs 48

scripts/td_object_renderer/example_kit/head_tracking_move_forward.csv

0 → 100755
+2400 −0

File added.

Preview size limit exceeded, changes collapsed.