Commit 568f76e9 authored by vaclav's avatar vaclav
Browse files

fix for "data_separated_object" buffer

parent c9c3eb0e

lib_enc/ivas_enc.c

+20 −0
Original line number Diff line number Diff line
@@ -274,7 +274,11 @@ ivas_error ivas_enc( 
    }

    else if ( ivas_format == MASA_ISM_FORMAT )

    {

#ifdef BE_FIX_887_GCC_WARNING_ARRAY_SIZE

        float *data_separated_object[1];

#else

        float *data_separated_object;

#endif

        int16_t idx_separated_object;

        int16_t flag_omasa_ener_brate;
@@ -297,27 +301,43 @@ ivas_error ivas_enc( 


        set_s( nb_bits_metadata, 0, MAX_SCE + 1 );

        idx_separated_object = 0;

#ifdef BE_FIX_887_GCC_WARNING_ARRAY_SIZE

        data_separated_object[0] = data_f[hEncoderConfig->nchan_ism + CPE_CHANNELS];

#else

        data_separated_object = data_f[hEncoderConfig->nchan_ism + CPE_CHANNELS];

#endif



        /* put audio object data in SCE's */

        if ( st_ivas->ism_mode != ISM_MASA_MODE_DISC )

        {

            /* Estimate MASA parameters for the objects */

#ifdef BE_FIX_887_GCC_WARNING_ARRAY_SIZE

            ivas_omasa_enc( st_ivas->hOMasa, st_ivas->hMasa, st_ivas->hIsmMetaData, data_f, input_frame, st_ivas->nchan_transport, hEncoderConfig->nchan_ism, st_ivas->ism_mode, data_separated_object[0], &idx_separated_object );

#else

            ivas_omasa_enc( st_ivas->hOMasa, st_ivas->hMasa, st_ivas->hIsmMetaData, data_f, input_frame, st_ivas->nchan_transport, hEncoderConfig->nchan_ism, st_ivas->ism_mode, data_separated_object, &idx_separated_object );

#endif

        }



        /* Encode ISMs transport channels */

        n = 0;

        if ( st_ivas->ism_mode == ISM_MASA_MODE_PARAM_ONE_OBJ )

        {

#ifdef BE_FIX_887_GCC_WARNING_ARRAY_SIZE

            if ( ( error = ivas_sce_enc( st_ivas, 0, data_separated_object[0], input_frame, nb_bits_metadata[1] ) ) != IVAS_ERR_OK ) /* there are no metadata bits in SCE in this mode  */

#else

            if ( ( error = ivas_sce_enc( st_ivas, 0, data_separated_object, input_frame, nb_bits_metadata[1] ) ) != IVAS_ERR_OK ) /* there are no metadata bits in SCE in this mode  */

#endif

            {

                return error;

            }

        }

        else if ( st_ivas->ism_mode == ISM_MASA_MODE_MASA_ONE_OBJ )

        {

#ifdef BE_FIX_887_GCC_WARNING_ARRAY_SIZE

            if ( ( error = ivas_ism_enc( st_ivas, data_separated_object, input_frame, &nb_bits_metadata[1], 0 ) ) != IVAS_ERR_OK )

#else

            if ( ( error = ivas_ism_enc( st_ivas, &data_separated_object, input_frame, &nb_bits_metadata[1], 0 ) ) != IVAS_ERR_OK )

#endif

            {

                return error;

            }