Commit 9483269e authored by Jouni Paulus's avatar Jouni Paulus
Browse files

Merge remote-tracking branch 'origin/main' into 225-add-1tc-masa-tests-for-renderer

parents c61f50dd 76e31f95

.gitlab-ci.yml

+1 −0
Original line number Diff line number Diff line
@@ -1277,6 +1277,7 @@ test-long-self-test: 
  stage: test

  tags:

    - sanitizer_test_main

    - ivas-linux-fast

  artifacts:

    name: "$CI_JOB_NAME--main--sha-$CI_COMMIT_SHORT_SHA"

    expire_in: 1 week

apps/decoder.c

+1 −1
Original line number Diff line number Diff line
@@ -218,7 +218,7 @@ int main( 
#endif

#ifdef WMOPS

    reset_wmops();

    reset_mem( USE_32BITS );

    reset_mem( USE_BYTES );

#endif



    /*------------------------------------------------------------------------------------------*

apps/encoder.c

+1 −1
Original line number Diff line number Diff line
@@ -202,7 +202,7 @@ int main( 
#endif

#ifdef WMOPS

    reset_wmops();

    reset_mem( USE_32BITS );

    reset_mem( USE_BYTES );

#endif



    initArgStruct( &arg );

apps/renderer.c

+1 −21
Original line number Diff line number Diff line
@@ -277,11 +277,7 @@ static const CmdLnParser_Option cliOptions[] = { 
    {

        .id = CmdLnOptionId_trajFile,

        .match = "trajectory_file",

#ifdef FIX_247_EXTERNAL_RENDERER_COMMAND_LINE

        .matchShort = "T",

#else

        .matchShort = "tf",

#endif

        .description = "Head rotation trajectory file for simulation of head tracking (only for binaural outputs)",

    },

#ifdef SPLIT_REND_WITH_HEAD_ROT
@@ -312,25 +308,14 @@ static const CmdLnParser_Option cliOptions[] = { 
    },

    {

        .id = CmdLnOptionId_renderConfigFile,

#ifdef FIX_247_EXTERNAL_RENDERER_COMMAND_LINE

        .match = "render_config_parameters",

        .matchShort = "render_config",

        .description = "Binaural renderer configuration parameters in file (only for binaural outputs)",

#else

        .match = "render_config",

        .matchShort = "rc",

        .description = "Binaural renderer configuration file (only for binaural outputs)",

#endif

    },

    {

        .id = CmdLnOptionId_nonDiegeticPan,

#ifdef FIX_247_EXTERNAL_RENDERER_COMMAND_LINE

        .match = "non_diegetic_panning",

        .matchShort = "non_diegetic_pan",

#else

        .match = "non_diegetic_pan",

        .matchShort = "ndp",

#endif

        .description = "Panning mono non diegetic sound to stereo -90<= pan <= 90\nleft or l or 90->left, right or r or -90->right, center or c or 0 ->middle\n",

    },

    {
@@ -351,13 +336,8 @@ static const CmdLnParser_Option cliOptions[] = { 
      .description = "LFE panning matrix. File (CSV table) containing a matrix of dimensions [ num_input_lfe x num_output_channels ] with elements specifying linear routing gain (like --gain, -g). \nIf specified, overrides the output LFE position option and the default behavior which attempts to map input to output LFE channel(s)" },

    {

        .id = CmdLnOptionId_noDelayCmp,

#ifdef FIX_247_EXTERNAL_RENDERER_COMMAND_LINE

        .match = "no_delay_comparison",

        .matchShort = "no_delay_cmp",

#else

        .match = "no_delay_cmp",

        .matchShort = "ndc",

#endif

        .description = "[flag] Turn off delay compensation",

    },

    {
@@ -821,7 +801,7 @@ int main( 


#ifdef WMOPS

    reset_wmops();

    reset_mem( USE_32BITS );

    reset_mem( USE_BYTES );

#endif



    for ( i = 0; i < RENDERER_MAX_MASA_INPUTS; ++i )

ci/complexity_measurements/index_complexity.html

+21 −21
Original line number Diff line number Diff line
@@ -201,25 +201,25 @@ 
  <div class="graph-container" style="clear: both;">

    <ul class="legend">

      <li style="border-color: #FF0000;"><em>Max. total RAM Codec:</em>

            32 bit words, Encoder + Decoder</li>

            Encoder + Decoder</li>

      <li style="border-color: #FF8000;"><em>Max. total RAM Encoder:</em>

            32 bit words, Encoder only</li>

            Encoder only</li>

      <li style="border-color: #FFFF00;"><em>Max. total RAM Decoder:</em>

            32 bit words, Decoder only</li>

            Decoder only</li>

      

      <li style="border-color: #800080;"><em>Max. HEAP Codec:</em>

            32 bit words, Encoder + Decoder</li>

            Encoder + Decoder</li>

      <li style="border-color: #0000FF;"><em>Max. HEAP Encoder</em>

            32 bit words, Encoder only</li>

            Encoder only</li>

      <li style="border-color: #0080C0;"><em>Max. HEAP Decoder</em> 

            32 bit words, Decoder only</li>

            Decoder only</li>

      

      <li style="border-color: #004000;"><em>Max. STACK Codec:</em>

            32 bit words, max(Encoder, Decoder)</li>

            max(Encoder, Decoder)</li>

      <li style="border-color: #008000;"><em>Max. STACK Encoder:</em>

            32 bit words, Encoder only</li>

            Encoder only</li>

      <li style="border-color: #00FF00;"><em>Max. STACK Decoder:</em>

            32 bit words, Decoder only</li>

            Decoder only</li>

    </ul>

  </div>
@@ -261,10 +261,10 @@ 
    <ul class="legend">

      <li style="border-color: #FF0000;"><em>Max. total ROM Codec:</em> Encoder + Decoder</li>



      <li style="border-color: #FF8000;"><em>Max. max PROM Encoder Library:</em> lib_enc only</li>

      <li style="border-color: #FFFF00;"><em>Max. max PROM Decoder Library:</em> lib_dec only</li>

      <li style="border-color: #800080;"><em>Max. max PROM Common Library:</em> lib_com only/li>

      <li style="border-color: #0000FF;"><em>Max. max PROM Ext Renderer Library:</em> lib_ren only</li>

      <li style="border-color: #FF8000;"><em>Max. Program ROM Encoder Library:</em> lib_enc only</li>

      <li style="border-color: #FFFF00;"><em>Max. Program ROM Decoder Library:</em> lib_dec only</li>

      <li style="border-color: #800080;"><em>Max. Program ROM Common Library:</em> lib_com only</li>

      <li style="border-color: #0000FF;"><em>Max. Program ROM Ext Renderer Library:</em> lib_rend only</li>



      <li style="border-color: #0080C0;"><em>Max. Table ROM Encoder Library:</em> lib_enc only</li>

      <li style="border-color: #004000;"><em>Max. Table ROM Decoder Library:</em> lib_dec only</li>
@@ -707,7 +707,7 @@ function RAM() { 
                max: max_val,

                tickFormatter: function (v, axis) {

                    if (graph.direction == -1)

                        return v + " Word";

                        return v + " bytes";

                    return v;

                },

                invert: graph.direction == 1
@@ -755,7 +755,7 @@ function RAM() { 
              var text = 'Score: ' + y;



              if (graph.direction == -1)

                text += " Word";

                text += " bytes";

              text += "<br>";

            

              if (x > 0) {
@@ -774,7 +774,7 @@ function RAM() { 
                if (diff === diff) {

                    text += String.fromCharCode(916) + ": " + diff;

                    if (graph.direction == -1)

                        text += " Word";

                        text += " bytes";

                    text += " (" + pdiff + "% " + better + ")<br>";

                }

              }
@@ -816,7 +816,7 @@ function RAM() { 


              text += "<a href=\"logs/" + graph.runs[x].logFile + "\">Logfile</a><br>";

            } else {

              text = "RAM requirement: 100000 Word";

              text = "RAM requirement: 400000 bytes";

            }



	    showToolTip(item.pageX, item.pageY, text);
@@ -868,7 +868,7 @@ function ROM() { 
                max: max_val,

                tickFormatter: function (v, axis) {

                    if (graph.direction == -1)

                        return v + " Word";

                        return v + " bytes";

                    return v;

                },

                invert: graph.direction == 1
@@ -916,7 +916,7 @@ function ROM() { 
              var text = 'Score: ' + y;



              if (graph.direction == -1)

                text += " Word";

                text += " bytes";

              text += "<br>";

            

              if (x > 0) {
@@ -935,7 +935,7 @@ function ROM() { 
                if (diff === diff) {

                    text += String.fromCharCode(916) + ": " + diff;

                    if (graph.direction == -1)

                        text += " Word";

                        text += " bytes";

                    text += " (" + pdiff + "% " + better + ")<br>";

                }

              }
@@ -991,7 +991,7 @@ function ROM() { 
			  */



            } else {

              text = "ROM requirement: 200 kWord";

              text = "ROM requirement: 800000 bytes";

            }



	    showToolTip(item.pageX, item.pageY, text);