Commit 98c2f57d authored by vasilache's avatar vasilache
Browse files

correct reserved bits read in 1074fix

parent 67efc51d

lib_dec/ivas_init_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -373,7 +373,7 @@ ivas_error ivas_dec_setup( 
                          '01' - MASA_ISM_FORMAT at the encoder, with 4 objects

                          '10' - MASA_ISM_FORMAT at the encoder, with 3 objects

                          '11' - MASA_ISM_FORMAT at the encoder, with 1 or 2 objects

                          reading if 3 or 4 object is performed later

                          reading if 1 or 2 objects is performed later

                */

                st_ivas->nchan_ism = 5 - st_ivas->nchan_ism;

                if ( st_ivas->nchan_transport == 1 && st_ivas->nchan_ism == 2 )

lib_dec/ivas_masa_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -157,7 +157,7 @@ ivas_error ivas_masa_decode( 
                /* 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 )

            if ( ivas_format == MASA_FORMAT && st_ivas->nchan_ism != 5 )

            {

                /* there was OMASA in the input */

                hMasa->config.input_ivas_format = MASA_ISM_FORMAT;