Commit 352dc683 authored by Mohammadreza Naghibzadeh's avatar Mohammadreza Naghibzadeh
Browse files

Merge remote-tracking branch 'origin/main' into 1793-fix-decoder-mc-to-mono-output-scaling

parents a8ae56a3 0cedd1ad

Workspace_msvc/lib_util.vcxproj

+2 −0
Original line number Diff line number Diff line
@@ -120,6 +120,7 @@ 
    <ClCompile Include="..\lib_util\masa_file_reader.c" />

    <ClCompile Include="..\lib_util\masa_file_writer.c" />

    <ClCompile Include="..\lib_util\mime_io.c" />

    <ClCompile Include="..\lib_util\obj_edit_file_reader.c" />

    <ClCompile Include="..\lib_util\render_config_reader.c" />

    <ClCompile Include="..\lib_util\rotation_file_reader.c" />

    <ClCompile Include="..\lib_util\rtpdump.c" />
@@ -144,6 +145,7 @@ 
    <ClInclude Include="..\lib_util\jbm_file_writer.h" />

    <ClInclude Include="..\lib_util\ls_custom_file_reader.h" />

    <ClInclude Include="..\lib_util\mime_io.h" />

    <ClInclude Include="..\lib_util\obj_edit_file_reader.h" />

    <ClInclude Include="..\lib_util\masa_file_reader.h" />

    <ClInclude Include="..\lib_util\masa_file_writer.h" />

    <ClInclude Include="..\lib_util\render_config_reader.h" />

apps/decoder.c

+226 −116

File changed.

Preview size limit exceeded, changes collapsed.

apps/encoder.c

+21 −25
Original line number Diff line number Diff line
@@ -163,7 +163,6 @@ typedef struct 
 * Local functions prototypes

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



static void initArgStruct( EncArguments *arg );

static bool parseCmdlIVAS_enc( int16_t argc, char *argv[], EncArguments *arg );

static void usage_enc( void );

static bool readBandwidth( FILE *file, IVAS_ENC_BANDWIDTH *bandwidth, int32_t *bandwidthFrameCounter );
@@ -208,8 +207,6 @@ int main( 
    reset_mem( USE_BYTES );

#endif



    initArgStruct( &arg );



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

     * Parse command-line arguments

     *------------------------------------------------------------------------------------------*/
@@ -853,11 +850,26 @@ cleanup: 
 * Local functions

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



#define IVAS_DEFAULT_AGC ( 0 )

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

 * parseCmdlIVAS_enc()

 *

 * Encoder command-line parsing

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



static void initArgStruct( EncArguments *arg )

static bool parseCmdlIVAS_enc(

    int16_t argc,

    char *argv[],

    EncArguments *arg )

{

    /* Set default values here */

    int16_t i, j;

    char argv_to_upper[FILENAME_MAX];

    char stmp[FILENAME_MAX];

    int32_t tmp;



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

     * Set default values

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



    arg->inputWavFilename = NULL;

    arg->outputBitstreamFilename = NULL;

    arg->inputFs = 0;
@@ -887,25 +899,9 @@ static void initArgStruct( EncArguments *arg ) 
#endif

    arg->pca = false;



    return;

}





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

 * parseCmdlIVAS_enc()

 *

 * Encoder command-line parsing

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



static bool parseCmdlIVAS_enc(

    int16_t argc,

    char *argv[],

    EncArguments *arg )

{

    int16_t i, j;

    char argv_to_upper[FILENAME_MAX];

    char stmp[FILENAME_MAX];

    int32_t tmp;

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

     * Initialization

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



    if ( argc < 5 )

    {

apps/isar_post_rend.c

+1 −1
Original line number Diff line number Diff line
@@ -952,7 +952,7 @@ int main( 


    memset( outBuffer.data_fx, 0, outBuffer.config.numSamplesPerChannel * outBuffer.config.numChannels * sizeof( Word32 ) );



    bitsBufferSize = SPLIT_REND_BITS_BUFF_SIZE;

    bitsBufferSize = ISAR_SPLIT_REND_BITS_BUFF_SIZE;



    if ( bitsBufferSize > 0 )

    {

apps/renderer.c

+3 −3
Original line number Diff line number Diff line
@@ -174,7 +174,7 @@ typedef struct 
    char externalOrientationFilePath[RENDERER_MAX_CLI_ARG_LENGTH];

    char customHrtfFilePath[RENDERER_MAX_CLI_ARG_LENGTH];

    char renderConfigFilePath[RENDERER_MAX_CLI_ARG_LENGTH];

    int8_t orientation_tracking;

    IVAS_HEAD_ORIENT_TRK_T orientation_tracking;

    int16_t Opt_Headrotation;

    int16_t Opt_ExternalOrientation;

    int16_t nonDiegeticPan;
@@ -1601,7 +1601,7 @@ int main( 


    if ( is_split_pre_rend_mode( &args ) )

    {

        bitsBufferSize = SPLIT_REND_BITS_BUFF_SIZE;

        bitsBufferSize = ISAR_SPLIT_REND_BITS_BUFF_SIZE;

    }

    else

    {
@@ -2431,7 +2431,7 @@ static bool parseRenderFramesize( 


static bool parseOrientationTracking(

    char *value,

    int8_t *orientation_tracking )

    IVAS_HEAD_ORIENT_TRK_T *orientation_tracking )

{

    to_upper( value );