Loading lib_dec/ivas_masa_dec.c +24 −0 Original line number Diff line number Diff line Loading @@ -2299,7 +2299,12 @@ static int16_t ivas_decode_masaism_metadata( int16_t nb_bits_read; float delta_phi; int16_t meta_write_index; #if 1 static FILE *pF = NULL; if ( pF == NULL ) pF = fopen( "./direction.txt", "w" ); #endif nb_bits_read = *next_bit_pos; nbands = hQMetaData->q_direction->cfg.nbands; nblocks = hQMetaData->q_direction->cfg.nblocks; Loading Loading @@ -2347,18 +2352,37 @@ static int16_t ivas_decode_masaism_metadata( if ( azimuth * hMasaIsmData->q_azimuth_old[obj] > 0 ) { delta_phi = 180.0f / (float) ( no_phi_masa[bits_ism[obj] - 1][idx_el] ); /* 360/2*/ #if 0 #ifdef FIX_853_DECODE_MASA_ISM_AZIMUTH_PREC_FP delta_phi = floorf( delta_phi ); #endif #endif #if 1 fprintf( pF, "azimuth = %4.2f delta_phi = %4.2f obj = %d \n", azimuth, delta_phi, obj ); #endif #ifdef FIX_853_DECODE_MASA_ISM_AZIMUTH_PREC_FP if ( roundf(100*( no_phi_masa[bits_ism[obj] - 1][idx_el] )*( azimuth - hMasaIsmData->q_azimuth_old[obj]))/(float)100.0f > 180.0f ) #else if ( azimuth - hMasaIsmData->q_azimuth_old[obj] > delta_phi ) #endif { azimuth -= delta_phi; #if 1 fprintf( pF, "azimuth = %3.1f obj = %d 1 \n", azimuth, obj ); #endif } else { #ifdef FIX_853_DECODE_MASA_ISM_AZIMUTH_PREC_FP if ( roundf( 100 * ( no_phi_masa[bits_ism[obj] - 1][idx_el] ) * ( hMasaIsmData->q_azimuth_old[obj] - azimuth ) ) / 100.0f > 180.0f ) #else if ( hMasaIsmData->q_azimuth_old[obj] - azimuth > delta_phi ) #endif { azimuth += delta_phi; #if 1 fprintf( pF, "azimuth = %3.1f obj = %d -1 \n", azimuth, obj ); #endif } } } Loading Loading
lib_dec/ivas_masa_dec.c +24 −0 Original line number Diff line number Diff line Loading @@ -2299,7 +2299,12 @@ static int16_t ivas_decode_masaism_metadata( int16_t nb_bits_read; float delta_phi; int16_t meta_write_index; #if 1 static FILE *pF = NULL; if ( pF == NULL ) pF = fopen( "./direction.txt", "w" ); #endif nb_bits_read = *next_bit_pos; nbands = hQMetaData->q_direction->cfg.nbands; nblocks = hQMetaData->q_direction->cfg.nblocks; Loading Loading @@ -2347,18 +2352,37 @@ static int16_t ivas_decode_masaism_metadata( if ( azimuth * hMasaIsmData->q_azimuth_old[obj] > 0 ) { delta_phi = 180.0f / (float) ( no_phi_masa[bits_ism[obj] - 1][idx_el] ); /* 360/2*/ #if 0 #ifdef FIX_853_DECODE_MASA_ISM_AZIMUTH_PREC_FP delta_phi = floorf( delta_phi ); #endif #endif #if 1 fprintf( pF, "azimuth = %4.2f delta_phi = %4.2f obj = %d \n", azimuth, delta_phi, obj ); #endif #ifdef FIX_853_DECODE_MASA_ISM_AZIMUTH_PREC_FP if ( roundf(100*( no_phi_masa[bits_ism[obj] - 1][idx_el] )*( azimuth - hMasaIsmData->q_azimuth_old[obj]))/(float)100.0f > 180.0f ) #else if ( azimuth - hMasaIsmData->q_azimuth_old[obj] > delta_phi ) #endif { azimuth -= delta_phi; #if 1 fprintf( pF, "azimuth = %3.1f obj = %d 1 \n", azimuth, obj ); #endif } else { #ifdef FIX_853_DECODE_MASA_ISM_AZIMUTH_PREC_FP if ( roundf( 100 * ( no_phi_masa[bits_ism[obj] - 1][idx_el] ) * ( hMasaIsmData->q_azimuth_old[obj] - azimuth ) ) / 100.0f > 180.0f ) #else if ( hMasaIsmData->q_azimuth_old[obj] - azimuth > delta_phi ) #endif { azimuth += delta_phi; #if 1 fprintf( pF, "azimuth = %3.1f obj = %d -1 \n", azimuth, obj ); #endif } } } Loading