Loading lib_enc/ivas_qmetadata_enc.c +5 −5 Original line number Diff line number Diff line Loading @@ -3988,14 +3988,14 @@ static Word16 ivas_qmetadata_entropy_encode_dir_fx( { /*compute the average direction */ ivas_qmetadata_azimuth_elevation_to_direction_vector_fx( q_direction->band_data[i].azimuth_fx[j], q_direction->band_data[i].elevation_fx[j], direction_vector ); scale_sig32(direction_vector, 3, -5); // Q30 -> Q25 scale_sig32(direction_vector, 3, -8); // Q30 -> Q22 v_add_fixed( avg_direction_vector, direction_vector, avg_direction_vector, 3,0 ); } } } /* quantize average elevation and azimuth angles using the best angle spacing and equatorial precision */ ivas_qmetadata_direction_vector_to_azimuth_elevation_fx( avg_direction_vector, Q25, &avg_azimuth, &avg_elevation ); ivas_qmetadata_direction_vector_to_azimuth_elevation_fx( avg_direction_vector, Q22, &avg_azimuth, &avg_elevation ); IF ( q_direction->cfg.mc_ls_setup != MC_LS_SETUP_INVALID ) { Loading Loading @@ -4254,7 +4254,7 @@ static Word16 ivas_qmetadata_entropy_encode_dir_fx( { #ifdef IVAS_FLOAT_FIXED ivas_qmetadata_azimuth_elevation_to_direction_vector_fx( q_direction->band_data[i].azimuth_fx[j], q_direction->band_data[i].elevation_fx[j], direction_vector ); scale_sig32(direction_vector, 3, -5); // Q30 -> Q25 scale_sig32(direction_vector, 3, -8); // Q30 -> Q22 #else ivas_qmetadata_azimuth_elevation_to_direction_vector( q_direction->band_data[i].azimuth[j], q_direction->band_data[i].elevation[j], direction_vector ); #endif Loading Loading @@ -4290,13 +4290,13 @@ static Word16 ivas_qmetadata_entropy_encode_dir_fx( /*compute the average direction per already coded subband */ #ifdef IVAS_FLOAT_FIXED ivas_qmetadata_azimuth_elevation_to_direction_vector_fx( q_direction->band_data[i].azimuth_fx[j], q_direction->band_data[i].elevation_fx[j], direction_vector ); scale_sig32(direction_vector, 3, -5); // Q30 -> Q25 scale_sig32(direction_vector, 3, -8); // Q30 -> Q22 #else ivas_qmetadata_azimuth_elevation_to_direction_vector( q_direction->band_data[i].azimuth[j], q_direction->band_data[i].elevation[j], direction_vector ); #endif v_add_fixed( avg_direction_vector, direction_vector, avg_direction_vector, 3 , 0); #ifdef IVAS_FLOAT_FIXED ivas_qmetadata_direction_vector_to_azimuth_elevation_fx( avg_direction_vector, Q25, &avg_azimuth, &avg_elevation ); ivas_qmetadata_direction_vector_to_azimuth_elevation_fx( avg_direction_vector, Q22, &avg_azimuth, &avg_elevation ); #else ivas_qmetadata_direction_vector_to_azimuth_elevation( avg_direction_vector, &avg_azimuth, &avg_elevation ); #endif Loading Loading
lib_enc/ivas_qmetadata_enc.c +5 −5 Original line number Diff line number Diff line Loading @@ -3988,14 +3988,14 @@ static Word16 ivas_qmetadata_entropy_encode_dir_fx( { /*compute the average direction */ ivas_qmetadata_azimuth_elevation_to_direction_vector_fx( q_direction->band_data[i].azimuth_fx[j], q_direction->band_data[i].elevation_fx[j], direction_vector ); scale_sig32(direction_vector, 3, -5); // Q30 -> Q25 scale_sig32(direction_vector, 3, -8); // Q30 -> Q22 v_add_fixed( avg_direction_vector, direction_vector, avg_direction_vector, 3,0 ); } } } /* quantize average elevation and azimuth angles using the best angle spacing and equatorial precision */ ivas_qmetadata_direction_vector_to_azimuth_elevation_fx( avg_direction_vector, Q25, &avg_azimuth, &avg_elevation ); ivas_qmetadata_direction_vector_to_azimuth_elevation_fx( avg_direction_vector, Q22, &avg_azimuth, &avg_elevation ); IF ( q_direction->cfg.mc_ls_setup != MC_LS_SETUP_INVALID ) { Loading Loading @@ -4254,7 +4254,7 @@ static Word16 ivas_qmetadata_entropy_encode_dir_fx( { #ifdef IVAS_FLOAT_FIXED ivas_qmetadata_azimuth_elevation_to_direction_vector_fx( q_direction->band_data[i].azimuth_fx[j], q_direction->band_data[i].elevation_fx[j], direction_vector ); scale_sig32(direction_vector, 3, -5); // Q30 -> Q25 scale_sig32(direction_vector, 3, -8); // Q30 -> Q22 #else ivas_qmetadata_azimuth_elevation_to_direction_vector( q_direction->band_data[i].azimuth[j], q_direction->band_data[i].elevation[j], direction_vector ); #endif Loading Loading @@ -4290,13 +4290,13 @@ static Word16 ivas_qmetadata_entropy_encode_dir_fx( /*compute the average direction per already coded subband */ #ifdef IVAS_FLOAT_FIXED ivas_qmetadata_azimuth_elevation_to_direction_vector_fx( q_direction->band_data[i].azimuth_fx[j], q_direction->band_data[i].elevation_fx[j], direction_vector ); scale_sig32(direction_vector, 3, -5); // Q30 -> Q25 scale_sig32(direction_vector, 3, -8); // Q30 -> Q22 #else ivas_qmetadata_azimuth_elevation_to_direction_vector( q_direction->band_data[i].azimuth[j], q_direction->band_data[i].elevation[j], direction_vector ); #endif v_add_fixed( avg_direction_vector, direction_vector, avg_direction_vector, 3 , 0); #ifdef IVAS_FLOAT_FIXED ivas_qmetadata_direction_vector_to_azimuth_elevation_fx( avg_direction_vector, Q25, &avg_azimuth, &avg_elevation ); ivas_qmetadata_direction_vector_to_azimuth_elevation_fx( avg_direction_vector, Q22, &avg_azimuth, &avg_elevation ); #else ivas_qmetadata_direction_vector_to_azimuth_elevation( avg_direction_vector, &avg_azimuth, &avg_elevation ); #endif Loading