mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-22 17:51:16 +00:00
Small cleanups
Original commit message from CVS: Small cleanups
This commit is contained in:
parent
ca2bc32210
commit
44896269e5
3 changed files with 34 additions and 32 deletions
63
gst/gstcpu.c
63
gst/gstcpu.c
|
@ -23,83 +23,84 @@
|
|||
#include <glib.h>
|
||||
|
||||
#include "gst_private.h"
|
||||
|
||||
#include "gstcpu.h"
|
||||
|
||||
|
||||
static guint32 _gst_cpu_flags;
|
||||
|
||||
#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
|
||||
|
||||
#else
|
||||
#define gst_cpuid(o,a,b,c,d) (void)(a);(void)(b);(void)(c);
|
||||
#endif
|
||||
|
||||
static gchar *stringcat (gchar *a,gchar *b) {
|
||||
static gchar *
|
||||
stringcat (gchar * a, gchar * b)
|
||||
{
|
||||
gchar *c;
|
||||
|
||||
if (a) {
|
||||
c = g_strconcat(a,b,NULL);
|
||||
c = g_strconcat (a, b, NULL);
|
||||
g_free (a);
|
||||
} else {
|
||||
c = g_strdup(b);
|
||||
}
|
||||
else {
|
||||
c = g_strdup (b);
|
||||
}
|
||||
return c;
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
_gst_cpu_initialize (void)
|
||||
void
|
||||
_gst_cpu_initialize (void)
|
||||
{
|
||||
gchar *featurelist = NULL;
|
||||
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);
|
||||
|
||||
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;
|
||||
featurelist = stringcat(featurelist,"MMX ");
|
||||
|
||||
if (edx & (1<<25)) {
|
||||
featurelist = stringcat (featurelist, "MMX ");
|
||||
|
||||
if (edx & (1 << 25)) {
|
||||
_gst_cpu_flags |= GST_CPU_FLAG_SSE;
|
||||
_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) {
|
||||
|
||||
gst_cpuid(0x80000001, &eax, &ebx, &ecx, &edx);
|
||||
gst_cpuid (0x80000001, &eax, &ebx, &ecx, &edx);
|
||||
|
||||
if (edx & (1<<31)) {
|
||||
_gst_cpu_flags |= GST_CPU_FLAG_3DNOW;
|
||||
featurelist = stringcat(featurelist,"3DNOW ");
|
||||
if (edx & (1 << 31)) {
|
||||
_gst_cpu_flags |= GST_CPU_FLAG_3DNOW;
|
||||
featurelist = stringcat (featurelist, "3DNOW ");
|
||||
}
|
||||
if (AMD && (edx & (1<<22))) {
|
||||
_gst_cpu_flags |= GST_CPU_FLAG_MMXEXT;
|
||||
featurelist = stringcat(featurelist,"MMXEXT ");
|
||||
if (AMD && (edx & (1 << 22))) {
|
||||
_gst_cpu_flags |= GST_CPU_FLAG_MMXEXT;
|
||||
featurelist = stringcat (featurelist, "MMXEXT ");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (!_gst_cpu_flags) {
|
||||
featurelist = stringcat(featurelist,"NONE");
|
||||
featurelist = stringcat (featurelist, "NONE");
|
||||
}
|
||||
|
||||
GST_INFO (GST_CAT_GST_INIT, "CPU features: (%08lx) %s",edx, featurelist);
|
||||
g_free(featurelist);
|
||||
GST_INFO (GST_CAT_GST_INIT, "CPU features: (%08lx) %s", edx, featurelist);
|
||||
g_free (featurelist);
|
||||
}
|
||||
|
||||
GstCPUFlags
|
||||
gst_cpu_get_flags (void)
|
||||
GstCPUFlags
|
||||
gst_cpu_get_flags (void)
|
||||
{
|
||||
return _gst_cpu_flags;
|
||||
}
|
||||
|
|
|
@ -45,6 +45,7 @@ gst_timecache_get_type(void) {
|
|||
sizeof(GstTimeCache),
|
||||
1,
|
||||
(GInstanceInitFunc)gst_timecache_init,
|
||||
NULL
|
||||
};
|
||||
tc_type = g_type_register_static(GST_TYPE_OBJECT, "GstTimeCache", &tc_info, 0);
|
||||
}
|
||||
|
|
|
@ -86,7 +86,7 @@ struct _GstTimeCache {
|
|||
};
|
||||
|
||||
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_new_group (GstTimeCache *tc);
|
||||
|
|
Loading…
Reference in a new issue