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

Code review fixes

parent 17c33853

lib_dec/ivas_masa_dec_fx.c

+2 −10
Original line number Diff line number Diff line
@@ -186,7 +186,7 @@ ivas_error ivas_masa_decode_fx( 
        {

#ifdef NONBE_FIX_1074_NOBJ_SIGNAL_OMASA_LBR

            Word16 bits_per_frame = extract_l( Mpy_32_32( ivas_total_brate, ONE_BY_FRAMES_PER_SEC_Q31 ) );

            if ( EQ_32( ivas_format, MASA_FORMAT ) )

            IF( EQ_32( ivas_format, MASA_FORMAT ) )

            {

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

                st_ivas->nchan_ism = sub( 5, add( st_ivas->bit_stream[bits_per_frame - 3], i_mult( 2, st_ivas->bit_stream[bits_per_frame - 2] ) ) );
@@ -200,15 +200,13 @@ ivas_error ivas_masa_decode_fx( 
                IF( LT_16( st_ivas->nchan_ism, 3 ) )

                {

                    /* was read in ivas_init_dec() to distinguish between 1 and 2 objects */

                    if ( EQ_16( st_ivas->bit_stream[bits_per_frame - 1], 0 ) )

                    IF( EQ_16( st_ivas->bit_stream[bits_per_frame - 1], 0 ) )

                    {

                        st_ivas->nchan_ism = 1;

                        move16();

                    }

                    st->next_bit_pos = sub( st->next_bit_pos, MASA_TRANSP_BITS );

                    *nb_bits_read = add( *nb_bits_read, MASA_TRANSP_BITS );

                    move16();

                    move16();



                    /* the two reserved bits were already read in ivas_init_dec()*/

                    byteBuffer = st->bit_stream[( st->next_bit_pos )--];
@@ -216,14 +214,11 @@ ivas_error ivas_masa_decode_fx( 
                    move16();

                    move16();

                    *nb_bits_read = add( *nb_bits_read, MASA_HEADER_BITS );

                    move16();

                    /* read number of directions */

                    byteBuffer = st->bit_stream[( st->next_bit_pos )--];

                    move16();

                    *nb_bits_read = add( *nb_bits_read, 1 );

                    move16();

                    hMasa->config.numberOfDirections = (UWord8) L_add( byteBuffer, 1 );

                    move16();

                }

                ELSE

                {
@@ -232,9 +227,7 @@ ivas_error ivas_masa_decode_fx( 
                    byteBuffer = st->bit_stream[( st->next_bit_pos )--];

                    move16();

                    *nb_bits_read = add( *nb_bits_read, 1 );

                    move16();

                    hMasa->config.numberOfDirections = (UWord8) L_add( byteBuffer, 1 );

                    move16();



                    /* the two reserved bits were already read in ivas_init_dec()*/

                    byteBuffer = st->bit_stream[( st->next_bit_pos )--];
@@ -242,7 +235,6 @@ ivas_error ivas_masa_decode_fx( 
                    move16();

                    move16();

                    *nb_bits_read = add( *nb_bits_read, MASA_HEADER_BITS );

                    move16();

                }

            }

            ELSE