Merge branch 'master' into 0.11

Conflicts:
	tests/check/gst/struct_x86_64.h
This commit is contained in:
Wim Taymans 2011-03-31 17:55:22 +02:00
commit fdd6433757
3 changed files with 126 additions and 105 deletions

View file

@ -1,65 +1,85 @@
static GstCheckABIStruct list[] = {
{"GstBin", sizeof (GstBin), 336},
{"GstAllocTrace", sizeof (GstAllocTrace), 24},
{"GstBinClass", sizeof (GstBinClass), 568},
{"GstBuffer", sizeof (GstBuffer), 120} ,
{"GstBus", sizeof (GstBus), 152} ,
{"GstBusClass", sizeof (GstBusClass), 288} ,
{"GstCaps", sizeof (GstCaps), 56} ,
{"GstStaticCaps", sizeof (GstStaticCaps), 96} ,
{"GstChildProxyInterface", sizeof (GstChildProxyInterface), 80} ,
{"GstClock", sizeof (GstClock), 240} ,
{"GstClockClass", sizeof (GstClockClass), 320} ,
{"GstElement", sizeof (GstElement), 232} ,
{"GstElementClass", sizeof (GstElementClass), 488} ,
{"GstElementFactory", sizeof (GstElementFactory), 280} ,
{"GstElementFactoryClass", sizeof (GstElementFactoryClass), 304} ,
{"GstEvent", sizeof (GstEvent), 64} ,
{"GstFormatDefinition", sizeof (GstFormatDefinition), 32} ,
{"GstIndexEntry", sizeof (GstIndexEntry), 32} ,
{"GstIndexGroup", sizeof (GstIndexGroup), 24} ,
{"GstIndex", sizeof (GstIndex), 192} ,
{"GstIndexClass", sizeof (GstIndexClass), 312} ,
{"GstIndexAssociation", sizeof (GstIndexAssociation), 16} ,
{"GstIndexFactory", sizeof (GstIndexFactory), 192} ,
{"GstIndexFactoryClass", sizeof (GstIndexFactoryClass), 304} ,
{"GstDebugCategory", sizeof (GstDebugCategory), 24} ,
{"GstImplementsInterfaceClass", sizeof (GstImplementsInterfaceClass), 56} ,
{"GstIterator", sizeof (GstIterator), 104} ,
{"GstMessage", sizeof (GstMessage), 104} ,
{"GstMiniObject", sizeof (GstMiniObject), 24} ,
{"GstObject", sizeof (GstObject), 80} ,
{"GstObjectClass", sizeof (GstObjectClass), 240} ,
{"GstPad", sizeof (GstPad), 368} ,
{"GstPadClass", sizeof (GstPadClass), 304} ,
{"GstPadTemplate", sizeof (GstPadTemplate), 136} ,
{"GstPadTemplateClass", sizeof (GstPadTemplateClass), 280} ,
{"GstStaticPadTemplate", sizeof (GstStaticPadTemplate), 112} ,
{"GstPipeline", sizeof (GstPipeline), 392} ,
{"GstPipelineClass", sizeof (GstPipelineClass), 600} ,
{"GstPlugin", sizeof (GstPlugin), 280} ,
{"GstPluginClass", sizeof (GstPluginClass), 272} ,
{"GstPluginDesc", sizeof (GstPluginDesc), 104} ,
{"GstPluginFeature", sizeof (GstPluginFeature), 144} ,
{"GstPluginFeatureClass", sizeof (GstPluginFeatureClass), 272} ,
{"GstQueryTypeDefinition", sizeof (GstQueryTypeDefinition), 32} ,
{"GstQuery", sizeof (GstQuery), 48} ,
{"GstRegistry", sizeof (GstRegistry), 144} ,
{"GstRegistryClass", sizeof (GstRegistryClass), 288} ,
{"GstSegment", sizeof (GstSegment), 104} ,
{"GstStructure", sizeof (GstStructure), 40} ,
{"GstSystemClock", sizeof (GstSystemClock), 288} ,
{"GstSystemClockClass", sizeof (GstSystemClockClass), 352} ,
{"GstTagSetterIFace", sizeof (GstTagSetterIFace), 16} ,
{"GstTask", sizeof (GstTask), 160} ,
{"GstTaskClass", sizeof (GstTaskClass), 280} ,
{"GstTrace", sizeof (GstTrace), 32} ,
{"GstTraceEntry", sizeof (GstTraceEntry), 128} ,
{"GstAllocTrace", sizeof (GstAllocTrace), 24} ,
{"GstTypeFind", sizeof (GstTypeFind), 64} ,
{"GstTypeFindFactory", sizeof (GstTypeFindFactory), 216} ,
{"GstTypeFindFactoryClass", sizeof (GstTypeFindFactoryClass), 304} ,
{"GstURIHandlerInterface", sizeof (GstURIHandlerInterface), 88} ,
{"GstValueTable", sizeof (GstValueTable), 64} ,
{"GstBin", sizeof (GstBin), 336},
{"GstBufferClass", sizeof (GstBufferClass), 32},
{"GstBuffer", sizeof (GstBuffer), 120},
{"GstBusClass", sizeof (GstBusClass), 288},
{"GstBus", sizeof (GstBus), 152},
{"GstCaps", sizeof (GstCaps), 56},
{"GstChildProxyInterface", sizeof (GstChildProxyInterface), 80},
{"GstClockClass", sizeof (GstClockClass), 320},
{"GstClockEntry", sizeof (GstClockEntry), 80},
{"GstClock", sizeof (GstClock), 240},
{"GstDebugCategory", sizeof (GstDebugCategory), 24},
{"GstElementClass", sizeof (GstElementClass), 488},
{"GstElementDetails", sizeof (GstElementDetails), 64},
{"GstElementFactoryClass", sizeof (GstElementFactoryClass), 304},
{"GstElementFactory", sizeof (GstElementFactory), 280},
{"GstElement", sizeof (GstElement), 232},
{"GstEventClass", sizeof (GstEventClass), 64},
{"GstEvent", sizeof (GstEvent), 64},
{"GstFormatDefinition", sizeof (GstFormatDefinition), 32},
{"GstGhostPadClass", sizeof (GstGhostPadClass), 344},
{"GstGhostPad", sizeof (GstGhostPad), 384},
{"GstImplementsInterfaceClass", sizeof (GstImplementsInterfaceClass), 56},
{"GstIndexAssociation", sizeof (GstIndexAssociation), 16},
{"GstIndexClass", sizeof (GstIndexClass), 312},
{"GstIndexEntry", sizeof (GstIndexEntry), 32},
{"GstIndexFactoryClass", sizeof (GstIndexFactoryClass), 304},
{"GstIndexFactory", sizeof (GstIndexFactory), 192},
{"GstIndexGroup", sizeof (GstIndexGroup), 24},
{"GstIndex", sizeof (GstIndex), 192},
{"GstIterator", sizeof (GstIterator), 104},
{"GstMessageClass", sizeof (GstMessageClass), 64},
{"GstMessage", sizeof (GstMessage), 104},
{"GstMiniObjectClass", sizeof (GstMiniObjectClass), 32},
{"GstMiniObject", sizeof (GstMiniObject), 24},
{"GstObjectClass", sizeof (GstObjectClass), 240},
{"GstObject", sizeof (GstObject), 80},
{"GstPadClass", sizeof (GstPadClass), 304},
{"GstPad", sizeof (GstPad), 368},
{"GstPadTemplateClass", sizeof (GstPadTemplateClass), 280},
{"GstPadTemplate", sizeof (GstPadTemplate), 136},
{"GstPadTemplate", sizeof (GstPadTemplate), 136},
{"GstParamSpecFraction", sizeof (GstParamSpecFraction), 96},
{"GstParamSpecMiniObject", sizeof (GstParamSpecMiniObject), 72},
{"GstPipelineClass", sizeof (GstPipelineClass), 600},
{"GstPipeline", sizeof (GstPipeline), 392},
{"GstPluginClass", sizeof (GstPluginClass), 272},
{"GstPluginDesc", sizeof (GstPluginDesc), 104},
{"GstPluginFeatureClass", sizeof (GstPluginFeatureClass), 272},
{"GstPluginFeature", sizeof (GstPluginFeature), 144},
{"GstPlugin", sizeof (GstPlugin), 280},
{"GstPresetInterface", sizeof (GstPresetInterface), 112},
{"GstProxyPadClass", sizeof (GstProxyPadClass), 312},
{"GstProxyPad", sizeof (GstProxyPad), 376},
{"GstQueryClass", sizeof (GstQueryClass), 64},
{"GstQuery", sizeof (GstQuery), 48},
{"GstQueryTypeDefinition", sizeof (GstQueryTypeDefinition), 32},
{"GstRegistryClass", sizeof (GstRegistryClass), 288},
{"GstRegistry", sizeof (GstRegistry), 144},
{"GstSegment", sizeof (GstSegment), 104},
{"GstStaticCaps", sizeof (GstStaticCaps), 96},
{"GstStaticPadTemplate", sizeof (GstStaticPadTemplate), 112},
{"GstStructure", sizeof (GstStructure), 40},
{"GstSystemClockClass", sizeof (GstSystemClockClass), 352},
{"GstSystemClock", sizeof (GstSystemClock), 288},
{"GstTagList", sizeof (GstTagList), 40},
{"GstTagSetterIFace", sizeof (GstTagSetterIFace), 16},
{"GstTaskClass", sizeof (GstTaskClass), 280},
{"GstTask", sizeof (GstTask), 160},
{"GstTaskPoolClass", sizeof (GstTaskPoolClass), 304},
{"GstTaskPool", sizeof (GstTaskPool), 120},
{"GstTaskThreadCallbacks", sizeof (GstTaskThreadCallbacks), 48},
{"GstTraceEntry", sizeof (GstTraceEntry), 128},
{"GstTrace", sizeof (GstTrace), 32},
{"GstTypeFindFactoryClass", sizeof (GstTypeFindFactoryClass), 304},
{"GstTypeFindFactory", sizeof (GstTypeFindFactory), 216},
{"GstTypeFind", sizeof (GstTypeFind), 64},
{"GstTypeNameData", sizeof (GstTypeNameData), 16},
{"GstURIHandlerInterface", sizeof (GstURIHandlerInterface), 88},
{"GstValueTable", sizeof (GstValueTable), 64},
#if !defined(GST_DISABLE_LOADSAVE) && !defined(GST_DISABLE_DEPRECATED) && !defined(GST_REMOVE_DEPRECATED)
{"GstXML", sizeof (GstXML), 128} ,
{"GstXMLClass", sizeof (GstXMLClass), 288} ,

View file

@ -26,10 +26,18 @@
#include <gst/base/gstbasesink.h>
#include <gst/base/gstbasesrc.h>
#include <gst/base/gstbasetransform.h>
#include <gst/base/gstbitreader.h>
#include <gst/base/gstbytereader.h>
#include <gst/base/gstbytewriter.h>
#include <gst/base/gstcollectpads.h>
#include <gst/base/gstdataqueue.h>
#include <gst/base/gstpushsrc.h>
#include <gst/base/gsttypefindhelper.h>
#include <gst/controller/gstcontroller.h>
#include <gst/controller/gstcontrolsource.h>
#include <gst/controller/gstinterpolationcontrolsource.h>
#include <gst/controller/gstlfocontrolsource.h>
#include <gst/dataprotocol/dataprotocol.h>
#include <gst/net/gstnet.h>
#include <gst/net/gstnetclientclock.h>
#include <gst/net/gstnettimepacket.h>

View file

@ -1,47 +1,40 @@
static GstCheckABIStruct list[] = {
{"GstAdapter", sizeof (GstAdapter), 88}
,
{"GstAdapterClass", sizeof (GstAdapterClass), 168}
,
{"GstBaseSink", sizeof (GstBaseSink), 600}
,
{"GstBaseSinkClass", sizeof (GstBaseSinkClass), 728}
,
{"GstBaseSrc", sizeof (GstBaseSrc), 600}
,
{"GstBaseSrcClass", sizeof (GstBaseSrcClass), 744}
,
{"GstBaseTransform", sizeof (GstBaseTransform), 576}
,
{"GstBaseTransformClass", sizeof (GstBaseTransformClass), 744}
,
{"GstCollectData", sizeof (GstCollectData), 168}
,
{"GstCollectPads", sizeof (GstCollectPads), 168}
,
{"GstCollectPadsClass", sizeof (GstCollectPadsClass), 272}
,
{"GstPushSrc", sizeof (GstPushSrc), 632}
,
{"GstPushSrcClass", sizeof (GstPushSrcClass), 784}
,
{"GstTimedValue", sizeof (GstTimedValue), 32}
,
{"GstValueArray", sizeof (GstValueArray), 32}
,
{"GstController", sizeof (GstController), 80}
,
{"GstControllerClass", sizeof (GstControllerClass), 168}
,
{"GstNetClientClock", sizeof (GstNetClientClock), 368}
,
{"GstNetClientClockClass", sizeof (GstNetClientClockClass), 384}
,
{"GstNetTimePacket", sizeof (GstNetTimePacket), 16}
,
{"GstNetTimeProvider", sizeof (GstNetTimeProvider), 152}
,
{"GstNetTimeProviderClass", sizeof (GstNetTimeProviderClass), 240}
,
GstCheckABIStruct list[] = {
{"GstAdapterClass", sizeof (GstAdapterClass), 168},
{"GstAdapter", sizeof (GstAdapter), 88},
{"GstBaseSinkClass", sizeof (GstBaseSinkClass), 728},
{"GstBaseSink", sizeof (GstBaseSink), 600},
{"GstBaseSrcClass", sizeof (GstBaseSrcClass), 744},
{"GstBaseSrc", sizeof (GstBaseSrc), 600},
{"GstBaseTransformClass", sizeof (GstBaseTransformClass), 744},
{"GstBaseTransform", sizeof (GstBaseTransform), 576},
{"GstBitReader", sizeof (GstBitReader), 24},
{"GstByteReader", sizeof (GstByteReader), 16},
{"GstByteWriter", sizeof (GstByteWriter), 32},
{"GstCollectData", sizeof (GstCollectData), 168},
{"GstCollectPadsClass", sizeof (GstCollectPadsClass), 272},
{"GstCollectPads", sizeof (GstCollectPads), 168},
{"GstControllerClass", sizeof (GstControllerClass), 168},
{"GstController", sizeof (GstController), 80},
{"GstControlSourceClass", sizeof (GstControlSourceClass), 176},
{"GstControlSource", sizeof (GstControlSource), 80},
{"GstDataQueueClass", sizeof (GstDataQueueClass), 184},
{"GstDataQueueItem", sizeof (GstDataQueueItem), 40},
{"GstDataQueue", sizeof (GstDataQueue), 128},
{"GstDataQueueSize", sizeof (GstDataQueueSize), 16},
{"GstDPPacketizer", sizeof (GstDPPacketizer), 64},
{"GstInterpolationControlSourceClass", sizeof (GstInterpolationControlSourceClass), 208},
{"GstInterpolationControlSource", sizeof (GstInterpolationControlSource), 128},
{"GstLFOControlSourceClass", sizeof (GstLFOControlSourceClass), 208},
{"GstLFOControlSource", sizeof (GstLFOControlSource), 128},
{"GstNetClientClockClass", sizeof (GstNetClientClockClass), 384},
{"GstNetClientClock", sizeof (GstNetClientClock), 368},
{"GstNetTimePacket", sizeof (GstNetTimePacket), 16},
{"GstNetTimeProviderClass", sizeof (GstNetTimeProviderClass), 240},
{"GstNetTimeProvider", sizeof (GstNetTimeProvider), 152},
{"GstPushSrcClass", sizeof (GstPushSrcClass), 784},
{"GstPushSrc", sizeof (GstPushSrc), 632},
{"GstTimedValue", sizeof (GstTimedValue), 32},
{"GstValueArray", sizeof (GstValueArray), 32},
{NULL, 0, 0}
};