Commit 1652d3c0 authored by Lauros Pajunen's avatar Lauros Pajunen
Browse files

Merge remote-tracking branch 'origin/main' into 1154-add-rtpdump-support-format-reinit

parents 7399de5c e0a12076

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -163,6 +163,7 @@ 
#define IVAS_RTPDUMP                                   /* RTPDUMP writing and reading for IVAS payloads */

#define IVAS_RTPDUMP_ACOUSTIC_ENVIRONMENT              /* RTPDUMP acoustic environment */

#define FIXED_RTP_SEQUENCE_NUM                         /* Remove random sequence number initialization */

#define PI_LATENCY                                     /* Pi latency PI frame */

#define ISM_PI_DATA                                    /* Add reading and packing/unpacking of ISM PI data */

#define REVERSE_ISM_PI_DATA                            /* Add reading and packing/unpacking of reverse ISM PI data */

#define DECODER_FORMAT_SWITCHING                       /* Re-initialize the decoder when the format/subformat of the incoming stream is changed */

lib_util/ivas_rtp_file.c

+12 −1
Original line number Diff line number Diff line
@@ -449,8 +449,19 @@ void IVAS_RTP_LogPiData( 
            case IVAS_PI_ISM_POSITION:

            case IVAS_PI_ISM_DISTANCE_ATTENUATION:

            case IVAS_PI_ISM_DIRECTIVITY:

            {

                fprintf( f_piDataOut, "{}" );

            }

            break;

#endif

            case IVAS_PI_PI_LATENCY:

            {

                fprintf( f_piDataOut, "{" );

                fprintf( f_piDataOut, "\n\t\t\t\"reverseType\": \"%s\",", PiDataNames[cur->data.piLatency.type] );

                fprintf( f_piDataOut, "\n\t\t\t\"latency\": %d", cur->data.piLatency.latency );

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

            }

            break;

            case IVAS_PI_R_ISM_ID:

#ifdef REVERSE_ISM_PI_DATA

            {
@@ -712,7 +723,7 @@ void IVAS_RTP_WriteExtPiData( 
            break;

            case IVAS_PI_PI_LATENCY:

            {

                fprintf( f_piDataOut, "%d", cur->data.piLatency.latency );

                fprintf( f_piDataOut, "%s,%d", PiDataNames[cur->data.piLatency.type], cur->data.piLatency.latency );

            }

            break;

            case IVAS_PI_R_ISM_ID:

lib_util/ivas_rtp_pi_data.c

+80 −2
Original line number Diff line number Diff line
@@ -938,7 +938,75 @@ static ivas_error unpackISMID( const uint8_t *buffer, uint32_t numDataBytes, IVA 


    return IVAS_ERR_OK;

}

#endif

#ifdef PI_LATENCY

static ivas_error packPiLatency( const IVAS_PIDATA_GENERIC *piData, uint8_t *buffer, uint32_t maxDataBytes, uint32_t *nBytesWritten )

{

    uint32_t typeBits;

    uint32_t latencyBits;

    uint32_t word;

    uint32_t nBytes = 0;

    const IVAS_PIDATA_REVERSE_PI_LATENCY *p = (const IVAS_PIDATA_REVERSE_PI_LATENCY *) piData;



    *nBytesWritten = 0;

    if ( piData->size != sizeof( IVAS_PIDATA_REVERSE_PI_LATENCY ) )

    {

        return IVAS_ERROR( IVAS_ERR_WRONG_PARAMS, "Incorrect size for PI_LATENCY data" );

    }

    if ( piData->piDataType != IVAS_PI_PI_LATENCY )

    {

        return IVAS_ERROR( IVAS_ERR_WRONG_PARAMS, "Incorrect PI ID for PI_LATENCY data" );

    }

    if ( maxDataBytes < 2 + 4 )

    {

        return IVAS_ERROR( IVAS_ERR_RTP_INSUFFICIENT_OUTPUT_SIZE, "Insufficient space to pack PI_LATENCY data" );

    }



    buffer[nBytes++] = ( p->piDataType & MASK_5BIT );

    buffer[nBytes++] = 4;



    typeBits = (uint32_t) ( p->type & MASK_5BIT );

    latencyBits = (uint32_t) ( p->latency & 0x07FFFFFF );

    word = ( typeBits << 27 ) | latencyBits;



    buffer[nBytes++] = (uint8_t) ( word >> 24 );

    buffer[nBytes++] = (uint8_t) ( word >> 16 );

    buffer[nBytes++] = (uint8_t) ( word >> 8 );

    buffer[nBytes++] = (uint8_t) ( word );

    *nBytesWritten = nBytes;



    return IVAS_ERR_OK;

}



static ivas_error unpackPiLatency( const uint8_t *buffer, uint32_t numDataBytes, IVAS_PIDATA_GENERIC *piData )

{

    uint32_t word;

    uint32_t lat;

    IVAS_PIDATA_REVERSE_PI_LATENCY *p = (IVAS_PIDATA_REVERSE_PI_LATENCY *) piData;



    if ( numDataBytes != 4 )

    {

        return IVAS_ERROR( IVAS_ERR_RTP_UNPACK_PI_DATA, "Incorrect size to unpack PI_LATENCY data" );

    }



    p->size = sizeof( IVAS_PIDATA_REVERSE_PI_LATENCY );

    p->piDataType = IVAS_PI_PI_LATENCY;



    word = ( (uint32_t) buffer[0] << 24 ) | ( (uint32_t) buffer[1] << 16 ) |

           ( (uint32_t) buffer[2] << 8 ) | (uint32_t) buffer[3];

    p->type = (IVAS_PI_TYPE) ( ( word >> 27 ) & MASK_5BIT );

    lat = word & 0x07FFFFFF;



    /* Sign-extend 27-bit value */

    if ( lat & ( 1u << 26 ) )

        p->latency = (int32_t) ( lat | ~0x07FFFFFF );

    else

        p->latency = (int32_t) lat;



    return IVAS_ERR_OK;

}

#endif

#ifdef ISM_PI_DATA

static ivas_error packISMGain( const IVAS_PIDATA_GENERIC *piData, uint8_t *buffer, uint32_t maxDataBytes, uint32_t *nBytesWritten )

{

    uint32_t nBytes = 0, n, idx;
@@ -1432,14 +1500,19 @@ static const PACK_PI_FN packPiDataFuntions[IVAS_PI_MAX_ID] = { 
#endif

    packDynamicSuppression, /* DYNAMIC_AUDIO_SUPPRESSION        */

    packAudioFocusCommon,   /* AUDIO_FOCUS_REQUEST              */

#ifdef PI_LATENCY

    packPiLatency, /* PI_LATENCY                       */

#else

    packUnsupportedData,    /* PI_LATENCY                       */

#endif

#else

    packUnsupportedData,   /* PLAYBACK_DEVICE_ORIENTATION      */

    packUnsupportedData,   /* HEAD_ORIENTATION                 */

    packUnsupportedData,   /* LISTENER_POSITION                */

    packUnsupportedData,   /* DYNAMIC_AUDIO_SUPPRESSION        */

    packUnsupportedData,   /* AUDIO_FOCUS_DIRECTION            */

#endif

    packUnsupportedData,   /* PI_LATENCY                       */

#endif

#ifdef REVERSE_ISM_PI_DATA

    packReverseISMID,   /* R_ISM_ID                         */

    packReverseISMGain, /* R_ISM_GAIN                       */
@@ -1515,14 +1588,19 @@ static const UNPACK_PI_FN unpackPiDataFuntions[IVAS_PI_MAX_ID] = { 
#endif

    unpackDynamicSuppression, /* DYNAMIC_AUDIO_SUPPRESSION        */

    unpackAudioFocusCommon,   /* AUDIO_FOCUS_REQUEST              */

#ifdef PI_LATENCY

    unpackPiLatency, /* PI_LATENCY                       */

#else

    unpackUnsupportedData,  /* PI_LATENCY                       */

#endif

#else

    unpackUnsupportedData, /* PLAYBACK_DEVICE_ORIENTATION      */

    unpackUnsupportedData, /* HEAD_ORIENTATION                 */

    unpackUnsupportedData, /* LISTENER_POSITION                */

    unpackUnsupportedData, /* DYNAMIC_AUDIO_SUPPRESSION        */

    unpackUnsupportedData, /* PI_LATENCY                       */

    unpackUnsupportedData, /* AUDIO_FOCUS_DIRECTION            */

#endif

    unpackUnsupportedData, /* PI_LATENCY                       */

#ifdef REVERSE_ISM_PI_DATA

    unpackReverseISMID,   /* R_ISM_ID                         */

    unpackReverseISMGain, /* R_ISM_GAIN                       */

scripts/ivas_conformance/README.md

+309 −15
Original line number Diff line number Diff line 
# IVAS conformance scripts

# IVAS Conformance Scripts



This folder contains scripts for running IVAS conformance tests. This is a placeholder file for instructions.

This folder contains scripts for running IVAS conformance tests.



no-BE conformance USAGE

## Setup for Reference Platform



Following CMDs needs to be executed from ivas-codec root folder:

  Reference platform is Ubuntu 24.04



################generate testvec package and encoder refs (temporary step to obtain testvec package, this step will be removed in final delivery)  ############

sh ivas_be_conf_test_gen.sh 

PYTHONPATH=scripts python scripts/ivas_conformance/runConformance.py --testvecDir $PWD/testvec --ref_build_path=testvec/ref_bin --cut_build_path=testvec/cut_bin --test-mode=ENC --regenerate-enc-refs

- Verify the Ubuntu Linux release is 24.04



  ```shell

  lsb_release -d | grep Ubuntu

  ```



  <span style="color: green;"> # It might be similar to Ubuntu 24.04.3 LTS </span>



Encoder conformance:

	- PYTHONPATH=scripts python scripts/ivas_conformance/runConformance.py --testvecDir $PWD/testvec --ref_build_path=testvec/ref_bin --cut_build_path=testvec/cut_bin --test-mode=ENC

Decoder conformance:

	- PYTHONPATH=scripts python scripts/ivas_conformance/runConformance.py --testvecDir $PWD/testvec --ref_build_path=testvec/ref_bin --cut_build_path=testvec/cut_bin --test-mode=DEC

Renderer conformance:

	- PYTHONPATH=scripts python scripts/ivas_conformance/runConformance.py --testvecDir $PWD/testvec --ref_build_path=testvec/ref_bin --cut_build_path=testvec/cut_bin --test-mode=REND

Split renderer confomance:

	- <TBD>
 
- Install Clang 18 compiler



  ```shell

  sudo apt install clang-18

  clang-18 --version

  ```



  Example version observed on Ubuntu 24.04.3 LTS



  ```text

  Ubuntu clang version 18.1.3 (1ubuntu1)

  Target: x86_64-pc-linux-gnu

  Thread model: posix

  InstalledDir: /usr/bin

  ```



  It might be required to set Clang-18 as the default clang on the machine



  ```shell

  sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-18 100

  ```



- Install Python3.13 on Ubuntu 24.04 LTS



  ```shell

  sudo apt install python3.13 python3.13-venv

  ```



- Create virtual environment for Python 3.13 and install requirements



  ```shell

  python3.13 -m venv pyConformance

  source pyConformance/bin/activate

  cd ivas-codec

  python -m pip install -r tests/requirements.txt

  ```



## Reference Conformance Package Generation



<details>

<summary> <i> Expand for detailed procedure </i> </summary>



To generate reference conformance package for distribution



### Generate Reference Outputs and Readme.txt files



  ```shell

  sh scripts/ivas_conformance/ivas_be_conf_test_gen.sh

  ```



<details>

<summary> Example output of reference test generation </summary>

<pre><code>

::::::::::::::::::::::::

------------------------------------------

Generated html report: file:///home/dolby/git/ivas-codec/report_cmd.htm

------------------------------------------

=================================================

2571 passed, 538 skipped, 230 xfailed in 377.10s (0:06:17)

=================================================

Identified 5430 files from scripts

Removed 1515 files

Kept 5422 files

</code></pre>

</details>



### Generate Reference Decoded Outputs for the Reference Encoded files



  ```shell

  PYTHONPATH=scripts python scripts/ivas_conformance/runConformance.py --testvecDir $PWD/testvec --ref_build_path=testvec/bin  --regenerate-enc-refs

  ```



### Generate a conformance package zip



  ```shell

  zip -r conformance.zip testvec scripts/ivas_conformance scripts/tools

  ```



</details>



## Run CUT tests on Target platform



  To run CUT binaries on the targeted platform, it is necessary to replicate the initial setup for python and dependency packages. The CUT build of the IVAS binaries should be made available in a selected folder and needed for the next step



  To run IVAS DUT commands on the TARGET platform (may be different from ubuntu/linux)



  ```shell

  PYTHONPATH=scripts python scripts/ivas_conformance/runConformance.py --testvecDir $PWD/testvec --cut_build_path=CUT_BIN_DIR

  ```



<details>

<summary>Example Output of CUT execution</summary>

<pre><code>

Accumulating commands from Readme_IVAS_dec.txt

Accumulating commands from Readme_IVAS_rend.txt

Accumulating commands from Readme_IVAS_enc.txt

Accumulating commands from Readme_IVAS_ISAR_post_rend.txt

Accumulating commands from Readme_IVAS_ISAR_dec.txt

Accumulating commands from Readme_IVAS_JBM_dec.txt

No of tests :

    ENC : 381

    DEC : 637

    REND : 666

    ISAR_ENC : 1032

    ISAR : 1032

Executing tests for ENC   (381 tests)

Executing tests for DEC   (637 tests)

Executing tests for REND   (666 tests)

Executing tests for ISAR_ENC   (1032 tests)

Executing tests for ISAR   (1032 tests)

</code></pre>

</details>



  This should generate outputs in scripts/CUT_OUTPUTS folder which looks like below:-



  ```shell

  CUT_OUTPUTS

    +- runlog.txt       : Dump of all the commands run and the outputs   (mostly jumbled up due to multiprocessing)

    +- failedCmds.txt   : Log of all the shell commands that failed execution

    +- dec/             : Folder containing all decoder tests CUT outputs

    +- enc/             : Folder containing all encoder tests CUT outputs

    +- renderer_short/  : Folder containing all renderer tests CUT outputs

    +- split_rendering/ : Folder containing all split rendering enc/dec tests

  ```



## Perform the MLD based analysis on the CUT outputs on reference platform (Ubuntu 24.04)



   If CUT test execution is done on a different platform, the scripts/CUT_OUTPUTS must be copied and provided in the reference platform's scripts/CUT_OUTPUTS. Then the following command is used to perform MLD based analysis on the same, encoded outputs will be implicitly decoded using reference decoder executables and MLD analysis performed on the reference decoded outputs.





  ```shell

   PYTHONPATH=scripts python scripts/ivas_conformance/runConformance.py --testvecDir $PWD/testvec --ref_build_path=testvec/bin --analyse

  ```



<details>

<summary>Example Output of CUT Analysis</summary>

<pre><code>

Accumulating commands from Readme_IVAS_dec.txt

Accumulating commands from Readme_IVAS_rend.txt

Accumulating commands from Readme_IVAS_enc.txt

Accumulating commands from Readme_IVAS_ISAR_post_rend.txt

Accumulating commands from Readme_IVAS_ISAR_dec.txt

Accumulating commands from Readme_IVAS_JBM_dec.txt

No of tests :

    ENC : 381

    DEC : 637

    REND : 666

    ISAR_ENC : 1032

    ISAR : 1032

Analysing tests for ENC   (381 tests)

##########################################################

&lt;ENC&gt; Total Frames: 2635800

&lt;ENC&gt; MAX MLD across all frames : 0.0

&lt;ENC&gt; Frames with MLD == 0 : 2635800 frames (100.0%)

&lt;ENC&gt; Frames with MLD <= 1 : 2635800 frames (100.0%)

&lt;ENC&gt; Frames with MLD <= 2 : 2635800 frames (100.0%)

&lt;ENC&gt; Frames with MLD <= 5 : 2635800 frames (100.0%)

&lt;ENC&gt; BE frames percentage = 100.0

&lt;ENC&gt; max absolute diff = 0.0, sample range (-32768, 32767)

##########################################################

Analysing tests for DEC   (637 tests)

##########################################################

&lt;DEC&gt; Total Frames: 4342140

&lt;DEC&gt; MAX MLD across all frames : 0.0

&lt;DEC&gt; Frames with MLD == 0 : 4342140 frames (100.0%)

&lt;DEC&gt; Frames with MLD <= 1 : 4342140 frames (100.0%)

&lt;DEC&gt; Frames with MLD <= 2 : 4342140 frames (100.0%)

&lt;DEC&gt; Frames with MLD <= 5 : 4342140 frames (100.0%)

&lt;DEC&gt; BE frames percentage = 100.0

&lt;DEC&gt; max absolute diff = 0.0, sample range (-32768, 32767)

##########################################################

Analysing tests for REND   (666 tests)

##########################################################

&lt;REND&gt; Total Frames: 4799952

&lt;REND&gt; MAX MLD across all frames : 0.0

&lt;REND&gt; Frames with MLD == 0 : 4799952 frames (100.0%)

&lt;REND&gt; Frames with MLD <= 1 : 4799952 frames (100.0%)

&lt;REND&gt; Frames with MLD <= 2 : 4799952 frames (100.0%)

&lt;REND&gt; Frames with MLD <= 5 : 4799952 frames (100.0%)

&lt;REND&gt; BE frames percentage = 100.0

&lt;REND&gt; max absolute diff = 0.0, sample range (-32768, 32767)

##########################################################

Analysing tests for ISAR_ENC   (1032 tests)

##########################################################

&lt;ISAR_ENC&gt; Total Frames: 2125956

&lt;ISAR_ENC&gt; MAX MLD across all frames : 0.0

&lt;ISAR_ENC&gt; Frames with MLD == 0 : 2125956 frames (100.0%)

&lt;ISAR_ENC&gt; Frames with MLD <= 1 : 2125956 frames (100.0%)

&lt;ISAR_ENC&gt; Frames with MLD <= 2 : 2125956 frames (100.0%)

&lt;ISAR_ENC&gt; Frames with MLD <= 5 : 2125956 frames (100.0%)

&lt;ISAR_ENC&gt; BE frames percentage = 100.0

&lt;ISAR_ENC&gt; max absolute diff = 0.0, sample range (-32768,32767)

##########################################################

Analysing tests for ISAR   (1032 tests)

##########################################################

&lt;ISAR&gt; Total Frames: 2125956

&lt;ISAR&gt; MAX MLD across all frames : 0.0

&lt;ISAR&gt; Frames with MLD == 0 : 2125956 frames (100.0%)

&lt;ISAR&gt; Frames with MLD <= 1 : 2125956 frames (100.0%)

&lt;ISAR&gt; Frames with MLD <= 2 : 2125956 frames (100.0%)

&lt;ISAR&gt; Frames with MLD <= 5 : 2125956 frames (100.0%)

&lt;ISAR&gt; BE frames percentage = 100.0

&lt;ISAR&gt; max absolute diff = 0.0, sample range (-32768, 32767)

##########################################################

</code></pre>

</details>



## Executing specific tests only



All CUT tests can be run specifically for IVAS Encoder,IVAS Decoder,IVAS Renderer, ISAR Encoder and ISAR Decoder only. The commandline allows for ```-test-mode=<PARAM>``` for this functionality, examples : -



- Run DUT IVAS Encoder Tests Only (on Target Platform)



  ```shell

  PYTHONPATH=scripts python scripts/ivas_conformance/runConformance.py --testvecDir $PWD/testvec --cut_build_path=CUT_BIN_DIR --test-mode=ENC

  ```



- Analyse BE conformance for DUT IVAS Encoder Outputs Only (on Reference Platform)



  ```shell

  PYTHONPATH=scripts python scripts/ivas_conformance/runConformance.py --testvecDir $PWD/testvec --ref_build_path=testvec/bin --test-mode=ENC --analyse --be-test

  ```



- Analyse NON-BE conformance for DUT IVAS Encoder Outputs Only (on Reference Platform)



  ```shell

  PYTHONPATH=scripts python scripts/ivas_conformance/runConformance.py --testvecDir $PWD/testvec --ref_build_path=testvec/bin --test-mode=ENC --analyse

  ```



- Run DUT IVAS Decoder Tests Only (on Target Platform)



  ```shell

  PYTHONPATH=scripts python scripts/ivas_conformance/runConformance.py --testvecDir $PWD/testvec --cut_build_path=CUT_BIN_DIR --test-mode=DEC

  ```



- Analyse BE conformance for DUT IVAS Decoder Outputs Only



  ```shell

  PYTHONPATH=scripts python scripts/ivas_conformance/runConformance.py --testvecDir $PWD/testvec --test-mode=DEC --analyse --be-test

  ```



- Analyse NON-BE conformance DUT IVAS Decoder Outputs Only (on Reference Platform)



  ```shell

  PYTHONPATH=scripts python scripts/ivas_conformance/runConformance.py --testvecDir $PWD/testvec  --test-mode=DEC --analyse

  ```



- Run DUT IVAS Renderer Tests Only (on Target Platform)



  ```shell

  PYTHONPATH=scripts python scripts/ivas_conformance/runConformance.py --testvecDir $PWD/testvec --cut_build_path=CUT_BIN_DIR --test-mode=REND

  ```



- Analyse BE conformance for DUT Renderer Outputs Only 



  ```shell

  PYTHONPATH=scripts python scripts/ivas_conformance/runConformance.py --testvecDir $PWD/testvec --test-mode=REND --analyse --be-test

  ```



- Analyse NON-BE conformance DUT Renderer Outputs Only 



  ```shell

  PYTHONPATH=scripts python scripts/ivas_conformance/runConformance.py --testvecDir $PWD/testvec --test-mode=REND --analyse

  ```



- Run DUT ISAR Encoder Tests Only (on Target Platform)



  ```shell

  PYTHONPATH=scripts python scripts/ivas_conformance/runConformance.py --testvecDir $PWD/testvec --cut_build_path=CUT_BIN_DIR --test-mode=ISAR_ENC

  ```



- Analyse BE conformance for DUT ISAR Encoder Outputs Only (on Reference Platform)



  ```shell

  PYTHONPATH=scripts python scripts/ivas_conformance/runConformance.py --testvecDir $PWD/testvec --ref_build_path=testvec/bin --test-mode=ISAR_ENC --analyse --be-test

  ```



- Analyse NON-BE conformance for DUT ISAR Encoder Outputs Only (on Reference Platform)



  ```shell

  PYTHONPATH=scripts python scripts/ivas_conformance/runConformance.py --testvecDir $PWD/testvec --ref_build_path=testvec/bin --test-mode=ISAR_ENC --analyse

  ```



- Run DUT ISAR Decoder Tests Only (on Target Platform)



  ```shell

  PYTHONPATH=scripts python scripts/ivas_conformance/runConformance.py --testvecDir $PWD/testvec --cut_build_path=CUT_BIN_DIR --test-mode=ISAR

  ```



- Analyse BE conformance for DUT ISAR Decoder Outputs Only



  ```shell

  PYTHONPATH=scripts python scripts/ivas_conformance/runConformance.py --testvecDir $PWD/testvec  --test-mode=ISAR --analyse --be-test

  ```



- Analyse NON-BE conformance DUT ISAR Decoder Outputs Only 



  ```shell

  PYTHONPATH=scripts python scripts/ivas_conformance/runConformance.py --testvecDir $PWD/testvec  --test-mode=ISAR --analyse

  ```

ivas_be_conf_test_gen.sh→scripts/ivas_conformance/ivas_be_conf_test_gen.sh

+0 −1
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ cp IVAS_cod IVAS_cod_ref 
cp IVAS_dec IVAS_dec_ref

cp IVAS_rend IVAS_rend_ref

cp ISAR_post_rend ISAR_post_rend_ref

python3 scripts/prepare_combined_format_inputs.py

python3 -m pytest -q tests/codec_be_on_mr_nonselection tests/renderer_short/test_renderer.py tests/split_rendering/test_split_rendering.py -v -n auto --update_ref 1 --create_ref --keep_files --html=report_cmd.html --self-contained-html

python3 scripts/parse_commands.py report_cmd.html Readme_IVAS.txt  

rm -rf testvec