Commit 92e222d2 authored by vaclav's avatar vaclav
Browse files

Merge remote-tracking branch... 

Merge remote-tracking branch 'remotes/origin/Nokia/contribution-omasa-combined-format' into VoiceAge/contribution-omasa-combined-format_updt
parents a8f5f413 aabaaa86

lib_com/ivas_omasa_com.c

+1 −5
Original line number Diff line number Diff line
@@ -102,11 +102,7 @@ ISM_MODE ivas_omasa_ism_mode_select( 
            }

            break;

        case 2:

#ifdef TUNING_48kbps_2obj

            if ( ivas_total_brate >= IVAS_48k )

#else

            if ( ivas_total_brate >= IVAS_64k )

#endif

            {

                ism_mode = ISM_MASA_MODE_DISC;

            }
@@ -459,7 +455,7 @@ void calculate_nbits_meta( 
                priority[obj] = max_p;

            }

        }

        bits_ism[obj] = bits_direction_masa[0] - (int16_t) ( ( 1 - priority[obj] ) * 7 );

        bits_ism[obj] = bits_direction_masa[0] - (int16_t) ( ( 1 - ( (int16_t) ( priority[obj] * 1000.0f ) ) * 0.001f ) * 7 );

    }



    return;

lib_com/ivas_rom_com.c

+0 −4
Original line number Diff line number Diff line
@@ -2794,11 +2794,7 @@ const int32_t sep_object_brate[][MAX_NUM_OBJECTS] = 
#else

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

#endif

#ifdef TUNING_48kbps_2obj

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

#else

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

#endif

#ifdef OMASA_BRATE

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

#else

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -173,7 +173,6 @@ 
#define MASAISM_EDIT_OBJECTS                            /* Nokia: Temporary command line editing of object directions in the decoder */





#define TUNING_48kbps_2obj



#define TUNING_DISC_3_4obj                              /* Nokia: increase bitrate for objects in DISC mode at 128k 4obj and 96k 3 obj */

#define REDUCE_OMASA_META_BITS                          /* Nokia: reduce metadata number of bits and fix directional metadata bit allocation */

lib_enc/ivas_omasa_enc.c

+3 −3
Original line number Diff line number Diff line
@@ -477,7 +477,7 @@ void ivas_omasa_enc( 


            ivas_masa_combine_directions( hMasa );



            hMasa->config.numCodingBands = n_bands_orig;

            hMasa->config.numCodingBands = (int8_t)n_bands_orig;

        }



        /* force computation into high resolution */