Commit 3101626b authored by Jouni Paulus's avatar Jouni Paulus
Browse files

Merge remote-tracking branch 'origin/main' into... 

Merge remote-tracking branch 'origin/main' into 897-usan-null-pointer-in-masa-external-renderer-to-ambisonics
parents 4b0682e3 b3b5be7d

.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 −1
Original line number Diff line number Diff line
@@ -801,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);