Loading lib_enc/ivas_ism_metadata_enc.c +17 −3 Original line number Diff line number Diff line Loading @@ -203,6 +203,10 @@ ivas_error ivas_ism_metadata_enc( int16_t ism_imp[MAX_NUM_OBJECTS]; int16_t nbands, nblocks; ivas_error error; #ifdef ISM_NON_DIEGETIC_PAN int16_t loc_ism_metadata_flag; #endif error = IVAS_ERR_OK; Loading @@ -223,6 +227,9 @@ ivas_error ivas_ism_metadata_enc( for ( ch = 0; ch < nchan_ism; ch++ ) { #ifdef ISM_NON_DIEGETIC_PAN loc_ism_metadata_flag = hIsmMeta[ch]->ism_metadata_flag; #endif if ( ism_mode == ISM_MODE_PARAM ) { #ifndef ISM_NON_DIEGETIC_PAN Loading @@ -243,14 +250,20 @@ ivas_error ivas_ism_metadata_enc( if ( ( fabsf( hIsmMeta[ch]->azimuth - hIsmMeta[ch]->last_true_azimuth ) > ISM_MD_FEC_DIFF ) || ( fabsf( hIsmMeta[ch]->elevation - hIsmMeta[ch]->last_true_elevation ) > ISM_MD_FEC_DIFF ) ) { #ifndef ISM_NON_DIEGETIC_PAN #ifdef ISM_NON_DIEGETIC_PAN hIsmMeta[ch]->ism_metadata_flag = loc_ism_metadata_flag; #else hIsmMeta[ch]->ism_metadata_flag = 1; #endif hIsmMeta[ch]->ism_md_inc_diff_cnt = 0; } else if ( hIsmMeta[ch]->ism_md_inc_diff_cnt < ISM_MD_INC_DIFF_CNT_MAX ) { #ifdef ISM_NON_DIEGETIC_PAN hIsmMeta[ch]->ism_metadata_flag = loc_ism_metadata_flag; #else hIsmMeta[ch]->ism_metadata_flag = 1; #endif if ( hIsmMeta[ch]->ism_md_inc_diff_cnt % 2 == 0 ) { Loading @@ -263,8 +276,9 @@ ivas_error ivas_ism_metadata_enc( } else if ( hIsmMeta[ch]->ism_md_fec_cnt_enc == ISM_MD_FEC_CNT_MAX ) { #ifndef ISM_NON_DIEGETIC_PAN #ifdef ISM_NON_DIEGETIC_PAN hIsmMeta[ch]->ism_metadata_flag = loc_ism_metadata_flag; #else hIsmMeta[ch]->ism_metadata_flag = 1; #endif hIsmMeta[ch]->position_angle.angle1_diff_cnt = ISM_FEC_MAX; Loading Loading
lib_enc/ivas_ism_metadata_enc.c +17 −3 Original line number Diff line number Diff line Loading @@ -203,6 +203,10 @@ ivas_error ivas_ism_metadata_enc( int16_t ism_imp[MAX_NUM_OBJECTS]; int16_t nbands, nblocks; ivas_error error; #ifdef ISM_NON_DIEGETIC_PAN int16_t loc_ism_metadata_flag; #endif error = IVAS_ERR_OK; Loading @@ -223,6 +227,9 @@ ivas_error ivas_ism_metadata_enc( for ( ch = 0; ch < nchan_ism; ch++ ) { #ifdef ISM_NON_DIEGETIC_PAN loc_ism_metadata_flag = hIsmMeta[ch]->ism_metadata_flag; #endif if ( ism_mode == ISM_MODE_PARAM ) { #ifndef ISM_NON_DIEGETIC_PAN Loading @@ -243,14 +250,20 @@ ivas_error ivas_ism_metadata_enc( if ( ( fabsf( hIsmMeta[ch]->azimuth - hIsmMeta[ch]->last_true_azimuth ) > ISM_MD_FEC_DIFF ) || ( fabsf( hIsmMeta[ch]->elevation - hIsmMeta[ch]->last_true_elevation ) > ISM_MD_FEC_DIFF ) ) { #ifndef ISM_NON_DIEGETIC_PAN #ifdef ISM_NON_DIEGETIC_PAN hIsmMeta[ch]->ism_metadata_flag = loc_ism_metadata_flag; #else hIsmMeta[ch]->ism_metadata_flag = 1; #endif hIsmMeta[ch]->ism_md_inc_diff_cnt = 0; } else if ( hIsmMeta[ch]->ism_md_inc_diff_cnt < ISM_MD_INC_DIFF_CNT_MAX ) { #ifdef ISM_NON_DIEGETIC_PAN hIsmMeta[ch]->ism_metadata_flag = loc_ism_metadata_flag; #else hIsmMeta[ch]->ism_metadata_flag = 1; #endif if ( hIsmMeta[ch]->ism_md_inc_diff_cnt % 2 == 0 ) { Loading @@ -263,8 +276,9 @@ ivas_error ivas_ism_metadata_enc( } else if ( hIsmMeta[ch]->ism_md_fec_cnt_enc == ISM_MD_FEC_CNT_MAX ) { #ifndef ISM_NON_DIEGETIC_PAN #ifdef ISM_NON_DIEGETIC_PAN hIsmMeta[ch]->ism_metadata_flag = loc_ism_metadata_flag; #else hIsmMeta[ch]->ism_metadata_flag = 1; #endif hIsmMeta[ch]->position_angle.angle1_diff_cnt = ISM_FEC_MAX; Loading