Commit 9b52a47d authored by Tapani Pihlajakuja's avatar Tapani Pihlajakuja
Browse files

Merge remote-tracking branch 'origin/main' into ci/increase-parameter-variance-in-masa-tests

parents 0b8c11c9 af1ba8b2

Workspace_msvc/lib_util.vcxproj

+2 −0
Original line number Diff line number Diff line
@@ -101,6 +101,7 @@ 
  </ItemDefinitionGroup>

  <ItemGroup>

    <ClCompile Include="..\lib_util\aeid_file_reader.c" />

    <ClCompile Include="..\lib_util\ambi_convert.c" />

    <ClCompile Include="..\lib_util\audio_file_reader.c" />

    <ClCompile Include="..\lib_util\audio_file_writer.c" />

    <ClCompile Include="..\lib_util\bitstream_reader.c" />
@@ -128,6 +129,7 @@ 
  </ItemGroup>

  <ItemGroup>

    <ClInclude Include="..\lib_util\aeid_file_reader.h" />

    <ClInclude Include="..\lib_util\ambi_convert.h" />

    <ClInclude Include="..\lib_util\audio_file_reader.h" />

    <ClInclude Include="..\lib_util\audio_file_writer.h" />

    <ClInclude Include="..\lib_util\bitstream_reader.h" />

ci/basop-pages/create_report_pages.py

+55 −5
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ import pathlib 
import argparse

from functools import partial



FORMATS = ["Stereo", "ISM", "Multichannel", "MASA", "SBA", "OSBA", "OMASA", "Renderer"]



CSV_DELIM = ";"

SUBPAGE_TMPL_CSS = """
@@ -25,7 +26,7 @@ SUBPAGE_TMPL_CSS = """ 


SUBPAGE_TMPL_HTML = """



<h1>Report for job {job_name}</h1

<h1>Report for job {job_name}</h1>



Comparing:

<ul>
@@ -34,6 +35,13 @@ Comparing: 
    <li><a href="{job_name}--merged_csv--{id_current}.csv">Merged csv data</a></li>

</ul>



{images_mld}



{images_diff}



{images_ssnr}





<br>

<b>How is the table sorted?</b>

<ul>
@@ -92,9 +100,17 @@ ARROW_DOWN = '<span class="arrowdown">&#11010;</span>' 


# expected columns. actual columns are filtered from the incoming data later, this

# is mainly for controlling the order in the output table

COLUMNS = ["testcase", "Result", "MLD", "MAXIMUM ABS DIFF", "MIN_SSNR"]

COLUMNS = [

    "testcase",

    "Format",

    "Category",

    "Result",

    "MLD",

    "MAXIMUM ABS DIFF",

    "MIN_SSNR",

]

COLUMNS_GLOBAL = COLUMNS[:1]

COLUMNS_DIFFERENTIAL = COLUMNS[1:]

COLUMNS_DIFFERENTIAL = COLUMNS[3:]

COLUMNS_DIFFERENTIAL_NOT_MLD = COLUMNS_DIFFERENTIAL[2:]
@@ -106,6 +122,7 @@ def create_subpage( 
    id_current: int,

    id_previous: int,

    job_name: str,

    histogram,

):

    merged_reports = merge_and_cleanup_mld_reports(

        csv_current, csv_previous, id_current, id_previous
@@ -128,6 +145,33 @@ def create_subpage( 
    table_body = "\n".join(

        tr_from_row(row, id_current, id_previous) for row in merged_reports

    )

    if histogram:

        images_mld = (

            f"<h2>MLD summary {job_name}</h2>\n"

            + " ".join(

                [f"<img src=images/summary_{id_current}_MLD_{x}.png>" for x in FORMATS]

            )

            + f'\n<br><a href="images/summary_{id_current}_MLD.csv">summary_{id_current}_MLD.csv</a>'

        )

        images_ssnr = (

            f"<h2>MIN_SSNR summary {job_name}</h2>\n"

            + " ".join(

                [f"<img src=images/summary_{id_current}_SSNR_{x}.png>" for x in FORMATS]

            )

            + f'\n<br><a href="images/summary_{id_current}_SSNR.csv">summary_{id_current}_SSNR.csv</a>'

        )

        images_diff = (

            f"<h2>MAX ABS DIFFERENCE summary {job_name}</h2>\n"

            + " ".join(

                [f"<img src=images/summary_{id_current}_DIFF_{x}.png>" for x in FORMATS]

            )

            + f'\n<br><a href="images/summary_{id_current}_DIFF.csv">summary_{id_current}_DIFF.csv</a>'

        )

    else:

        images_mld = ""

        images_ssnr = ""

        images_diff = ""



    new_subpage = SUBPAGE_TMPL_CSS + SUBPAGE_TMPL_HTML.format(

        id_current=id_current,

        id_previous=id_previous,
@@ -135,6 +179,9 @@ def create_subpage( 
        job_name=job_name,

        table_header_a=table_header_a,

        table_header_b=table_header_b,

        images_mld=images_mld,

        images_ssnr=images_ssnr,

        images_diff=images_diff,

    )

    with open(html_out, "w") as f:

        f.write(new_subpage)
@@ -226,8 +273,9 @@ def merge_and_cleanup_mld_reports( 
        are uninteresting and are put last.

        """

        try:

            float(x[mld_col_curr])

            float(x[mld_col_prev])

            cols = [mld_col_curr, mld_col_prev] + [p[1] for p in other_col_pairs]

            for c in cols:

                float(x[c])

        except ValueError:

            # Value is no valid floating point value

            return float("inf")
