Commit fd8e5a7b authored by advasila's avatar advasila
Browse files

fix merge conflicts

parents 960c489a 55d707f4

apps/decoder.c

+7 −7
Original line number Diff line number Diff line
@@ -650,7 +650,7 @@ static bool parseCmdlIVAS_dec( 
    int16_t i;

    char argv_to_upper[FILENAME_MAX];

#ifdef MASAISM_EDIT_OBJECTS

    int32_t tmp;

    int32_t tmp1;

#endif

#ifdef DEBUGGING

    float ftmp;
@@ -940,21 +940,21 @@ static bool parseCmdlIVAS_dec( 
                return false;

            }



            if ( sscanf( argv[i], "%d", &tmp ) > 0 )

            if ( sscanf( argv[i], "%d", &tmp1 ) > 0 )

            {

                arg->index_of_edited_ism = tmp;

                arg->index_of_edited_ism = (int16_t) tmp1;

                i++;

            }



            if ( sscanf( argv[i], "%d", &tmp ) > 0 )

            if ( sscanf( argv[i], "%d", &tmp1 ) > 0 )

            {

                arg->azimuth_edited_ism = tmp;

                arg->azimuth_edited_ism = (int16_t) tmp1;

                i++;

            }



            if ( sscanf( argv[i], "%d", &tmp ) > 0 )

            if ( sscanf( argv[i], "%d", &tmp1 ) > 0 )

            {

                arg->elevation_edited_ism = tmp;

                arg->elevation_edited_ism = (int16_t) tmp1;

                i++;

            }

        }

lib_com/ivas_cnst.h

+1 −0
Original line number Diff line number Diff line
@@ -1112,6 +1112,7 @@ enum 
#define NO_BITS_MASA_ISM_NO_OBJ                 2

#define MASA2TOTAL_THR                          0.98f

#define BITS_MASA2TOTTAL_DCT0                   6

#define STEP_M2T                                0.1f

#endif

#define MASA_HEADER_BITS                        2

#define MASA_SUBFRAME_BITS                      1

lib_com/ivas_ism_config.c

+22 −6
Original line number Diff line number Diff line
@@ -532,11 +532,11 @@ ISM_MODE ivas_omasa_ism_mode_select( 
    switch ( no_obj )

    {

        case 1:

            if ( ivas_total_brate >= IVAS_64k )

            if ( ivas_total_brate >= IVAS_24k4 )

            {

                ism_mode = ISM_MASA_MODE_DISC;

            }

            else if ( ivas_total_brate >= IVAS_48k )

            else if ( ivas_total_brate >= IVAS_24k4 )

            {

                ism_mode = ISM_MASA_MODE_PARAM;

            }
@@ -546,7 +546,25 @@ ISM_MODE ivas_omasa_ism_mode_select( 
            }

            break;

        case 2:

            if ( ivas_total_brate >= IVAS_80k )

            if ( ivas_total_brate >= IVAS_64k )

            {

                ism_mode = ISM_MASA_MODE_DISC;

            }

            else if ( ivas_total_brate >= IVAS_32k )

            {

                ism_mode = ISM_MASA_MODE_ONE_OBJ;

            }

            /* else if ( ivas_total_brate >= IVAS_32k )

            {

                ism_mode = ISM_MASA_MODE_PARAM;

            } */

            else

            {

                ism_mode = ISM_MODE_NONE;

            }

            break;

        case 3:

            if ( ivas_total_brate >= IVAS_128k )

            {

                ism_mode = ISM_MASA_MODE_DISC;

            }
@@ -563,14 +581,12 @@ ISM_MODE ivas_omasa_ism_mode_select( 
                ism_mode = ISM_MODE_NONE;

            }

            break;

        case 3:



        case 4:

            if ( ivas_total_brate >= IVAS_160k )

            {

                ism_mode = ISM_MASA_MODE_DISC;

            }

            else if ( ivas_total_brate >= IVAS_80k )

            else if ( ivas_total_brate >= IVAS_64k )

            {

                ism_mode = ISM_MASA_MODE_ONE_OBJ;

            }

lib_com/ivas_prot.h

+8 −3
Original line number Diff line number Diff line
@@ -4487,7 +4487,8 @@ void ivas_masa_encode( 
    ISM_MODE ism_mode,                                          /* i  : ISM format mode                                 */

    int16_t nchan_ism,                                          /* i  : number of ism channels                          */

    ISM_METADATA_HANDLE hIsmMetaData[MAX_NUM_OBJECTS],          /* i  : ISM metadata handle                             */

    int16_t idx_separated_object                                /* i  : index of the separated object                   */

    int16_t idx_separated_object,                               /* i  : index of the separated object                   */

    OMASA_ENC_HANDLE hOMasa                                     /* i  : OMASA encoder handle */

#endif

);
@@ -5180,14 +5181,18 @@ void ivas_masa_ism_set_edited_objects( 


void encode_masa_to_total(

    IVAS_QMETADATA_HANDLE hQMetaData,

    BSTR_ENC_HANDLE hMetaData

    BSTR_ENC_HANDLE hMetaData,

    int16_t low_bitrate_mode,

    int16_t nbands,

    int16_t nblocks

);



void decode_masa_to_total(

    uint16_t* bit_stream,

    int16_t* index,

    float masa_to_total_energy_ratio[MAX_PARAM_SPATIAL_SUBFRAMES][MASA_FREQUENCY_BANDS],

    int16_t nbands

    int16_t nbands,

    int16_t nblocks

);



void modify_masa_energy_ratios(

lib_com/ivas_rom_com.c

+5 −5
Original line number Diff line number Diff line
@@ -2784,13 +2784,13 @@ const float McMASA_LFEGain_vectors[64] = 
int32_t sep_object_brate[][MAX_NUM_OBJECTS] ={

    {0, 0, 0, 0},                                   /* 13k2 */

    {0, 0, 0, 0},                                   /* 16k4 */

    {0, 0, 0, 0},                                   /* 24k4 */

    {0, 0, 0, 0},                                   /* 32k  */

    {0, 0, 0, 0},                                   /* 48k  */

    {16000,     0, 0, 0},                           /* 64k  */

    {9600, 0, 0, 0},                                   /* 24k4 */

    {9600, 0, 0, 0},                                   /* 32k  */

    {IVAS_13k2, 0, 0, 0},                                   /* 48k  */

    {16000,     IVAS_13k2, 0, 0},                           /* 64k  */

    {20000,     16000, 0, 0},                       /* 80k  */

    {IVAS_32k, 20000, 0, 0},                        /* 96k  */

    {IVAS_32k, IVAS_24k4, 0, 0},                    /* 128k */

    {IVAS_32k, IVAS_24k4, 20000, 0},                    /* 128k */

    {IVAS_48k, IVAS_32k, IVAS_24k4, 20000},         /* 160k */

    {IVAS_64k, IVAS_48k, IVAS_32k, IVAS_24k4},     /* 192k */

    {IVAS_96k,  IVAS_64k, IVAS_48k, IVAS_32k},     /* 256k */