Commit 4b38f397 authored by Tapani Pihlajakuja's avatar Tapani Pihlajakuja
Browse files

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

Merge remote-tracking branch 'origin/main' into 1074-number-of-objects-signaling-correction-in-omasa-low-rate
parents 7a8e8c97 86862b41

apps/decoder.c

+0 −4
Original line number Diff line number Diff line
@@ -1718,14 +1718,12 @@ static bool parseCmdlIVAS_dec( 
            return false;

        }



#ifdef FIX_1081_BINAURAL_SPLIT_PCM_SANITY_CHECK

        if ( arg->outputMdFilename != NULL && arg->outputConfig != IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM )

        {

            fprintf( stderr, "Error: Output split rendering metadata file is supported for BINAURAL_SPLIT_PCM output config. only\n\n" );

            usage_dec();

            return false;

        }

#endif

    }

    else

    {
@@ -2040,13 +2038,11 @@ static ivas_error initOnFirstGoodFrame( 
        }

        else

        {

#ifdef FIX_1081_BINAURAL_SPLIT_PCM_SANITY_CHECK

            if ( arg.outputMdFilename == NULL )

            {

                fprintf( stderr, "\nOutput split rendering metadata file not specified\n" );

                return IVAS_ERR_INVALID_SPLIT_REND_CONFIG;

            }

#endif



            if ( ( error = split_rend_writer_open( splitRendWriter,

                                                   arg.outputMdFilename,

lib_com/ivas_dirac_com.c

+0 −4
Original line number Diff line number Diff line
@@ -345,11 +345,7 @@ void ivas_get_dirac_sba_max_md_bits( 
        /* OSBA needs an additional 5-bits safety margin to avoid acelp crashes */

        if ( ivas_format == SBA_ISM_FORMAT )

        {

#ifdef NONBE_FIX_SBA_SIGNALING_BITS_B

            ( *metadata_max_bits ) -= 7;

#else

            ( *metadata_max_bits ) -= 3;

#endif

        }

    }

    else if ( sba_total_brate <= IVAS_32k )

lib_com/ivas_prot.h

+18 −2
Original line number Diff line number Diff line
@@ -3207,6 +3207,9 @@ void ivas_qmetadata_enc_sid_encode( 
    BSTR_ENC_HANDLE hMetaData,                                  /* i/o: metadata bitstream handle               */

    IVAS_QMETADATA *q_metadata,                                 /* i/o: metadata handle                         */

    const int16_t masa_sid_descriptor,                          /* i  : description of MASA SID coding structure*/

#ifdef NONBE_FIX_1052_SBA_EXT

    const int16_t nchan_transport, /* i  : number of transport channels                             */

#endif

	const int16_t ivas_format                                   /* i  : ivas format                             */

);
@@ -3515,6 +3518,13 @@ int16_t ivas_sba_get_nchan_metadata( 
    const int32_t ivas_total_brate                              /* i  : IVAS total bitrate                      */

);



#ifdef NONBE_FIX_1052_SBA_EXT

/*! r: number of bits in SPAR SID frame */

int16_t ivas_sba_spar_sid_bitlen(

    const int16_t nchan_transport /* i  : number of transport channels            */

);

#endif



void ivas_sba_get_spar_hoa_ch_ind(

    const int16_t num_md_chs,                                   /* i  : number of MD channels                   */

    const int32_t ivas_total_brate,                             /* i  : IVAS total bitrate                      */
@@ -3616,6 +3626,9 @@ ivas_error ivas_dirac_enc( 
    const int16_t input_frame,                                  /* i  : input frame length                      */

    const int16_t dtx_vad,                                      /* i  : DTX vad flag                            */

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

#ifdef NONBE_FIX_1052_SBA_EXT

    const int16_t nchan_transport,                              /* i  : number of transport channels                             */

#endif

	const int16_t hodirac_flag                                  /* i  : hodirac flag                            */

);
@@ -3671,6 +3684,9 @@ void ivas_dirac_dec_read_BS( 
    int16_t *nb_bits,                                           /* o  : number of bits read                     */

    const int16_t last_bit_pos,                                 /* i  : last read bitstream position            */

    const int16_t hodirac_flag,                                 /* i  : flag to indicate HO-DirAC mode          */

	#ifdef NONBE_FIX_1052_SBA_EXT

    const int16_t nchan_transport,                              /* i  : number of transport channels                             */

#endif

    int16_t *dirac_to_spar_md_bands                             /* o  : DirAC->SPAR MD bands                    */

);

lib_com/ivas_sba_config.c

+23 −0
Original line number Diff line number Diff line
@@ -158,6 +158,29 @@ int16_t ivas_sba_get_nchan( 
    return ( nb_channels );

}



#ifdef NONBE_FIX_1052_SBA_EXT

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

 * ivas_sba_spar_sid_bitlen()

 *

 * Get number of bits in SPAR SID frame

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



/*! r: number of bits in SPAR SID frame */

int16_t ivas_sba_spar_sid_bitlen(

    const int16_t nchan_transport /* i  : number of transport channels            */

)

{

    int16_t num_bits;



    num_bits = SPAR_DTX_BANDS * SPAR_SID_BITS_TAR_PER_BAND;

    if ( nchan_transport > 1 )

    {

        num_bits -= 2;

    }



    return num_bits;

}

#endif



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

 * ivas_sba_get_nchan_metadata()

lib_com/options.h

+3 −9
Original line number Diff line number Diff line
@@ -158,15 +158,11 @@ 
#define ISAR_BITSTREAM_UPDATE_LC3PLUS                   /* FhG: Multiple improvements to the ISAR bitstream when LC3plus is used. See MR 1456 for details. */

#define SPLIT_REND_POSE_CORRECTION_UNUSED_BITS



#define FIX_NUM_SUBFRAME_UPDATE



#define FIX_1053_REVERB_RECONFIGURATION                 /* Philips: issue 1053: fix for dynamic switching of acoustic environment */



#define CONF_DISTATT                                    /* Eri: Make distance attenuation configurable */

#define FIX_1082_INSTRUM_FAILED_LC3PLUS                 /* VoiceAge: issue 1082: fix ambiguous syntax in LC3Plus code leading to fails of instrumented builds */

#define FIX_1052_EXT_OUTPUT                             /* VA: issue 1052: define EXT decoder output configuration for stereo and MC formats */ 



#define FIX_1077_MEMORY_TEST_MISSING                    /* orange: issue 1077 : add missing memory test*/

#define FIX_1081_BINAURAL_SPLIT_PCM_SANITY_CHECK        /* VA: issue 1081: correct error print-out when BINAURAL_SPLIT_PCM is requested */



/* #################### End BE switches ################################## */
@@ -175,11 +171,9 @@ 
/* all switches in this category should start with "NONBE_" */



#define NONBE_FIX_ISM_XOVER_BR                          /* FhG: issue 1072: select OSBA coding method depending on number of object and bitrate */

#define NONBE_FIX_1028_1DB_TCX_LEVEL_DROP               /* VA: Harmonize the logic setting LP weighting factor between TCX encoder and TCX decoder */



#define NONBE_FIX_SBA_SIGNALING_BITS_B                  /* FhG: issue 1061: option B: signal sba order additionally in OSBA */

#define NONBE_FIX_1070_USAN_SEGFAULT_MC_TO_BIN_BTSW_HEADROT   /* fix 1070 USAN: nullptr-with-offset and Segfaults in 7_1_4 to BINAURAL and BINAURAL_ROOM_REVERB decoding with bitrate switching and head rotation*/ 

#define NONBE_FIX_MC_LFE_LPF                            /* Dlb: Adding the LFE LPF filter back for MC content. */



#define NONBE_FIX_1052_SBA_EXT                          /* Dlb: SBA external output support */



#define NONBE_FIX_1074_NOBJ_SIGNAL_OMASA_LBR            /* Nok: issue 1074 fixing number of objects signaling in OMASA low rate */

/* ##################### End NON-BE switches ########################### */