Commit 2afa650b authored by vaclav's avatar vaclav
Browse files

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

- Merge remote-tracking branch 'remotes/origin/main' into 1372-osba-object-editing-uses-wrong-number-of-channels
parents fe4355d9 974ffbd7

apps/renderer.c

+12 −4
Original line number Diff line number Diff line
@@ -564,12 +564,19 @@ static void setupWithSingleFormatInput( 
        positionProvider->numObjects = args.inConfig.numAudioObjects;

        for ( int16_t i = 0; i < positionProvider->numObjects; ++i )

        {

            /* It is allowed on CLI to have no metadata for an ISM input - skip opening if string is empty or contains "NULL" */

            /* Check if path to metadata file was given */

            if ( isEmptyString( args.inMetadataFilePaths[i] ) )

            {

                fprintf( stderr, "No metadata file was given for ISM input %d\n", i );

                exit( -1 );

            }



            /* It is allowed on CLI to have no metadata for an ISM input - skip opening if string contains "NULL" */

            char charBuf[FILENAME_MAX];

            strncpy( charBuf, args.inMetadataFilePaths[i], min( FILENAME_MAX, RENDERER_MAX_CLI_ARG_LENGTH ) - 1 );

            charBuf[min( FILENAME_MAX, RENDERER_MAX_CLI_ARG_LENGTH ) - 1] = '\0';

            to_upper( charBuf );

            if ( isEmptyString( args.inMetadataFilePaths[i] ) || strncmp( charBuf, "NULL", 4 ) == 0 )

            if ( strncmp( charBuf, "NULL", 4 ) == 0 )

            {

                continue;

            }
@@ -2577,6 +2584,7 @@ static CmdlnArgs defaultArgs( 
    const char *executableName )

{

    CmdlnArgs args;

    int16_t i;



    strncpy( args.executableName, executableName, RENDERER_MAX_CLI_ARG_LENGTH );

    clearString( args.inputFilePath );
@@ -2595,7 +2603,7 @@ static CmdlnArgs defaultArgs( 
    args.outConfig.outSetupCustom.num_lfe = 0;

    args.inConfig.ambisonicsBuses->audioConfig = IVAS_AUDIO_CONFIG_INVALID;



    for ( int32_t i = 0; i < RENDERER_MAX_ISM_INPUTS; ++i )

    for ( i = 0; i < RENDERER_MAX_ISM_INPUTS + RENDERER_MAX_MASA_INPUTS; ++i )

    {

        clearString( args.inMetadataFilePaths[i] );

    }
@@ -2632,7 +2640,7 @@ static CmdlnArgs defaultArgs( 
    args.render_framesize = IVAS_RENDER_FRAMESIZE_20MS;

    args.syncMdDelay = 0;



    for ( int32_t i = 0; i < RENDERER_MAX_ISM_INPUTS; ++i )

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

    {

        args.directivityPatternId[i] = 65535;

    }

lib_com/ivas_error.h

+7 −0
Original line number Diff line number Diff line
@@ -134,6 +134,9 @@ typedef enum 
    IVAS_ERR_BITSTREAM_READER_INVALID_FORMAT,

    IVAS_ERR_NO_FILE_OPEN,

    IVAS_ERR_SAMPLING_RATE_UNKNOWN,

#ifdef FIX_1370_EXTERNAL_ORIENTATION_CHECK

    IVAS_ERR_EXTERNAL_ORIENTATION_INVALID_FORMAT,

#endif



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

     *    renderer (lib_rend only)            *
@@ -271,6 +274,10 @@ static inline const char *ivas_error_to_string( ivas_error error_code ) 
            return "Invalid input format";

        case IVAS_ERR_INVALID_INDEX:

            return "Invalid index";

#ifdef FIX_1370_EXTERNAL_ORIENTATION_CHECK

        case IVAS_ERR_EXTERNAL_ORIENTATION_INVALID_FORMAT:

            return "Euler angles were detected in the input but only Quaternions are supported";

#endif

        default:

            break;

    }

lib_com/ivas_prot.h

+10 −0
Original line number Diff line number Diff line
@@ -308,8 +308,14 @@ ivas_error ivas_init_decoder( 


ivas_error ivas_output_buff_dec(

    float *p_output_f[],                                        /* i/o: output audio buffers                    */

#ifdef FIX_1330_JBM_MEMORY

    const int16_t nchan_out_buff,                               /* i  : number of output channels               */

    const int16_t Opt_tsm,                                      /* i  : TSM option flag                         */

    DECODER_TC_BUFFER_HANDLE hTcBuffer                          /* i  : TSM buffer handle                       */

#else

    const int16_t nchan_out_buff_old,                           /* i  : previous frame number of output channels*/

    const int16_t nchan_out_buff                                /* i  : number of output channels               */

#endif

);



ivas_error stereo_dmx_evs_init_encoder(
@@ -5823,8 +5829,12 @@ void ivas_omasa_separate_object_render_jbm( 
    const uint16_t nSamplesRendered,                            /* i  : number of samples rendered              */

    float input_f[][L_FRAME48k],                                /* i  : separated object signal                 */

    float *output_f[],                                          /* o  : rendered time signal                    */

#ifdef FIX_1330_JBM_MEMORY

    const int16_t subframes_rendered                            /* i  : number of subframes rendered            */

#else

    const int16_t subframes_rendered,                           /* i  : number of subframes rendered            */

    const int16_t slots_rendered                                /* i  : number of CLDFB slots rendered          */

#endif

);



void ivas_omasa_encode_masa_to_total(

lib_com/ivas_tools.c

+12 −0
Original line number Diff line number Diff line
@@ -198,12 +198,24 @@ void ivas_buffer_deinterleaved_to_interleaved( 
)

{

    int16_t ch, m;

#ifdef FIX_1330_JBM_MEMORY

    float buffer[MAX_OUTPUT_CHANNELS + MAX_NUM_OBJECTS][L_FRAME48k]; /* temp buffer needed when "*audio[]" and "*audio_out[]" are the same */



    for ( ch = 0; ch < n_channels; ch++ )

    {

        mvr2r( audio[ch], buffer[ch], frame_length );

    }

#endif



    for ( ch = 0; ch < n_channels; ch++ )

    {

        for ( m = 0; m < frame_length; m++ )

        {

#ifdef FIX_1330_JBM_MEMORY

            audio_out[m * n_channels + ch] = buffer[ch][m];

#else

            audio_out[m * n_channels + ch] = audio[ch][m];

#endif

        }

    }

lib_com/options.h

+5 −4
Original line number Diff line number Diff line
@@ -163,8 +163,9 @@ 


/*#define FIX_I4_OL_PITCH*/                             /* fix open-loop pitch used for EVS core switching */

#define TMP_FIX_1119_SPLIT_RENDERING_VOIP               /* FhG: Add error check for unsupported config: split rendering with VoIP mode */

#define FIX_1348_OVERFLOW                               /* FhG: fix BASOP overflow in hq_lr_dec(), brings floating-point code inline with FX */

#define FIX_1369_HQ_LR_OVERFLOW                         /* FhG: fix BASOP overflow in hq_lr_enc(), brings floating-point code inline with FX */

#define FIX_1330_JBM_MEMORY                             /* VA: issue 1330: memory savings in the JBM decoder */

#define FIX_1370_EXTERNAL_ORIENTATION_CHECK             /* Nokia: add sanity check for Euler angles for external orientations */

#define FIX_1371_EARLY_PART_INIT_FASTCONV               /* Nokia: fix uninitialized variable in FASTCONV path of binaural reverb init */

#define FIX_1372_OSBA_OBJECT_EDITING                    /* VA: issue 1372: Fix OSBA object-editing in BINAURAL_ROOM_IR */



/* #################### End BE switches ################################## */
@@ -176,8 +177,8 @@ 


#define NONBE_1244_FIX_SWB_BWE_MEMORY                   /* VA: issue 1244: fix to SWB BWE memory in case of switching from FB coding - pending a review by Huawei */ 

#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	NONBE_SVD_OPTIMIZATION



#define NONBE_1328_FIX_NON_LINEARITY                    /* VA: Fix possible issue when computing bwe_exc_extended and previous frame were almost 0  */

#define NONBE_1321_JBM_ASSERT_BITRATE_SWITCHING         /* FhG: Fix assert being hit in JBM code during rate switching */

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



/* ################## End DEVELOPMENT switches ######################### */