Commit 411d45a2 authored by multrus's avatar multrus
Browse files

merge from main

parents 0129745b b9e92908

apps/decoder.c

+0 −2
Original line number Diff line number Diff line
@@ -481,12 +481,10 @@ int main( 
            goto cleanup;

        }



#ifdef FIX_1449_RENDERER_FRAME_SIZE_UNCLEAR_IN_ISAR

        if ( !arg.renderConfigEnabled && ( arg.render_num_subframes != asked_num_subframes ) )

        {

            fprintf( stderr, "\nChanged render framesize, only 20ms are allowed for non-0dof split rendering!\n" );

        }

#endif

    }



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

apps/renderer.c

+10 −39
Original line number Diff line number Diff line
@@ -48,9 +48,6 @@ 
#include "rotation_file_reader.h"

#include "aeid_file_reader.h"

#include "split_render_file_read_write.h"

#ifndef FIX_1494_SET_SPLITBFI_UNUSED

#include "split_rend_bfi_file_reader.h"

#endif

#include "vector3_pair_file_reader.h"

#ifdef DEBUGGING

#include "debug.h"
@@ -170,9 +167,6 @@ typedef struct 
    int16_t numInMetadataFiles;

    char outMetadataFilePath[RENDERER_MAX_CLI_ARG_LENGTH];

    char headRotationFilePath[RENDERER_MAX_CLI_ARG_LENGTH];

#ifndef FIX_1494_SET_SPLITBFI_UNUSED

    char splitRendBFIFilePath[RENDERER_MAX_CLI_ARG_LENGTH];

#endif

    char referenceVectorFilePath[RENDERER_MAX_CLI_ARG_LENGTH];

    char referenceRotationFilePath[RENDERER_MAX_CLI_ARG_LENGTH];

    char externalOrientationFilePath[RENDERER_MAX_CLI_ARG_LENGTH];
@@ -223,9 +217,6 @@ typedef enum 
    CmdLnOptionId_listFormats,

    CmdLnOptionId_inputGain,

    CmdLnOptionId_outputMetadata,

#ifndef FIX_1494_SET_SPLITBFI_UNUSED

    CmdLnOptionId_SplitRendBFIFile,

#endif

    CmdLnOptionId_referenceVectorFile,

    CmdLnOptionId_exteriorOrientationFile,

    CmdLnOptionId_framing,
@@ -284,14 +275,6 @@ static const CmdLnParser_Option cliOptions[] = { 
        .matchShort = "om",

        .description = "coded metadata file for BINAURAL_SPLIT_PCM output mode",

    },

#ifndef FIX_1494_SET_SPLITBFI_UNUSED

    {

        .id = CmdLnOptionId_SplitRendBFIFile,

        .match = "post_rend_bfi_file",

        .matchShort = "prbfi",

        .description = "Split rendering option: bfi file",

    },