@@ -293,6 +341,7 @@ if __name__ == "__main__": 
    parser.add_argument("id_current", type=int)

    parser.add_argument("id_previous", type=int)

    parser.add_argument("job_name")

    parser.add_argument("--histogram", action="store_true")

    args = parser.parse_args()



    create_subpage(
@@ -303,4 +352,5 @@ if __name__ == "__main__": 
        args.id_current,

        args.id_previous,

        args.job_name,

        args.histogram,

    )

lib_com/ivas_cnst.h

+0 −6
Original line number Diff line number Diff line
@@ -1289,14 +1289,8 @@ typedef enum 
#define LFE_CHANNEL                             3



#define MIN_LFE_NRG                             0.5f

#ifdef ADJUST_MCT_CHANNELS_MAX   

#define MCT_MAX_CHANNELS                        11                          /* == 7.1.4 LS channels without the LFE channel */

#define MCT_MAX_BLOCKS                          ( ( MCT_MAX_CHANNELS + 1 ) / CPE_CHANNELS )    /* max. number of channel pairs (MCT_MAX_CHANNELS/2) within MCT*/

#else

#define MCT_MAX_CHANNELS                        12

#define MCT_MAX_BLOCKS                          ( MCT_MAX_CHANNELS / CPE_CHANNELS )    /* max. number of channel pairs (MCT_MAX_CHANNELS/2) within MCT*/

#define MAX_NUM_DATA                            max( MCT_MAX_CHANNELS, 4 )

#endif



#define NBBITS_MCT_RATIO                        4

#define BITRATE_MCT_RATIO_RANGE                 ( 1 << NBBITS_MCT_RATIO )   /* Range of the coded bitrate distribution ratio */

lib_com/ivas_prot.h

+0 −4
Original line number Diff line number Diff line
@@ -84,13 +84,9 @@ void ivas_write_format( 
void ivas_write_format_sid(

    const IVAS_FORMAT ivas_format,                              /* i  : IVAS format                             */

    const int16_t element_mode,                                 /* i  : element bitrate                         */

#ifdef NONBE_FIX_1052_SBA_EXT_FIX

    BSTR_ENC_HANDLE hBstr,                                      /* i/o: encoder bitstream handle                */

    const int16_t sba_order,                                    /* i  : Ambisonic (SBA) order                   */

    const int16_t sba_planar                                    /* i  : SBA planar flag                         */

#else

    BSTR_ENC_HANDLE hBstr                                       /* i/o: encoder bitstream handle                */

#endif

);



ivas_error create_sce_enc(

lib_com/ivas_rom_com.c

+0 −2
Original line number Diff line number Diff line
@@ -2471,13 +2471,11 @@ const uint16_t ivas_param_mc_sym_freq_ild_delta_combined_48_16bits[2 * PARAM_MC_ 
 * MASA ROM tables

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













#ifdef FIX_1121_MASA_DESCRIPTOR















const uint8_t ivasmasaFormatDescriptor[8] = 















{ 















    0x49, 0x56, 0x41, 0x53, 0x4D, 0x41, 0x53, 0x41 /* "IVASMASA" */















};



























#endif















const float diffuseness_reconstructions_hr[HR_MASA_ER_LEVELS] =















{















     0.00f,