Commit d88dea06 authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

Merge branch 'main' of forge.3gpp.org:ivas-codec-pc/ivas-codec into FhG/hrtf_binary_fastconv

parents 5828caa5 30322ca2

.gitlab-ci.yml

+1 −0
Original line number Diff line number Diff line
@@ -965,6 +965,7 @@ coverage-test-on-main-scheduled: 
  - sed -i "s/IVAS FORMAT/IVAS $in_format to $out_format/g" ${public_dir}/index.html

  # do separately here to avoid overwrite complaints by mv

  - mv -f ci/complexity_measurements/style.css ${public_dir}/

  - ls $public_dir



.complexity-template:

  extends:

ci/collect_artifacts.py

+3 −0
Original line number Diff line number Diff line
@@ -62,6 +62,9 @@ def collect_for_sanitizer_test(file): 
    )

    files_to_archive = find_failed_files_for_sanitizer_test(console_log, "logs")



    print("files_to_archive_noPLC:", files_to_archive_noPLC)

    print("files_to_archive:", files_to_archive)



    log_folder = pathlib.Path("./LOGS_PLC")

    log_folder.mkdir()

    for test in files_to_archive.keys():

ci/run_scheduled_sanitizer_test.py

+9 −5
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ def run_check(modes: list, out_formats: list, tests: list, run_fec: bool = True) 
        )

    )



    with open(CONSOLE_OUT_FILE, "a") as f:

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

        proc = subprocess.Popen(

            cmd_no_fec, stdout=subprocess.PIPE, stderr=subprocess.PIPE

        )
@@ -174,9 +174,13 @@ def run_check(modes: list, out_formats: list, tests: list, run_fec: bool = True) 
        )

    )



    proc = subprocess.Popen(cmd_fec, stdout=subprocess.PIPE, stderr=subprocess.PIPE)

    with open(CONSOLE_OUT_FILE, "a") as f:

        proc = subprocess.Popen(

            cmd_fec, stdout=subprocess.PIPE, stderr=subprocess.PIPE

        )

        for c in iter(lambda: proc.stdout.read(1), b""):

            sys.stdout.buffer.write(c)

            f.write(c.decode("utf8"))

        proc.wait()



    returncode_fec = proc.returncode

lib_com/bitstream.c

+9 −1
Original line number Diff line number Diff line
@@ -1950,6 +1950,14 @@ ivas_error preview_indices( 
            /* read number of objects from the bitstream */

            st_ivas->nchan_transport = 1;



#ifdef FIX_ISM_DECODER_PRINTOUT

            k = (int16_t) ( ( total_brate / FRAMES_PER_SEC ) - 1 );

            while ( bit_stream[k] == 1 && st_ivas->nchan_transport < MAX_NUM_OBJECTS )

            {

                st_ivas->nchan_transport++;

                k--;

            }

#else

            if ( total_brate != SID_2k40 && total_brate != FRAME_NO_DATA )

            {

                k = (int16_t) ( ( total_brate / FRAMES_PER_SEC ) - 1 );
@@ -1959,7 +1967,7 @@ ivas_error preview_indices( 
                    k--;

                }

            }



#endif

            st_ivas->transport_config = AUDIO_CONFIG_EXTERNAL + st_ivas->nchan_transport;



            st_ivas->ism_mode = ivas_ism_mode_select( st_ivas->nchan_transport, total_brate );

lib_com/options.h

+2 −2
Original line number Diff line number Diff line
@@ -173,9 +173,9 @@ 
#define FIX_DTX_RANGE                                   /* Issue 118: fix the DTX usage: default DTX up to 64 kbps, otherwise only in silence */

#define FIX_ISM_METADATA_READER                         /* Issue 211: make ISM metadata file reader robust against invalid files */

#define FIX_GET_DELAY_RETURN                            /* Issue 223: change return data type in function get_delay() */

#define NTT_REDUC_COMP_POC                              /* NTT Contribution 10: Complexity reduction of phase spectrum in stereo downmix*/

#define FIX_ISM_DECODER_PRINTOUT                        /* Issue 229: fix ISM decoder printout */



/* NTT switches */

#define NTT_REDUC_COMP_POC                              /* Contribution  : Complexity reduction of phase spectrum in stereo downmix*/



#define HRTF_BINARY_FILE                                /* HRTF filters' binary file used for binaural rendering. */

#ifdef HRTF_BINARY_FILE