Commit b66269b0 authored by Jouni Paulus's avatar Jouni Paulus
Browse files

Merge remote-tracking branch... 

Merge remote-tracking branch 'origin/nokia/contribution-omasa-combined-format-refactor-merge' into 644-add-omasa-self-test-cases
parents 43b01fc4 14edcd27

lib_com/ivas_masa_com.c

+3 −5
Original line number Diff line number Diff line
@@ -259,12 +259,10 @@ void ivas_masa_set_coding_config( 
            if ( ivas_total_brate < IVAS_48k && nchan_transport == 2 && i > 3 )

            {

                /* because it uses the bitallocation for the lower bit rates from 'masa_bits_LR_stereo' and it has 4 elements */

                idx_bands = 3;

                i = 3;

            }

            else

            {

            idx_bands = i;

            }

          



            if ( config->numberOfDirections > 1 )

            {

lib_rend/ivas_dirac_dec_binaural_functions.c

+5 −0
Original line number Diff line number Diff line
@@ -1766,6 +1766,11 @@ static void ivas_dirac_dec_binaural_process_output( 
                    }

#ifdef MASA_AND_OBJECTS

                }

                else

                {

                    decSlotRePointer = NULL;  /* below these pointers are used only for chB < 2 */

                    decSlotImPointer = NULL;

                }

#endif