Commit 1e7ee47f authored by vaclav's avatar vaclav
Browse files

maintenance

parent a751273d

apps/decoder.c

+2 −2
Original line number Diff line number Diff line
@@ -87,8 +87,8 @@ typedef struct 
    uint16_t count;

    uint16_t selected;

    uint16_t frameCounter;

} AcousticEnvironmentSequence;



} AcousticEnvironmentSequence;



typedef struct

{
@@ -481,6 +481,7 @@ int main( 
            fprintf( stderr, "Failed to get Distance Attenuation \n\n" );

            goto cleanup;

        }



        if ( ( arg.outputConfig == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED || arg.outputConfig == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM ) )

        {

            if ( asked_frame_size != IVAS_RENDER_FRAMESIZE_20MS &&
@@ -2476,7 +2477,6 @@ static ivas_error decodeG192( 
cleanup:



    RenderConfigReader_close( &renderConfigReader );



    split_rend_reader_writer_close( &splitRendWriter );

    AudioFileWriter_close( &afWriter );

    MasaFileWriter_close( &masaWriter );

lib_com/bitalloc_fx.c

+6 −7
Original line number Diff line number Diff line
@@ -235,8 +235,7 @@ Word16 BitAllocF_fx( 
    Word16 B,                  /* i  : number of available bits                 :Q0  */

    Word16 N,                  /* i  : number of sub-vectors                    :Q0  */

    Word16 *R,                 /* o  : bit-allocation indicator                 :Q0  */

    Word16 *Rsubband_fx /* o  : sub-band bit-allocation vector           :Q3  */

    ,

    Word16 *Rsubband_fx,       /* o  : sub-band bit-allocation vector           :Q3  */

    const Word16 hqswb_clas,   /* i  : hq swb class                             :Q0  */

    const Word16 num_env_bands /* i  : Number sub bands to be encoded for HF GNERIC :Q0  */

)

lib_com/cng_exc_fx.c

+17 −18
Original line number Diff line number Diff line
@@ -1060,8 +1060,7 @@ void cng_params_upd_ivas_fx( 
    Word16 cng_exc2_buf[],          /* i/o: Excitation buffer                                  Q_exc */

    Word16 cng_Qexc_buf[],          /* i/o: Q_exc buffer                                       Q0    */

    Word32 cng_brate_buf[],         /* i/o: last_active_brate buffer                           Q0    */

    const Word32 last_active_brate /* i  : Last active bit rate                               Q0    */

    ,

    const Word32 last_active_brate, /* i  : Last active bit rate                               Q0    */

    const Word16 element_mode,      /* i  : Element mode                        */

    const Word16 bwidth             /* i  : Audio bandwidth                     */

)

lib_com/common_api_types.h

+20 −20
Original line number Diff line number Diff line
@@ -222,7 +222,7 @@ typedef struct _IVAS_JBM_TRACE_DATA 
 *----------------------------------------------------------------------------------*/



#define ISAR_MAX_SPLIT_REND_BITRATE                   768000

#define ISAR_MAX_SPLIT_REND_BITS_BUFFER_SIZE_IN_BYTES ( ( ( (int32_t) ISAR_MAX_SPLIT_REND_BITRATE / IVAS_NUM_FRAMES_PER_SEC ) + 7 ) >> 3 )

#define ISAR_MAX_SPLIT_REND_BITS_BUFFER_SIZE_IN_BYTES ( ( ( (Word32) ISAR_MAX_SPLIT_REND_BITRATE / IVAS_NUM_FRAMES_PER_SEC ) + 7 ) >> 3 )

#define ISAR_SPLIT_REND_ADDITIONAL_BYTES_TO_READ      1

#define SPLIT_REND_BITS_BUFF_SIZE                     ( ISAR_MAX_SPLIT_REND_BITS_BUFFER_SIZE_IN_BYTES + ISAR_SPLIT_REND_ADDITIONAL_BYTES_TO_READ )
@@ -266,36 +266,36 @@ typedef enum 


typedef struct _ISAR_SPLIT_REND_BITS_DATA

{

    uint8_t *bits_buf;

    int32_t buf_len; /*size of bits_buf in bytes. This field should be set by allocator of bits_buf*/

    int32_t bits_written;

    int32_t bits_read;

    int16_t codec_frame_size_ms;

    UWord8 *bits_buf;

    Word32 buf_len; /*size of bits_buf in bytes. This field should be set by allocator of bits_buf*/

    Word32 bits_written;

    Word32 bits_read;

    Word16 codec_frame_size_ms;

    ISAR_SPLIT_REND_CODEC codec;

    ISAR_SPLIT_REND_POSE_CORRECTION_MODE pose_correction;

    int16_t isar_frame_size_ms;

    int16_t lc3plus_highres;

    Word16 isar_frame_size_ms;

    Word16 lc3plus_highres;



} ISAR_SPLIT_REND_BITS_DATA, *ISAR_SPLIT_REND_BITS_HANDLE;



typedef struct _ISAR_SPLIT_REND_CONFIG

{

    int32_t splitRendBitRate;    /*Bit rate for split rendering mode, if "pcm_out" is set then "splitRendBitRate" is used as a limit for MD bitrate */

    int16_t hq_mode;             /*High quality 3DOF mode with additional side information. Requires more pre-renditions. */

    int16_t dof;                 /*flag to specify if pose correction is needed for 1, 2 or 3 degree of freedoms*/

    Word32 splitRendBitRate;    /*Bit rate for split rendering mode, if "pcm_out" is set then "splitRendBitRate" is used as a limit for MD bitrate */

    Word16 hq_mode;             /*High quality 3DOF mode with additional side information. Requires more pre-renditions. */

    Word16 dof;                 /*flag to specify if pose correction is needed for 1, 2 or 3 degree of freedoms*/

                                /*The axis can be set dynamically per frame based on a file input */

                                /*possible values:

                                 1 - (1dof correction. By default YAW correction)

                                 2 - (2dof correction. By default YAW and PITCH correction)

                                 3 - (3dof correction. By default YAW, PITCH and ROLL correction)

                                 */

    int16_t codec_delay_ms;      /* look ahead delay of the codec that is used to code BIN signal output of pre-renderer*/

    int16_t isar_frame_size_ms;  /* ISAR bit stream frame size in milliseconds */

    int16_t codec_frame_size_ms; /* Codec frame size in milliseconds, only relevant with LC3plus */

    Word16 codec_delay_ms;      /* look ahead delay of the codec that is used to code BIN signal output of pre-renderer*/

    Word16 isar_frame_size_ms;  /* ISAR bit stream frame size in milliseconds */

    Word16 codec_frame_size_ms; /* Codec frame size in milliseconds, only relevant with LC3plus */

    ISAR_SPLIT_REND_POSE_CORRECTION_MODE poseCorrectionMode;

    ISAR_SPLIT_REND_CODEC codec;

    ISAR_SPLIT_REND_RENDERER_SELECTION rendererSelection;

    int16_t lc3plus_highres;

    Word16 lc3plus_highres;



} ISAR_SPLIT_REND_CONFIG_DATA, *ISAR_SPLIT_REND_CONFIG_HANDLE;
@@ -348,9 +348,9 @@ typedef struct _IVAS_RENDER_CONFIG 


typedef struct

{

    int16_t numSamplesPerChannel;

    int16_t numChannels;

    int16_t is_cldfb;

    Word16 numSamplesPerChannel;

    Word16 numChannels;

    Word16 is_cldfb;



} IVAS_REND_AudioBufferConfig;

lib_com/disclaimer.c

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ 


#define WMC_TOOL_SKIP



int16_t print_disclaimer( FILE *fPtr )

Word16 print_disclaimer( FILE *fPtr )

{



    fprintf( fPtr, "\n==================================================================================================\n" );