Unverified Commit 8b4d4af7 authored by janssontoftg's avatar janssontoftg
Browse files

- Remove ISM PI data tables in ivas_rtp_pi_data.c 

- Initialize non-unpacked PI data to default values
- Add output to JSON
- Add JSON to generated PI data comparisons
- Bug fixes
parent bf093618

apps/decoder.c

+77 −3
Original line number Diff line number Diff line
@@ -234,7 +234,7 @@ static void IVAS_RTP_LogPiData( FILE *f_piDataOut, PIDATA_TS *piData, uint32_t n 
        return;

    }



    if ( ftell( f_piDataOut ) > 2 )

    if ( ftell( f_piDataOut ) > 3 )

    {

        fprintf( f_piDataOut, ",\n" );

    }
@@ -394,7 +394,7 @@ static void IVAS_RTP_LogPiData( FILE *f_piDataOut, PIDATA_TS *piData, uint32_t n 
            case IVAS_PI_ISM_ORIENTATION:

            {

                fprintf( f_piDataOut, "[\n" );

                for ( n = 0; n < cur->data.ismOrientation.size / 8; n++ )

                for ( n = 0; n < cur->data.ismOrientation.numObjects; n++ )

                {

                    if ( n != 0 )

                    {
@@ -407,12 +407,86 @@ static void IVAS_RTP_LogPiData( FILE *f_piDataOut, PIDATA_TS *piData, uint32_t n 
            }

            break;

            case IVAS_PI_ISM_NUM:

            {

                fprintf( f_piDataOut, "{\n" );

                fprintf( f_piDataOut, "\t\t\t\"num\": %d", cur->data.ismNum.numObjects );

                fprintf( f_piDataOut, "\n\t\t}" );

            }

            break;

            case IVAS_PI_ISM_ID:

            {

                fprintf( f_piDataOut, "{\n" );

                fprintf( f_piDataOut, "\t\t\t\"ids\": [\n" );

                for ( n = 0; n < cur->data.ismId.numObjects; n++ )

                {

                    if ( n != 0 )

                    {

                        fprintf( f_piDataOut, ",\n" );

                    }

                    fprintf( f_piDataOut, "\t\t\t\t%d", cur->data.ismId.id[n] );

                }

                fprintf( f_piDataOut, "\n\t\t\t]" );

                fprintf( f_piDataOut, "\n\t\t}" );

            }

            break;

            case IVAS_PI_ISM_GAIN:



            {

                fprintf( f_piDataOut, "{\n" );

                fprintf( f_piDataOut, "\t\t\t\"gains\": [\n" );

                for ( n = 0; n < cur->data.ismGain.numObjects; n++ )

                {

                    if ( n != 0 )

                    {

                        fprintf( f_piDataOut, ",\n" );

                    }

                    fprintf( f_piDataOut, "\t\t\t\t%d", cur->data.ismGain.dB[n] );

                }

                fprintf( f_piDataOut, "\n\t\t\t]" );

                fprintf( f_piDataOut, "\n\t\t}" );

            }

            break;

            case IVAS_PI_ISM_POSITION:

            {

                fprintf( f_piDataOut, "[\n" );

                for ( n = 0; n < cur->data.ismPosition.numObjects; n++ )

                {

                    if ( n != 0 )

                    {

                        fprintf( f_piDataOut, ",\n" );

                    }

                    fprintf( f_piDataOut, "\t\t\t{\n\t\t\t\t\"x\": %f,\n\t\t\t\t\"y\": %f,\n\t\t\t\t\"z\": %f \n\t\t\t}", cur->data.ismPosition.position[n].x, cur->data.ismPosition.position[n].y, cur->data.ismPosition.position[n].z );

                }

                fprintf( f_piDataOut, "\n\t\t]" );

            }

            break;

            case IVAS_PI_ISM_DISTANCE_ATTENUATION:

            {

                fprintf( f_piDataOut, "[\n" );

                for ( n = 0; n < cur->data.ismAttenuation.numObjects; n++ )

                {

                    if ( n != 0 )

                    {

                        fprintf( f_piDataOut, ",\n" );

                    }

                    fprintf( f_piDataOut, "\t\t\t{\n\t\t\t\t\"ref_dist\": %f,\n\t\t\t\t\"max_dist\": %f,\n\t\t\t\t\"roll_off\": %f \n\t\t\t}", cur->data.ismAttenuation.distAtten[n].ref_dist, cur->data.ismAttenuation.distAtten[n].max_dist, cur->data.ismAttenuation.distAtten[n].roll );

                }

                fprintf( f_piDataOut, "\n\t\t]" );

            }

            break;

            case IVAS_PI_ISM_DIRECTIVITY:

            {

                fprintf( f_piDataOut, "[\n" );

                for ( n = 0; n < cur->data.ismDirectivity.numObjects; n++ )

                {

                    if ( n != 0 )

                    {

                        fprintf( f_piDataOut, ",\n" );

                    }

                    fprintf( f_piDataOut, "\t\t\t{\n\t\t\t\t\"inner_ang\": %d,\n\t\t\t\t\"outer_ang\": %d,\n\t\t\t\t\"outer_att\": %f \n\t\t\t}", cur->data.ismDirectivity.directivity[n].innerConeAngle, cur->data.ismDirectivity.directivity[n].outerConeAngle, cur->data.ismDirectivity.directivity[n].outerAttenuationdB );

                }

                fprintf( f_piDataOut, "\n\t\t]" );

            }

            break;

            case IVAS_PI_PI_LATENCY:

            case IVAS_PI_R_ISM_ID:

            case IVAS_PI_R_ISM_GAIN:

lib_util/ivas_rtp_pi_data.c

+130 −179

File changed.

Preview size limit exceeded, changes collapsed.

lib_util/ivas_rtp_pi_data.h

+18 −0

File changed.

Preview size limit exceeded, changes collapsed.

tests/rtp/test_rtp.py

+42 −2

File changed.

Preview size limit exceeded, changes collapsed.