Commit 3d05b2eb authored by Tapani Pihlajakuja's avatar Tapani Pihlajakuja
Browse files

Merge remote-tracking branch 'origin/main' into nokia/contribution-42-masa-prerend

parents bcd04c07 8f6adfe1

Workspace_msvc/lib_util.vcxproj

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

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

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

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

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

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

  </ItemGroup>
@@ -181,6 +182,7 @@ 
    <ClInclude Include="..\lib_util\masa_file_reader.h" />

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

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

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

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

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

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

apps/decoder.c

+223 −10

File changed.

Preview size limit exceeded, changes collapsed.

apps/renderer.c

+98 −2

File changed.

Preview size limit exceeded, changes collapsed.

lib_com/bitstream.c

+20 −15
Original line number Diff line number Diff line
@@ -229,7 +229,7 @@ Word16 rate2EVSmode( 


ivas_error ind_list_realloc(

    BSTR_ENC_HANDLE hBstr,        /* i/o: encoder bitstream handle                          */

    int16_t max_num_indices /* i  : new maximum number of allowed indices in the list */

    const int16_t max_num_indices /* i  : new maximum number of allowed indices in the list */

)

{

    int16_t i, ind_list_pos;
@@ -281,7 +281,8 @@ ivas_error ind_list_realloc( 
 * Get the maximum allowed number of indices in the encoder

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



int16_t get_ivas_max_num_indices(                                /* o  : maximum number of indices */

/*! r: maximum number of indices */

int16_t get_ivas_max_num_indices(

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

    const int32_t ivas_total_brate /* i  : IVAS total bitrate        */

)
@@ -519,7 +520,8 @@ int16_t get_ivas_max_num_indices( /* o : maximum 
 * Get the maximum allowed number of indices in the core coder

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



int16_t get_core_max_num_indices(                           /* o  : maximum number of indices */

/*! r: maximum number of indices */

int16_t get_core_max_num_indices(

    const int16_t core,       /* i  : core                      */

    const int32_t total_brate /* i  : total bitrate             */

)
@@ -694,7 +696,8 @@ int16_t get_core_max_num_indices( /* o : maximum numb 
 * Get the maximum number of indices in the BWE

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



int16_t get_BWE_max_num_indices(                          /* o  : maximum number of indices */

/*! r: maximum number of indices */

int16_t get_BWE_max_num_indices(

    const int32_t extl_brate /* i  : extensiona layer bitrate  */

)

{
@@ -716,7 +719,8 @@ int16_t get_BWE_max_num_indices( /* o : maximum number 
 * Set the maximum allowed number of metadata indices in the list

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



int16_t get_ivas_max_num_indices_metadata(                                /* o  : maximum number of indices */

/*! r: maximum number of indices */

int16_t get_ivas_max_num_indices_metadata(

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

    const int32_t ivas_total_brate /* i  : IVAS total bitrate       */

)
@@ -1377,7 +1381,7 @@ void push_next_bits( 
/*! r: result: index of the indice in the list, -1 if not found */

int16_t find_indice(

    BSTR_ENC_HANDLE hBstr, /* i  : encoder bitstream handle                    */

    int16_t id,            /* i  : ID of the indice                            */

    const int16_t id,      /* i  : ID of the indice                            */

    uint16_t *value,       /* o  : value of the quantized indice               */

    int16_t *nb_bits       /* o  : number of bits used to quantize the indice  */

)
@@ -1397,6 +1401,7 @@ int16_t find_indice( 
    return -1;

}





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

 * delete_indice()

 *
@@ -1406,7 +1411,7 @@ int16_t find_indice( 
/*! r: number of deleted indices */

uint16_t delete_indice(

    BSTR_ENC_HANDLE hBstr, /* i  : encoder bitstream handle                    */

    int16_t id             /* i  : ID of the indice                            */

    const int16_t id       /* i  : ID of the indice                            */

)

{

    int16_t i, j;

lib_com/ivas_cnst.h

+3 −4
Original line number Diff line number Diff line
@@ -983,8 +983,7 @@ typedef enum 
typedef enum

{

    DIRAC_OPEN,                                 /* initialize to default value              */

    DIRAC_RECONFIGURE                           /* HOA3                                     */

    ,

    DIRAC_RECONFIGURE,                          /* HOA3                                     */

    DIRAC_RECONFIGURE_MODE

} DIRAC_CONFIG_FLAG;
@@ -1005,13 +1004,13 @@ typedef enum 


#define IVAS_SPAR_HOA3_NP_CHS                   8                           /* number of higher order non-planar channels */



#define SPAR_NUM_CODING_STRAT_BITS              ( 3 )

#define SPAR_NUM_CODING_STRAT_BITS              3



/* AGC constants */

#define AGC_BITS_PER_CH                         3

#define AGC_EMAX                                0

#define AGC_SIGNALLING_BITS                     1

#define IVAS_SPAR_ARITH_OVERSHOOT_BITS               (16)

#define IVAS_SPAR_ARITH_OVERSHOOT_BITS          16



/* Common SPAR metadata constants */

#define IVAS_ACTIVEW_DM_F_SCALE                 0.5f