Commit b12dd863 authored by vaclav's avatar vaclav
Browse files

- Merge branch 'main' into 211-ism-metadata-file-reader-does-not-report-errors-in-invalid-files 

- fix typo in the compilation switch name
parents 3e6ff53e 41d8c884

.gitignore

+4 −0
Original line number Diff line number Diff line
@@ -51,6 +51,10 @@ tests/renderer/cut 
tests/renderer/ref

tests/dut

tests/ref

scripts/testv/*_cut*.pcm

# default reference binary name

IVAS_cod_ref

IVAS_dec_ref



# Python files that pop up when running scripts

__pycache__/

ci/run_scheduled_sanitizer_test.py

+0 −5
Original line number Diff line number Diff line
@@ -89,11 +89,6 @@ def get_modes(in_format: str) -> list: 
        in_format = "MC_" + in_format + "_b"

        mode_list = [m for m in mode_list if in_format in m]



    # TODO: remove once #185 is fixed

    # temporarily skip 24.4kbps SBA bitrate

    if in_format == "SBA":

        mode_list = [m for m in mode_list if not "b24_4" in m]



    return mode_list

lib_com/ivas_dirac_com.c

+4 −0
Original line number Diff line number Diff line
@@ -372,7 +372,11 @@ ivas_error ivas_dirac_sba_config( 
        else if ( sba_total_brate <= IVAS_24k4 )

        {

            hQMetaData->bits_frame_nominal = ACELP_16k40 / FRAMES_PER_SEC;

#ifdef FIX_185_REDUCE_MD_BITS

            hQMetaData->metadata_max_bits = 103;

#else

            hQMetaData->metadata_max_bits = 106;

#endif

        }

        else if ( sba_total_brate <= IVAS_32k )

        {

lib_com/ivas_error.h

+1 −1
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ typedef enum 
    IVAS_ERR_NOT_IMPLEMENTED,

    IVAS_ERR_FILE_READER_TIMESTAMP_MISMATCH,

    IVAS_ERR_ISM_FILE_READER_INVALID_METADATA_FORMAT,

#ifdef FIX_ISM_METADAT_READER

#ifdef FIX_ISM_METADATA_READER

    IVAS_ERR_ISM_INVALID_METADATA_VALUE,

#endif

    IVAS_ERR_INVALID_MASA_FORMAT_METADATA_FILE,

lib_com/ivas_prot.h

+9 −0
Original line number Diff line number Diff line
@@ -3053,6 +3053,7 @@ ivas_error ivas_sba_dec_reinit( 
    Decoder_Struct *st_ivas                                     /* i/o: IVAS decoder structure                  */

);

#endif



ivas_error ivas_sba_dec_reconfigure(

    Decoder_Struct *st_ivas                                     /* i/o: IVAS decoder structure                  */

);
@@ -3063,6 +3064,14 @@ void ivas_init_dec_get_num_cldfb_instances( 
    int16_t *numCldfbSyntheses                                  /* o  : number of CLDFB synthesis instances     */

);



#ifdef BRATE_SWITCHING_RENDERING

ivas_error ivas_cldfb_dec_reconfig(

    Decoder_Struct *st_ivas,                                    /* i/o: IVAS decoder structure                                */

    const int16_t nchan_transport_old,                          /* i  : number of TCs in previous frame                       */

    int16_t numCldfbAnalyses_old,                               /* i  : number of CLDFB analysis instances in previous frame  */

    const int16_t numCldfbSyntheses_old                         /* i  : number of CLDFB synthesis instances in previous frame */

);

#endif

/*! r: Ambisonic (SBA) order */

int16_t ivas_sba_get_order(

    const int16_t nb_channels,                                  /* i  : Number of ambisonic channels            */