mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 12:11:13 +00:00
Code Issues 1 Projects Releases Wiki Activity

Purge references to liboil

Browse source 
https://bugzilla.gnome.org/show_bug.cgi?id=673285
This commit is contained in:
Tim-Philipp Müller 2012-09-29 11:59:31 +01:00
parent cb0e4b2059
commit e6d37eb30a
2 changed files with 3 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
gst/level/gstlevel.c
View file

@ -361,6 +361,7 @@ DEFINE_INT_LEVEL_CALCULATOR (gint32, 31);
DEFINE_INT_LEVEL_CALCULATOR (gint16, 15); DEFINE_INT_LEVEL_CALCULATOR (gint16, 15);
DEFINE_INT_LEVEL_CALCULATOR (gint8, 7); DEFINE_INT_LEVEL_CALCULATOR (gint8, 7);
/* FIXME: use orc to calculate squaresums? */
#define DEFINE_FLOAT_LEVEL_CALCULATOR(TYPE) \ #define DEFINE_FLOAT_LEVEL_CALCULATOR(TYPE) \
static void inline \ static void inline \
gst_level_calculate_##TYPE (gpointer data, guint num, guint channels, \ gst_level_calculate_##TYPE (gpointer data, guint num, guint channels, \
@ -375,7 +376,7 @@ gst_level_calculate_##TYPE (gpointer data, guint num, guint channels, \
/* *NCS = 0.0; Normalized Cumulative Square */ \ /* *NCS = 0.0; Normalized Cumulative Square */ \
/* *NPS = 0.0; Normalized Peask Square */ \ /* *NPS = 0.0; Normalized Peask Square */ \
\ \
/* oil_squaresum_f64(&squaresum,in,num); */ \ /* orc_level_squaresum_f64(&squaresum,in,num); */ \
for (j = 0; j < num; j += channels) \ for (j = 0; j < num; j += channels) \
{ \ { \
square = ((gdouble) in[j]) * in[j]; \ square = ((gdouble) in[j]) * in[j]; \
@ -395,7 +396,7 @@ static void inline
gst_level_calculate_gdouble (gpointer data, guint num, guint channels, gst_level_calculate_gdouble (gpointer data, guint num, guint channels,
gdouble *NCS, gdouble *NPS) gdouble *NCS, gdouble *NPS)
{ {
oil_squaresum_f64(NCS,(gdouble *)data,num); orc_level_squaresum_f64(NCS,(gdouble *)data,num);
*NPS = 0.0; *NPS = 0.0;
} }
*/ */
@ -702,8 +703,6 @@ gst_level_transform_ip (GstBaseTransform * trans, GstBuffer * in)
static gboolean static gboolean
plugin_init (GstPlugin * plugin) plugin_init (GstPlugin * plugin)
{ {
/*oil_init (); */
return gst_element_register (plugin, "level", GST_RANK_NONE, GST_TYPE_LEVEL); return gst_element_register (plugin, "level", GST_RANK_NONE, GST_TYPE_LEVEL);
} }

8
tests/check/elements/videocrop.c
View file

@ -786,14 +786,6 @@ main (int argc, char **argv)
Suite *s = videocrop_suite (); Suite *s = videocrop_suite ();
SRunner *sr = srunner_create (s); SRunner *sr = srunner_create (s);
#ifdef HAVE_VALGRIND
if (RUNNING_ON_VALGRIND) {
/* otherwise valgrind errors out when liboil probes CPU extensions
* in oil_init() during which it causes SIGILLs etc. to be fired */
g_setenv ("OIL_CPU_FLAGS", "0", 0);
}
#endif
gst_check_init (&argc, &argv); gst_check_init (&argc, &argv);
srunner_run_all (sr, CK_NORMAL); srunner_run_all (sr, CK_NORMAL);