#endif

    {

        .id = CmdLnOptionId_refRotFile,

        .match = "reference_rotation_file",
@@ -696,9 +679,6 @@ int main( 
    IVAS_CLDFB_FILTER_BANK_HANDLE cldfbAna[RENDERER_MAX_INPUT_CHANNELS];

    IVAS_CLDFB_FILTER_BANK_HANDLE cldfbSyn[RENDERER_MAX_INPUT_CHANNELS];

    int16_t cldfb_in_flag, CLDFBframeSize_smpls;

#ifndef FIX_1494_SET_SPLITBFI_UNUSED

    SplitRendBFIFileReader *splitRendBFIReader = NULL;

#endif

    Vector3PairFileReader *referenceVectorReader = NULL;

    hrtfFileReader *hrtfFileReader = NULL;

    IVAS_DEC_HRTF_CREND_HANDLE *hHrtfCrend = NULL;
@@ -829,13 +809,6 @@ int main( 
        }

    }



#ifndef FIX_1494_SET_SPLITBFI_UNUSED

    if ( !isEmptyString( args.splitRendBFIFilePath ) )

    {

        convert_backslash( args.splitRendBFIFilePath );

        SplitRendBFIFileReader_open( args.splitRendBFIFilePath, &splitRendBFIReader );

    }

#endif



    if ( !isEmptyString( args.externalOrientationFilePath ) )

    {
@@ -2080,9 +2053,6 @@ cleanup: 
    }



    split_rend_reader_writer_close( &hSplitRendFileReadWrite );

#ifndef FIX_1494_SET_SPLITBFI_UNUSED

    SplitRendBFIFileReader_close( &splitRendBFIReader );

#endif



    for ( i = 0; i < RENDERER_MAX_MC_INPUTS; ++i )

    {
@@ -2668,6 +2638,11 @@ static CmdlnArgs defaultArgs( 


    args.inConfig.inSetupCustom.num_spk = 0;

    args.inConfig.inSetupCustom.num_lfe = 0;

    for ( i = 0; i < RENDERER_MAX_INPUT_CHANNELS; i++ )

    {

        args.inConfig.inSetupCustom.azimuth[i] = 0.f;

        args.inConfig.inSetupCustom.elevation[i] = 0.f;

    }

    args.inConfig.numAudioObjects = 0;

    args.inConfig.numAmbisonicsBuses = 0;

    args.inConfig.numMultiChannelBuses = 0;
@@ -2676,6 +2651,11 @@ static CmdlnArgs defaultArgs( 
    args.outConfig.audioConfig = IVAS_AUDIO_CONFIG_INVALID;

    args.outConfig.outSetupCustom.num_spk = 0;

    args.outConfig.outSetupCustom.num_lfe = 0;

    for ( i = 0; i < RENDERER_MAX_OUTPUT_CHANNELS; i++ )

    {

        args.outConfig.outSetupCustom.azimuth[i] = 0.f;

        args.outConfig.outSetupCustom.elevation[i] = 0.f;

    }

    for ( i = 0; i < RENDERER_MAX_SBA_INPUTS; ++i )

    {

        args.inConfig.ambisonicsBuses[i].audioConfig = IVAS_AUDIO_CONFIG_INVALID;
@@ -2689,9 +2669,6 @@ static CmdlnArgs defaultArgs( 


    clearString( args.headRotationFilePath );

    clearString( args.outMetadataFilePath );

#ifndef FIX_1494_SET_SPLITBFI_UNUSED

    clearString( args.splitRendBFIFilePath );

#endif

    clearString( args.referenceVectorFilePath );

    clearString( args.referenceRotationFilePath );

    clearString( args.customHrtfFilePath );
@@ -2798,12 +2775,6 @@ static void parseOption( 
            assert( numOptionValues == 1 );

            strncpy( args->outMetadataFilePath, optionValues[0], RENDERER_MAX_CLI_ARG_LENGTH - 1 );

            break;

#ifndef FIX_1494_SET_SPLITBFI_UNUSED

        case CmdLnOptionId_SplitRendBFIFile:

            assert( numOptionValues == 1 );

            strncpy( args->splitRendBFIFilePath, optionValues[0], RENDERER_MAX_CLI_ARG_LENGTH - 1 );

            break;

#endif

        case CmdLnOptionId_referenceVectorFile:

            assert( numOptionValues == 1 );

            strncpy( args->referenceVectorFilePath, optionValues[0], RENDERER_MAX_CLI_ARG_LENGTH - 1 );

lib_com/ivas_prot.h

+12 −4
Original line number Diff line number Diff line
@@ -160,7 +160,11 @@ ivas_error ivas_mct_enc( 
    const int16_t nb_bits_metadata                              /* i  : number of metadata bits                 */

);



#ifdef FIX_2344_ALIGN_PREPROC

void pre_proc_front_ivas(

#else

ivas_error pre_proc_front_ivas(

#endif

    SCE_ENC_HANDLE hSCE,                                        /* i/o: SCE encoder structure                      */

    CPE_ENC_HANDLE hCPE,                                        /* i/o: CPE encoder structure                      */

    const int32_t element_brate,                                /* i  : SCE/CPE element bitrate                    */
@@ -207,7 +211,11 @@ ivas_error pre_proc_front_ivas( 
    const int32_t ivas_total_brate                              /* i  : IVAS total bitrate                         */

);



#ifdef FIX_2344_ALIGN_PREPROC

void pre_proc_ivas(

#else

ivas_error pre_proc_ivas(

#endif

    Encoder_State *st,                                          /* i/o: encoder state structure                 */

    const int16_t last_element_mode,                            /* i  : last element mode                       */

    const int32_t element_brate,                                /* i  : element bitrate                         */
@@ -235,7 +243,11 @@ ivas_error pre_proc_ivas( 
    const int16_t flag_16k_smc                                  /* i  : flag to indicate if the OL SMC is run at 16 kHz */

);



#ifdef FIX_2344_ALIGN_PREPROC

void ivas_compute_core_buffers(

#else

ivas_error ivas_compute_core_buffers(

#endif

    Encoder_State *st,                                          /* i/o: encoder state structure                 */

    float **inp16k_out,                                         /* o  : ptr. to inp. signal in the current frame*/

    float *old_inp_16k,                                         /* i/o: buffer of old input signal @ 16kHz      */
@@ -3568,10 +3580,6 @@ void ivas_sba_dirac_stereo_dec( 
    Decoder_Struct *st_ivas,                                    /* i/o: IVAS decoder structure                  */

    float *output[CPE_CHANNELS],                                /* o  : output synthesis signal                 */

    const int16_t output_frame                                  /* i  : output frame length per channel         */

#ifndef REMOVE_UNUSED_CODE_IVAS_DEC

    ,

    const int16_t mcmasa                                        /* i  : McMASA flag                             */

#endif

);



void ivas_sba_dirac_stereo_config(

lib_com/options.h

+4 −8
Original line number Diff line number Diff line
@@ -162,20 +162,16 @@ 
/*#define FIX_I4_OL_PITCH*/                             /* fix open-loop pitch used for EVS core switching */

#define TMP_1342_WORKAROUND_DEC_FLUSH_BROKEN_IN_SR      /* FhG: Temporary workaround for incorrect implementation of decoder flush with split rendering */

#define NONBE_1122_KEEP_EVS_MODE_UNCHANGED              /* FhG: Disables fix for issue 1122 in EVS mode to keep BE tests green. This switch should be removed once the 1122 fix is added to EVS via a CR.  */

#define FIX_1486_INIT_OUTPUT_POINTERS                   /* FhG: always initialize pointers in renderer flush */

#define FIX_1449_RENDERER_FRAME_SIZE_UNCLEAR_IN_ISAR    /* Dolby: Fix for issue 1449: renderer frame size unclear in ISAR */

#define FIX_1827_REMOVE_UNUSED_PSNOISEGEN_ISAR          /* Dolby: remove unused noise generator from ISAR */

#define FIX_1495_INCORRECT_FREAD_CALL                   /* Eri: Switched size and number of elements in fread call. */

#define FIX_1494_SET_SPLITBFI_UNUSED                    /* Dolby: Fix issue 1494, remove unused function setting BFI flag in ISAR renderer */

#define FIX_1479_MSAN_SPAR_UNINITIALIZED_VALUE          /* Dolby: Fix for issue 1479, MSAN error due to uninitialized value in SPAR */

#define REMOVE_UNUSED_CODE_IVAS_DEC                     /* VA: remove unused code in ivas_jbm_dec_tc_fx() */

#define REMOVE_CAM_FROM_IVAS                            /* VA: basop issue 210: remove obsoelte CAM code from IVAS */

#define FIX_2344_ALIGN_PREPROC                          /* VA: basop issue 2344: Align pre_proc_ivas() between FLP and BASOP */

#define FIX_FLOAT_1501_UNIT_VALUE_IN_OMASA              /* Nokia: Fix float issue 1501, uninitialized value in ivas_masa_combine_directions for OMASA */

#define FIX_2331_CLANG18_MSAN_UNINIT_VARIABLE           /* FhG: Fix issue 2331: Uninitialized variable */



/* #################### End BE switches ################################## */



/* #################### Start NON-BE switches ############################ */

/* any switch which is non-be wrt. TS 26.258 V3.0 */

#define FIX_1465_SWB_TBE_RANDOM_VECTOR_CREATION         /* Dolby: issue 1465: Fix constant in create_random_vector() to allow more reliable fixed point port */







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

lib_com/prot.h

+7 −4
Original line number Diff line number Diff line
@@ -2685,6 +2685,9 @@ void GenShapedWBExcitation( 
    float *mem_genSHBexc_filt_down3, /* i/o: memory                                 */

    float *state_lpc_syn,            /* i/o: memory                                 */

    const int16_t coder_type,        /* i  : coding type                            */

#ifdef FIX_1465_SWB_TBE_RANDOM_VECTOR_CREATION

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

#endif

    const float *bwe_exc_extended, /* i  : bandwidth extended exciatation         */

    int16_t bwe_seed[],            /* i/o: random number generator seed           */

    const float voice_factors[],   /* i  : voicing factor                         */