Commit 242310b4 authored by vaclav's avatar vaclav
Browse files

cleaning + formatting

parent 6a83c01b

lib_com/ivas_masa_com.c

+0 −1
Original line number Diff line number Diff line
@@ -87,7 +87,6 @@ void ivas_masa_set_elements( 
#ifdef MASA_AND_OBJECTS

            if ( ivas_format == MASA_ISM_FORMAT && ism_mode != ISM_MODE_NONE )

        {



            *nCPE = 1;



            if ( *element_mode == -1 )

lib_dec/ivas_init_dec.c

+0 −2
Original line number Diff line number Diff line
@@ -1013,7 +1013,6 @@ ivas_error ivas_init_decoder( 


            for ( sce_id = 0; sce_id < st_ivas->nSCE; sce_id++ )

            {



                temp_brate[sce_id] = sep_object_brate[k - 2][st_ivas->nSCE - 1];

                ism_total_brate += temp_brate[sce_id];
@@ -1046,7 +1045,6 @@ ivas_error ivas_init_decoder( 
            ivas_dirac_dec_open( st_ivas );

        }



        st_ivas->nCPE = 1;

        if ( ( error = create_cpe_dec( st_ivas, 0, ivas_total_brate - ism_total_brate ) ) != IVAS_ERR_OK )

        {

            return error;

lib_dec/ivas_masa_dec.c

+1 −0
Original line number Diff line number Diff line
@@ -504,6 +504,7 @@ ivas_error ivas_masa_dec_open( 
    {

        return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for MASA decoder\n" ) );

    }



#ifdef MASA_AND_OBJECTS

    ism_total_brate = 0;

    if ( st_ivas->ivas_format == MASA_ISM_FORMAT && st_ivas->nSCE > 0 && ( st_ivas->ism_mode == ISM_MASA_MODE_DISC || st_ivas->ism_mode == ISM_MASA_MODE_ONE_OBJ ) )