From ec5122f8d30d383a481cad297b89347ac9649952 Mon Sep 17 00:00:00 2001 From: David Schleef Date: Wed, 8 Oct 2003 07:49:11 +0000 Subject: [PATCH] new proggy I never checked in Original commit message from CVS: new proggy I never checked in --- tests/old/testsuite/caps/Makefile.am | 5 +++- tests/old/testsuite/caps/intersect2.c | 44 +++++++++++++++++++++++++++++++++++ testsuite/caps/Makefile.am | 5 +++- testsuite/caps/intersect2.c | 44 +++++++++++++++++++++++++++++++++++ 4 files changed, 96 insertions(+), 2 deletions(-) create mode 100644 tests/old/testsuite/caps/intersect2.c create mode 100644 testsuite/caps/intersect2.c diff --git a/tests/old/testsuite/caps/Makefile.am b/tests/old/testsuite/caps/Makefile.am index 38dc72c..b935003 100644 --- a/tests/old/testsuite/caps/Makefile.am +++ b/tests/old/testsuite/caps/Makefile.am @@ -1,7 +1,7 @@ TOP_BUILDDIR=$(shell cd $(top_builddir) && pwd) TESTS_ENVIRONMENT = GST_PLUGIN_PATH=$(TOP_BUILDDIR) GST_REGISTRY=$(TOP_BUILDDIR)/testsuite/test-registry.xml -testprogs = intersection compatibility normalisation union string-conversions fixed +testprogs = intersection compatibility normalisation union string-conversions fixed intersect2 # we run gst-register here, which is a HACK to generate the test registry # before we actually run the real tests @@ -22,3 +22,6 @@ string_conversions_LDADD = $(GST_LIBS) string_conversions_CFLAGS = $(GST_CFLAGS) $(GNOME_CFLAGS) $(XML_CFLAGS) fixed_LDADD = $(GST_LIBS) fixed_CFLAGS = $(GST_CFLAGS) $(GNOME_CFLAGS) $(XML_CFLAGS) +intersect2_LDADD = $(GST_LIBS) +intersect2_CFLAGS = $(GST_CFLAGS) $(GNOME_CFLAGS) $(XML_CFLAGS) + diff --git a/tests/old/testsuite/caps/intersect2.c b/tests/old/testsuite/caps/intersect2.c new file mode 100644 index 0000000..a666c38 --- /dev/null +++ b/tests/old/testsuite/caps/intersect2.c @@ -0,0 +1,44 @@ +#include + +GST_CAPS_FACTORY (rawcaps1, + GST_CAPS_NEW ( + "raw1_sink_caps", + "video/raw", + "fourcc", GST_PROPS_FOURCC (GST_STR_FOURCC ("YUYV")), + "height", GST_PROPS_INT (640), + "width", GST_PROPS_INT (480), + "framerate",GST_PROPS_FLOAT (30.0) + ), + GST_CAPS_NEW ( + "raw1_sink_caps", + "video/raw", + "fourcc", GST_PROPS_FOURCC (GST_STR_FOURCC ("I420")), + "height", GST_PROPS_INT (640), + "width", GST_PROPS_INT (480), + "framerate",GST_PROPS_FLOAT (30.0) + ) +); + +int +main (int argc, char *argv[]) +{ + GstCaps *caps1; + GstCaps *caps2; + GstCaps *caps; + + gst_init (&argc, &argv); + + caps1 = GST_CAPS_GET (rawcaps1); + caps2 = gst_caps_copy_1 (GST_CAPS_GET (rawcaps1)); + + gst_caps_set(caps1, "height", GST_PROPS_INT(640)); + gst_caps_set(caps1, "width", GST_PROPS_INT(480)); + gst_caps_set(caps1, "framerate", GST_PROPS_FLOAT(30.0)); + + caps = gst_caps_intersect(caps1, caps2); + + g_print("caps %s\n", gst_caps_to_string(caps)); + + if(caps == NULL)return 1; + return 0; +} diff --git a/testsuite/caps/Makefile.am b/testsuite/caps/Makefile.am index 38dc72c..b935003 100644 --- a/testsuite/caps/Makefile.am +++ b/testsuite/caps/Makefile.am @@ -1,7 +1,7 @@ TOP_BUILDDIR=$(shell cd $(top_builddir) && pwd) TESTS_ENVIRONMENT = GST_PLUGIN_PATH=$(TOP_BUILDDIR) GST_REGISTRY=$(TOP_BUILDDIR)/testsuite/test-registry.xml -testprogs = intersection compatibility normalisation union string-conversions fixed +testprogs = intersection compatibility normalisation union string-conversions fixed intersect2 # we run gst-register here, which is a HACK to generate the test registry # before we actually run the real tests @@ -22,3 +22,6 @@ string_conversions_LDADD = $(GST_LIBS) string_conversions_CFLAGS = $(GST_CFLAGS) $(GNOME_CFLAGS) $(XML_CFLAGS) fixed_LDADD = $(GST_LIBS) fixed_CFLAGS = $(GST_CFLAGS) $(GNOME_CFLAGS) $(XML_CFLAGS) +intersect2_LDADD = $(GST_LIBS) +intersect2_CFLAGS = $(GST_CFLAGS) $(GNOME_CFLAGS) $(XML_CFLAGS) + diff --git a/testsuite/caps/intersect2.c b/testsuite/caps/intersect2.c new file mode 100644 index 0000000..a666c38 --- /dev/null +++ b/testsuite/caps/intersect2.c @@ -0,0 +1,44 @@ +#include + +GST_CAPS_FACTORY (rawcaps1, + GST_CAPS_NEW ( + "raw1_sink_caps", + "video/raw", + "fourcc", GST_PROPS_FOURCC (GST_STR_FOURCC ("YUYV")), + "height", GST_PROPS_INT (640), + "width", GST_PROPS_INT (480), + "framerate",GST_PROPS_FLOAT (30.0) + ), + GST_CAPS_NEW ( + "raw1_sink_caps", + "video/raw", + "fourcc", GST_PROPS_FOURCC (GST_STR_FOURCC ("I420")), + "height", GST_PROPS_INT (640), + "width", GST_PROPS_INT (480), + "framerate",GST_PROPS_FLOAT (30.0) + ) +); + +int +main (int argc, char *argv[]) +{ + GstCaps *caps1; + GstCaps *caps2; + GstCaps *caps; + + gst_init (&argc, &argv); + + caps1 = GST_CAPS_GET (rawcaps1); + caps2 = gst_caps_copy_1 (GST_CAPS_GET (rawcaps1)); + + gst_caps_set(caps1, "height", GST_PROPS_INT(640)); + gst_caps_set(caps1, "width", GST_PROPS_INT(480)); + gst_caps_set(caps1, "framerate", GST_PROPS_FLOAT(30.0)); + + caps = gst_caps_intersect(caps1, caps2); + + g_print("caps %s\n", gst_caps_to_string(caps)); + + if(caps == NULL)return 1; + return 0; +} -- 2.7.4