controlpoint: change the padding to be of arch-independent size

The default padding I introduced in d4f81fb4e6 is
actually only 4 pointers and on 32bit platforms already smaller than the union.
Replace it with a fixed 64byte padding. Don't add the normal padding for now.

Fixes #755822
This commit is contained in:
Stefan Sauer 2015-09-30 17:29:16 +02:00
parent 7c58eefb77
commit 8487133114
8 changed files with 10 additions and 10 deletions

View file

@ -70,14 +70,14 @@ struct _GstControlPoint
/* Caches for the interpolators */ /* Caches for the interpolators */
/* FIXME: we should not have this here already ... */ /* FIXME: we should not have this here already ... */
union { union {
struct { struct { /* 16 bytes */
gdouble h; gdouble h;
gdouble z; gdouble z;
} cubic; } cubic;
struct { struct { /* 24 bytes */
gdouble c1s, c2s, c3s; gdouble c1s, c2s, c3s;
} cubic_mono; } cubic_mono;
gpointer _gst_reserved[GST_PADDING]; guint8 _gst_reserved[64];
} cache; } cache;
}; };

View file

@ -22,7 +22,7 @@ GstCheckABIStruct list[] = {
{"GstInterpolationControlSource", sizeof (GstInterpolationControlSource), 152}, {"GstInterpolationControlSource", sizeof (GstInterpolationControlSource), 152},
{"GstLFOControlSourceClass", sizeof (GstLFOControlSourceClass), 124}, {"GstLFOControlSourceClass", sizeof (GstLFOControlSourceClass), 124},
{"GstLFOControlSource", sizeof (GstLFOControlSource), 120}, {"GstLFOControlSource", sizeof (GstLFOControlSource), 120},
{"GstControlPoint", sizeof (GstControlPoint), 48}, {"GstControlPoint", sizeof (GstControlPoint), 80},
{"GstTimedValueControlSourceClass", sizeof (GstTimedValueControlSourceClass), 124}, {"GstTimedValueControlSourceClass", sizeof (GstTimedValueControlSourceClass), 124},
{"GstTimedValueControlSource", sizeof (GstTimedValueControlSource), 128}, {"GstTimedValueControlSource", sizeof (GstTimedValueControlSource), 128},
{"GstTriggerControlSourceClass", sizeof (GstTriggerControlSourceClass), 140}, {"GstTriggerControlSourceClass", sizeof (GstTriggerControlSourceClass), 140},

View file

@ -22,7 +22,7 @@ GstCheckABIStruct list[] = {
{"GstInterpolationControlSource", sizeof (GstInterpolationControlSource), 240}, {"GstInterpolationControlSource", sizeof (GstInterpolationControlSource), 240},
{"GstLFOControlSourceClass", sizeof (GstLFOControlSourceClass), 248}, {"GstLFOControlSourceClass", sizeof (GstLFOControlSourceClass), 248},
{"GstLFOControlSource", sizeof (GstLFOControlSource), 184}, {"GstLFOControlSource", sizeof (GstLFOControlSource), 184},
{"GstControlPoint", sizeof (GstControlPoint), 48}, {"GstControlPoint", sizeof (GstControlPoint), 80},
{"GstTimedValueControlSourceClass", sizeof (GstTimedValueControlSourceClass), 248}, {"GstTimedValueControlSourceClass", sizeof (GstTimedValueControlSourceClass), 248},
{"GstTimedValueControlSource", sizeof (GstTimedValueControlSource), 200}, {"GstTimedValueControlSource", sizeof (GstTimedValueControlSource), 200},
{"GstTriggerControlSourceClass", sizeof (GstTriggerControlSourceClass), 280}, {"GstTriggerControlSourceClass", sizeof (GstTriggerControlSourceClass), 280},

View file

@ -22,7 +22,7 @@ GstCheckABIStruct list[] = {
{"GstInterpolationControlSource", sizeof (GstInterpolationControlSource), 140}, {"GstInterpolationControlSource", sizeof (GstInterpolationControlSource), 140},
{"GstLFOControlSourceClass", sizeof (GstLFOControlSourceClass), 124}, {"GstLFOControlSourceClass", sizeof (GstLFOControlSourceClass), 124},
{"GstLFOControlSource", sizeof (GstLFOControlSource), 108}, {"GstLFOControlSource", sizeof (GstLFOControlSource), 108},
{"GstControlPoint", sizeof (GstControlPoint), 48}, {"GstControlPoint", sizeof (GstControlPoint), 80},
{"GstTimedValueControlSourceClass", sizeof (GstTimedValueControlSourceClass), 124}, {"GstTimedValueControlSourceClass", sizeof (GstTimedValueControlSourceClass), 124},
{"GstTimedValueControlSource", sizeof (GstTimedValueControlSource), 120}, {"GstTimedValueControlSource", sizeof (GstTimedValueControlSource), 120},
{"GstTriggerControlSourceClass", sizeof (GstTriggerControlSourceClass), 140}, {"GstTriggerControlSourceClass", sizeof (GstTriggerControlSourceClass), 140},

View file

@ -22,7 +22,7 @@ GstCheckABIStruct list[] = {
{"GstInterpolationControlSource", sizeof (GstInterpolationControlSource), 152}, {"GstInterpolationControlSource", sizeof (GstInterpolationControlSource), 152},
{"GstLFOControlSourceClass", sizeof (GstLFOControlSourceClass), 124}, {"GstLFOControlSourceClass", sizeof (GstLFOControlSourceClass), 124},
{"GstLFOControlSource", sizeof (GstLFOControlSource), 120}, {"GstLFOControlSource", sizeof (GstLFOControlSource), 120},
{"GstControlPoint", sizeof (GstControlPoint), 48}, {"GstControlPoint", sizeof (GstControlPoint), 80},
{"GstTimedValueControlSourceClass", sizeof (GstTimedValueControlSourceClass), 124}, {"GstTimedValueControlSourceClass", sizeof (GstTimedValueControlSourceClass), 124},
{"GstTimedValueControlSource", sizeof (GstTimedValueControlSource), 128}, {"GstTimedValueControlSource", sizeof (GstTimedValueControlSource), 128},
{"GstTriggerControlSourceClass", sizeof (GstTriggerControlSourceClass), 140}, {"GstTriggerControlSourceClass", sizeof (GstTriggerControlSourceClass), 140},

View file

@ -22,7 +22,7 @@ GstCheckABIStruct list[] = {
{"GstInterpolationControlSource", sizeof (GstInterpolationControlSource), 240}, {"GstInterpolationControlSource", sizeof (GstInterpolationControlSource), 240},
{"GstLFOControlSourceClass", sizeof (GstLFOControlSourceClass), 248}, {"GstLFOControlSourceClass", sizeof (GstLFOControlSourceClass), 248},
{"GstLFOControlSource", sizeof (GstLFOControlSource), 184}, {"GstLFOControlSource", sizeof (GstLFOControlSource), 184},
{"GstControlPoint", sizeof (GstControlPoint), 48}, {"GstControlPoint", sizeof (GstControlPoint), 80},
{"GstTimedValueControlSourceClass", sizeof (GstTimedValueControlSourceClass), 248}, {"GstTimedValueControlSourceClass", sizeof (GstTimedValueControlSourceClass), 248},
{"GstTimedValueControlSource", sizeof (GstTimedValueControlSource), 200}, {"GstTimedValueControlSource", sizeof (GstTimedValueControlSource), 200},
{"GstTriggerControlSourceClass", sizeof (GstTriggerControlSourceClass), 280}, {"GstTriggerControlSourceClass", sizeof (GstTriggerControlSourceClass), 280},

View file

@ -22,7 +22,7 @@ GstCheckABIStruct list[] = {
{"GstInterpolationControlSource", sizeof (GstInterpolationControlSource), 240}, {"GstInterpolationControlSource", sizeof (GstInterpolationControlSource), 240},
{"GstLFOControlSourceClass", sizeof (GstLFOControlSourceClass), 248}, {"GstLFOControlSourceClass", sizeof (GstLFOControlSourceClass), 248},
{"GstLFOControlSource", sizeof (GstLFOControlSource), 184}, {"GstLFOControlSource", sizeof (GstLFOControlSource), 184},
{"GstControlPoint", sizeof (GstControlPoint), 48}, {"GstControlPoint", sizeof (GstControlPoint), 80},
{"GstTimedValueControlSourceClass", sizeof (GstTimedValueControlSourceClass), 248}, {"GstTimedValueControlSourceClass", sizeof (GstTimedValueControlSourceClass), 248},
{"GstTimedValueControlSource", sizeof (GstTimedValueControlSource), 200}, {"GstTimedValueControlSource", sizeof (GstTimedValueControlSource), 200},
{"GstTriggerControlSourceClass", sizeof (GstTriggerControlSourceClass), 280}, {"GstTriggerControlSourceClass", sizeof (GstTriggerControlSourceClass), 280},

View file

@ -22,7 +22,7 @@ GstCheckABIStruct list[] = {
{"GstInterpolationControlSource", sizeof (GstInterpolationControlSource), 240}, {"GstInterpolationControlSource", sizeof (GstInterpolationControlSource), 240},
{"GstLFOControlSourceClass", sizeof (GstLFOControlSourceClass), 248}, {"GstLFOControlSourceClass", sizeof (GstLFOControlSourceClass), 248},
{"GstLFOControlSource", sizeof (GstLFOControlSource), 184}, {"GstLFOControlSource", sizeof (GstLFOControlSource), 184},
{"GstControlPoint", sizeof (GstControlPoint), 48}, {"GstControlPoint", sizeof (GstControlPoint), 80},
{"GstTimedValueControlSourceClass", sizeof (GstTimedValueControlSourceClass), 248}, {"GstTimedValueControlSourceClass", sizeof (GstTimedValueControlSourceClass), 248},
{"GstTimedValueControlSource", sizeof (GstTimedValueControlSource), 200}, {"GstTimedValueControlSource", sizeof (GstTimedValueControlSource), 200},
{"GstTriggerControlSourceClass", sizeof (GstTriggerControlSourceClass), 280}, {"GstTriggerControlSourceClass", sizeof (GstTriggerControlSourceClass), 280},