Commit 9c786658 authored by vasilache's avatar vasilache
Browse files

fix update 1074

parent 7801cfb8

lib_dec/ivas_init_dec.c

+1 −4
Original line number Diff line number Diff line
@@ -362,11 +362,8 @@ ivas_error ivas_dec_setup( 
            }



            /* this should be non-zero if original input format was MASA_ISM_FORMAT */

#ifdef NONBE_FIX_1074_NOBJ_SIGNAL_OMASA_LBR

            st_ivas->nchan_ism = 2 * st_ivas->bit_stream[( ivas_total_brate / FRAMES_PER_SEC ) - 3] + st_ivas->bit_stream[( ivas_total_brate / FRAMES_PER_SEC ) - 2];

#else

            st_ivas->nchan_ism = st_ivas->bit_stream[( ivas_total_brate / FRAMES_PER_SEC ) - 3] + 2 * st_ivas->bit_stream[( ivas_total_brate / FRAMES_PER_SEC ) - 2];

#endif



            if ( st_ivas->nchan_ism > 0 )

            {

#ifdef NONBE_FIX_1074_NOBJ_SIGNAL_OMASA_LBR

lib_dec/ivas_masa_dec.c

+5 −0
Original line number Diff line number Diff line
@@ -152,6 +152,11 @@ ivas_error ivas_masa_decode( 
        if ( !( ivas_format == MC_FORMAT && st_ivas->mc_mode == MC_MODE_MCMASA ) )

        {

#ifdef NONBE_FIX_1074_NOBJ_SIGNAL_OMASA_LBR

            if ( ivas_format == MASA_FORMAT )

            {

                /* re-read the number of objects, needed in case of bad frame  */

                st_ivas->nchan_ism = 5 - st_ivas->bit_stream[( ivas_total_brate / FRAMES_PER_SEC ) - 3] + 2 * st_ivas->bit_stream[( ivas_total_brate / FRAMES_PER_SEC ) - 2];

            }

            if ( ivas_format == MASA_FORMAT && st_ivas->nchan_ism > 0 )

            {

                /* there was OMASA in the input */