Adapt PI orientations to use fx orientations (61bf6252) · Commits · SA4 / Audio / IVAS BASOP

lib_util/ivas_rtp_file.c

+6 −6

Original line number	Diff line number	Diff line
		@@ -191,8 +191,8 @@ void IVAS_RTP_LogPiData(
		case IVAS_PI_R_ISM_ORIENTATION:
		#endif
		{
		fprintf( f_piDataOut, "{\n\t\t\t\"w\": %f,\n\t\t\t\"x\": %f,\n\t\t\t\"y\": %f,\n\t\t\t\"z\": %f \n\t\t}",
		cur->data.scene.orientation.w, cur->data.scene.orientation.x, cur->data.scene.orientation.y, cur->data.scene.orientation.z );
		fprintf( f_piDataOut, "{\n\t\t\t\"w\": %d,\n\t\t\t\"x\": %d,\n\t\t\t\"y\": %d,\n\t\t\t\"z\": %d \n\t\t}",
		cur->data.scene.orientation.w_fx, cur->data.scene.orientation.x_fx, cur->data.scene.orientation.y_fx, cur->data.scene.orientation.z_fx );
		}
		break;

		@@ -259,8 +259,8 @@ void IVAS_RTP_LogPiData(
		if ( cur->data.focusIndication.availDirection )
		{
		fprintf( f_piDataOut, "\n\t\t\t\"direction\": {\n" );
		fprintf( f_piDataOut, "\t\t\t\t\t\t\"w\": %f,\n\t\t\t\t\t\t\"x\": %f,\n\t\t\t\t\t\t\"y\": %f,\n\t\t\t\t\t\t\"z\": %f \n\t\t\t}",
		cur->data.focusIndication.direction.w, cur->data.focusIndication.direction.x, cur->data.focusIndication.direction.y, cur->data.focusIndication.direction.z );
		fprintf( f_piDataOut, "\t\t\t\t\t\t\"w\": %d,\n\t\t\t\t\t\t\"x\": %d,\n\t\t\t\t\t\t\"y\": %d,\n\t\t\t\t\t\t\"z\": %d \n\t\t\t}",
		cur->data.focusIndication.direction.w_fx, cur->data.focusIndication.direction.x_fx, cur->data.focusIndication.direction.y_fx, cur->data.focusIndication.direction.z_fx );
		if ( cur->data.focusIndication.availLevel )
		{
		fprintf( f_piDataOut, "," );
		@@ -291,8 +291,8 @@ void IVAS_RTP_LogPiData(
		if ( cur->data.focusRequest.availDirection )
		{
		fprintf( f_piDataOut, "\n\t\t\t\"direction\": {\n" );
		fprintf( f_piDataOut, "\t\t\t\t\t\t\"w\": %f,\n\t\t\t\t\t\t\"x\": %f,\n\t\t\t\t\t\t\"y\": %f,\n\t\t\t\t\t\t\"z\": %f \n\t\t\t}",
		cur->data.focusRequest.direction.w, cur->data.focusRequest.direction.x, cur->data.focusRequest.direction.y, cur->data.focusRequest.direction.z );
		fprintf( f_piDataOut, "\t\t\t\t\t\t\"w\": %d,\n\t\t\t\t\t\t\"x\": %d,\n\t\t\t\t\t\t\"y\": %d,\n\t\t\t\t\t\t\"z\": %d \n\t\t\t}",
		cur->data.focusRequest.direction.w_fx, cur->data.focusRequest.direction.x_fx, cur->data.focusRequest.direction.y_fx, cur->data.focusRequest.direction.z_fx );
		if ( cur->data.focusRequest.availLevel )
		{
		fprintf( f_piDataOut, "," );

lib_util/ivas_rtp_pi_data.c

+16 −16

Original line number	Diff line number	Diff line
		@@ -145,10 +145,10 @@ static ivas_error packOrientation( const IVAS_PIDATA_GENERIC piData, uint8_t b

		buffer[nBytes++] = ( orientation->piDataType & MASK_5BIT ); /* PF/PM populated during final packing */
		buffer[nBytes++] = 8;
		nBytes = writeInt16( buffer, nBytes, ivasPayload_convertToQ15( orientation->orientation.w ) );
		nBytes = writeInt16( buffer, nBytes, ivasPayload_convertToQ15( orientation->orientation.x ) );
		nBytes = writeInt16( buffer, nBytes, ivasPayload_convertToQ15( orientation->orientation.y ) );
		nBytes = writeInt16( buffer, nBytes, ivasPayload_convertToQ15( orientation->orientation.z ) );
		nBytes = writeInt16( buffer, nBytes, orientation->orientation.w_fx );
		nBytes = writeInt16( buffer, nBytes, orientation->orientation.x_fx );
		nBytes = writeInt16( buffer, nBytes, orientation->orientation.y_fx );
		nBytes = writeInt16( buffer, nBytes, orientation->orientation.z_fx );

		*nBytesWritten = nBytes;
		return IVAS_ERR_OK;
		@@ -165,10 +165,10 @@ static ivas_error unpackOrientation( const uint8_t *buffer, uint32_t numDataByte
		}

		piData->size = sizeof( IVAS_PIDATA_ORIENTATION );
		orientation->orientation.w = FLOAT_FROM_Q15( readInt16( &buffer[0] ) );
		orientation->orientation.x = FLOAT_FROM_Q15( readInt16( &buffer[2] ) );
		orientation->orientation.y = FLOAT_FROM_Q15( readInt16( &buffer[4] ) );
		orientation->orientation.z = FLOAT_FROM_Q15( readInt16( &buffer[6] ) );
		orientation->orientation.w_fx = readInt16( &buffer[0] );
		orientation->orientation.x_fx = readInt16( &buffer[2] );
		orientation->orientation.y_fx = readInt16( &buffer[4] );
		orientation->orientation.z_fx = readInt16( &buffer[6] );

		return IVAS_ERR_OK;
		}
		@@ -583,10 +583,10 @@ static ivas_error packAudioFocusCommon( const IVAS_PIDATA_GENERIC *piData, uint8

		if ( packedSize == 9 \|\| packedSize == 8 )
		{
		nBytes = writeInt16( buffer, nBytes, ivasPayload_convertToQ15( audioFocus->direction.w ) );
		nBytes = writeInt16( buffer, nBytes, ivasPayload_convertToQ15( audioFocus->direction.x ) );
		nBytes = writeInt16( buffer, nBytes, ivasPayload_convertToQ15( audioFocus->direction.y ) );
		nBytes = writeInt16( buffer, nBytes, ivasPayload_convertToQ15( audioFocus->direction.z ) );
		nBytes = writeInt16( buffer, nBytes, audioFocus->direction.w_fx );
		nBytes = writeInt16( buffer, nBytes, audioFocus->direction.x_fx );
		nBytes = writeInt16( buffer, nBytes, audioFocus->direction.y_fx );
		nBytes = writeInt16( buffer, nBytes, audioFocus->direction.z_fx );
		}
		if ( packedSize == 9 \|\| packedSize == 1 )
		{
		@@ -617,10 +617,10 @@ static ivas_error unpackAudioFocusCommon( const uint8_t *buffer, uint32_t numDat
		}
		else
		{
		audioFocus->direction.w = FLOAT_FROM_Q15( readInt16( &buffer[0] ) );
		audioFocus->direction.x = FLOAT_FROM_Q15( readInt16( &buffer[2] ) );
		audioFocus->direction.y = FLOAT_FROM_Q15( readInt16( &buffer[4] ) );
		audioFocus->direction.z = FLOAT_FROM_Q15( readInt16( &buffer[6] ) );
		audioFocus->direction.w_fx = readInt16( &buffer[0] );
		audioFocus->direction.x_fx = readInt16( &buffer[2] );
		audioFocus->direction.y_fx = readInt16( &buffer[4] );
		audioFocus->direction.z_fx = readInt16( &buffer[6] );

		if ( numDataBytes == 9 )
		{