Commit 0ff65c56 authored by Tapani Pihlajakuja's avatar Tapani Pihlajakuja
Browse files

Fix bug in port

parent 12f110d5

lib_dec/ivas_init_dec_fx.c

+18 −18
Original line number Diff line number Diff line
@@ -390,6 +390,8 @@ ivas_error ivas_dec_setup( 
            /* this should be non-zero if original input format was MASA_ISM_FORMAT */

            st_ivas->nchan_ism = add( st_ivas->bit_stream[L_sub( res_dec, 3 )], shl( st_ivas->bit_stream[L_sub( res_dec, 2 )], 1 ) );



            IF( GT_16( st_ivas->nchan_ism, 0 ) )

            {

#ifdef NONBE_FIX_1074_NOBJ_SIGNAL_OMASA_LBR

                /* the input_ivas_format should be MASA_ISM_FORMAT, but we cannot initialize it now */

                /* info about the number of objects:
@@ -409,8 +411,6 @@ ivas_error ivas_dec_setup( 
                }

                /* for MASA_ISM_FORMAT at input the number of MASA transport channels is always 2 and the corresponding bit is not used here*/

#else

            IF( GT_16( st_ivas->nchan_ism, 0 ) )

            {

                /* the input_ivas_format should be MASA_ISM_FORMAT, but we cannot initialize it now */

                test();

                IF( EQ_16( st_ivas->nchan_transport, 2 ) && EQ_16( st_ivas->nchan_ism, 3 ) )