Commit 4830f836 authored by emerit's avatar emerit
Browse files

same message

parent 163ff341

lib_dec/ivas_ism_metadata_dec.c

+13 −6
Original line number Diff line number Diff line
@@ -178,7 +178,6 @@ ivas_error ivas_ism_metadata_dec( 


    push_wmops( "ism_meta_dec" );





    /* initialization */

    st0 = hSCE[0]->hCoreCoder[0];

    ism_metadata_flag_global = 0;
@@ -245,11 +244,10 @@ ivas_error ivas_ism_metadata_dec( 
            }

        }



        /* Read ISM present flags (one per object) */

        /* Read ISm present flags (one per object) */

        for ( ch = 0; ch < *nchan_transport; ch++ )

        {

            ism_imp[ch] = get_next_indice( st0, ISM_METADATA_FLAG_BITS );



            if ( ism_imp[ch] > ISM_NO_META )

            {

                hIsmMeta[ch]->ism_metadata_flag = 1;
@@ -320,6 +318,9 @@ ivas_error ivas_ism_metadata_dec( 


                if ( hIsmMetaData->ism_metadata_flag == 2 )

                {

#ifdef ISM_NON_DIEGETIC_PAN_EROOR_ON_WRONG_OUTPUT_FORMAT

                    ism_extmeta_bitstream = ism_extmeta_bitstream | 0x2;

#endif

                    /* Azimuth/Elevation dequantization */

                    decode_angle_indices( st0, &( hIsmMetaData->position_angle ), hIsmMetaData->ism_metadata_flag, &flag_abs_position );

                    idx_angle1 = hIsmMetaData->position_angle.last_angle1_idx;
@@ -384,7 +385,11 @@ ivas_error ivas_ism_metadata_dec( 


                            idx_radius = decode_radius( st0, &hIsmMetaData->last_radius_idx, &flag_abs_radius );

                            radius = usdequant( idx_radius, ISM_RADIUS_MIN, ISM_RADIUS_DELTA );

#ifdef ISM_NON_DIEGETIC_PAN_EROOR_ON_WRONG_OUTPUT_FORMAT

                            if ( *ism_extmeta_active & 0x1 == 1 )

#else

                            if ( *ism_extmeta_active == 1 )

#endif

                            {

                                hIsmMetaData->yaw = yaw;

                                hIsmMetaData->pitch = pitch;
@@ -497,7 +502,9 @@ ivas_error ivas_ism_metadata_dec( 


    if ( !bfi )

    {

        if ( ( error = ivas_ism_config( ism_total_brate, *nchan_transport, nchan_ism, hIsmMeta, localVAD, ism_imp, element_brate, total_brate, nb_bits_metadata ) ) != IVAS_ERR_OK )

        if ( ( error = ivas_ism_config( ism_total_brate, *nchan_transport, nchan_ism, hIsmMeta, localVAD, ism_imp,

                                        element_brate,

                                        total_brate, nb_bits_metadata ) ) != IVAS_ERR_OK )

        {

            return error;

        }
@@ -614,7 +621,8 @@ ivas_error ivas_ism_metadata_dec_create( 
        ivas_ism_reset_metadata( st_ivas->hIsmMetaData[ch] );

    }



    if ( ( error = ivas_ism_config( st_ivas->hDecoderConfig->ivas_total_brate, n_ISms, n_ISms, NULL, NULL, NULL, element_brate_tmp, NULL, NULL ) ) != IVAS_ERR_OK )

    if ( ( error = ivas_ism_config( st_ivas->hDecoderConfig->ivas_total_brate, n_ISms, n_ISms, NULL, NULL, NULL,

                                    element_brate_tmp, NULL, NULL ) ) != IVAS_ERR_OK )

    {

        return error;

    }
@@ -853,7 +861,6 @@ static int16_t decode_radius( 
    return idx_radius;

}





/*-------------------------------------------------------------------*

 * ivas_ism_metadata_sid_dec()

 *