mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-17 03:35:21 +00:00
Code Issues 1 Projects Releases Wiki Activity

Small cleanups

Browse source 
Original commit message from CVS:
Small cleanups
This commit is contained in:
Wim Taymans 2001-12-12 13:37:29 +00:00
parent ca2bc32210
commit 44896269e5
3 changed files with 34 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

63
gst/gstcpu.c
View file

@ -23,83 +23,84 @@
#include <glib.h> #include <glib.h>
#include "gst_private.h" #include "gst_private.h"
#include "gstcpu.h" #include "gstcpu.h"
static guint32 _gst_cpu_flags; static guint32 _gst_cpu_flags;
#ifdef HAVE_CPU_I386 #ifdef HAVE_CPU_I386
void gst_cpuid_i386(int,long *,long *,long *,long *); void gst_cpuid_i386 (int, unsigned long *, unsigned long *, unsigned long *, unsigned long *);
#define gst_cpuid gst_cpuid_i386 #define gst_cpuid gst_cpuid_i386
#else #else
#define gst_cpuid(o,a,b,c,d) (void)(a);(void)(b);(void)(c); #define gst_cpuid(o,a,b,c,d) (void)(a);(void)(b);(void)(c);
#endif #endif
static gchar *stringcat (gchar *a,gchar *b) { static gchar *
stringcat (gchar * a, gchar * b)
{
gchar *c; gchar *c;
if (a) { if (a) {
c = g_strconcat(a,b,NULL); c = g_strconcat (a, b, NULL);
g_free (a); g_free (a);
} else { }
c = g_strdup(b); else {
c = g_strdup (b);
} }
return c; return c;
} }
void void
_gst_cpu_initialize (void) _gst_cpu_initialize (void)
{ {
gchar *featurelist = NULL; gchar *featurelist = NULL;
gboolean AMD; gboolean AMD;
long eax=0, ebx=0, ecx=0, edx=0; gulong eax = 0, ebx = 0, ecx = 0, edx = 0;
gst_cpuid(0, &eax, &ebx, &ecx, &edx); gst_cpuid (0, &eax, &ebx, &ecx, &edx);
AMD = (ebx == 0x68747541) && (ecx == 0x444d4163) && (edx == 0x69746e65); AMD = (ebx == 0x68747541) && (ecx == 0x444d4163) && (edx == 0x69746e65);
gst_cpuid(1, &eax, &ebx, &ecx, &edx); gst_cpuid (1, &eax, &ebx, &ecx, &edx);
if (edx & (1<<23)) { if (edx & (1 << 23)) {
_gst_cpu_flags |= GST_CPU_FLAG_MMX; _gst_cpu_flags |= GST_CPU_FLAG_MMX;
featurelist = stringcat(featurelist,"MMX "); featurelist = stringcat (featurelist, "MMX ");
if (edx & (1<<25)) { if (edx & (1 << 25)) {
_gst_cpu_flags |= GST_CPU_FLAG_SSE; _gst_cpu_flags |= GST_CPU_FLAG_SSE;
_gst_cpu_flags |= GST_CPU_FLAG_MMXEXT; _gst_cpu_flags |= GST_CPU_FLAG_MMXEXT;
featurelist = stringcat(featurelist,"SSE "); featurelist = stringcat (featurelist, "SSE ");
} }
gst_cpuid(0x80000000, &eax, &ebx, &ecx, &edx); gst_cpuid (0x80000000, &eax, &ebx, &ecx, &edx);
if (eax >= 0x80000001) { if (eax >= 0x80000001) {
gst_cpuid(0x80000001, &eax, &ebx, &ecx, &edx); gst_cpuid (0x80000001, &eax, &ebx, &ecx, &edx);
if (edx & (1<<31)) { if (edx & (1 << 31)) {
_gst_cpu_flags |= GST_CPU_FLAG_3DNOW; _gst_cpu_flags |= GST_CPU_FLAG_3DNOW;
featurelist = stringcat(featurelist,"3DNOW "); featurelist = stringcat (featurelist, "3DNOW ");
} }
if (AMD && (edx & (1<<22))) { if (AMD && (edx & (1 << 22))) {
_gst_cpu_flags |= GST_CPU_FLAG_MMXEXT; _gst_cpu_flags |= GST_CPU_FLAG_MMXEXT;
featurelist = stringcat(featurelist,"MMXEXT "); featurelist = stringcat (featurelist, "MMXEXT ");
} }
} }
} }
if (!_gst_cpu_flags) { if (!_gst_cpu_flags) {
featurelist = stringcat(featurelist,"NONE"); featurelist = stringcat (featurelist, "NONE");
} }
GST_INFO (GST_CAT_GST_INIT, "CPU features: (%08lx) %s",edx, featurelist); GST_INFO (GST_CAT_GST_INIT, "CPU features: (%08lx) %s", edx, featurelist);
g_free(featurelist); g_free (featurelist);
} }
GstCPUFlags GstCPUFlags
gst_cpu_get_flags (void) gst_cpu_get_flags (void)
{ {
return _gst_cpu_flags; return _gst_cpu_flags;
} }

1
gst/gsttimecache.c
View file

@ -45,6 +45,7 @@ gst_timecache_get_type(void) {
sizeof(GstTimeCache), sizeof(GstTimeCache),
1, 1,
(GInstanceInitFunc)gst_timecache_init, (GInstanceInitFunc)gst_timecache_init,
NULL
}; };
tc_type = g_type_register_static(GST_TYPE_OBJECT, "GstTimeCache", &tc_info, 0); tc_type = g_type_register_static(GST_TYPE_OBJECT, "GstTimeCache", &tc_info, 0);
} }

2
gst/gsttimecache.h
View file

@ -86,7 +86,7 @@ struct _GstTimeCache {
}; };
GType gst_timecache_get_type (void); GType gst_timecache_get_type (void);
GstTimeCache* gst_timecache_new (); GstTimeCache* gst_timecache_new (void);
gint gst_timecache_get_group (GstTimeCache *tc); gint gst_timecache_get_group (GstTimeCache *tc);
gint gst_timecache_new_group (GstTimeCache *tc); gint gst_timecache_new_group (GstTimeCache *tc);