gst/videobox/gstvideobox.c: Use new basetransform method to renegotiate. Fixes #544956.

Original commit message from CVS:
* gst/videobox/gstvideobox.c: (gst_video_box_set_property):
Use new basetransform method to renegotiate. Fixes #544956.
* tests/icles/Makefile.am:
* tests/icles/videobox-test.c: (make_pipeline), (main):
Add videobox renegotiation example.

diff --git a/ChangeLog b/ChangeLog
index 65561b6..587c0fb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-08-20  Wim Taymans  <wim.taymans@collabora.co.uk>
+
+       * gst/videobox/gstvideobox.c: (gst_video_box_set_property):
+       Use new basetransform method to renegotiate. Fixes #544956.
+
+       * tests/icles/Makefile.am:
+       * tests/icles/videobox-test.c: (make_pipeline), (main):
+       Add videobox renegotiation example.
+
 2008-08-19  David Schleef  <ds@schleef.org>
 
        * gst/wavenc/gstwavenc.c: Remove depth ranges and replace

diff --git a/gst/videobox/gstvideobox.c b/gst/videobox/gstvideobox.c
index 865a84c..2f9d17d 100644 (file)
--- a/gst/videobox/gstvideobox.c
+++ b/gst/videobox/gstvideobox.c
@@ -305,6 +305,7 @@ gst_video_box_set_property (GObject * object, guint prop_id,
       break;
   }
   video_box_recalc_transform (video_box);
+  gst_base_transform_reconfigure (GST_BASE_TRANSFORM (video_box));
   GST_BASE_TRANSFORM_UNLOCK (GST_BASE_TRANSFORM_CAST (video_box));
 }
 

diff --git a/tests/icles/Makefile.am b/tests/icles/Makefile.am
index 529b8df..0f545ce 100644 (file)
--- a/tests/icles/Makefile.am
+++ b/tests/icles/Makefile.am
@@ -35,5 +35,10 @@ videocrop_test_CFLAGS  = $(GST_CFLAGS)
 videocrop_test_LDADD   = $(GST_LIBS)
 videocrop_test_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 
-noinst_PROGRAMS = $(GTK_TESTS) $(V4L2_TESTS) $(X_TESTS) videocrop-test
+videobox_test_SOURCES = videobox-test.c
+videobox_test_CFLAGS  = $(GST_CFLAGS)
+videobox_test_LDADD   = $(GST_LIBS)
+videobox_test_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
+
+noinst_PROGRAMS = $(GTK_TESTS) $(V4L2_TESTS) $(X_TESTS) videocrop-test videobox-test
 

diff --git a/tests/icles/videobox-test.c b/tests/icles/videobox-test.c
new file mode 100644 (file)
index 0000000..708439a
--- /dev/null
+++ b/tests/icles/videobox-test.c
@@ -0,0 +1,141 @@
+/* GStreamer interactive videobox test
+ *
+ * Copyright (C) 2008 Wim Taymans <wim.taymans@gmail.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <stdlib.h>
+
+#include <gst/gst.h>
+
+static GstElement *
+make_pipeline (gint type)
+{
+  GstElement *result;
+  gchar *pstr;
+
+  switch (type) {
+    case 0:
+      pstr = g_strdup_printf ("videotestsrc ! videobox name=box ! "
+          "xvimagesink");
+      break;
+    default:
+      return NULL;
+  }
+
+  result = gst_parse_launch_full (pstr, NULL, GST_PARSE_FLAG_NONE, NULL);
+  g_print ("created test %d: \"%s\"\n", type, pstr);
+  g_free (pstr);
+
+  return result;
+}
+
+#define MAX_ROUND 500
+
+int
+main (int argc, char **argv)
+{
+  GstElement *pipe, *box;
+  gint left, right;
+  gint top, bottom;
+  gint ldir, rdir;
+  gint tdir, bdir;
+  gint round, type, stop;
+
+  gst_init (&argc, &argv);
+
+  type = 0;
+  stop = -1;
+
+  if (argc > 1) {
+    type = atoi (argv[1]);
+    stop = type + 1;
+  }
+
+  while (TRUE) {
+    GstMessage *message;
+
+    pipe = make_pipeline (type);
+    if (pipe == NULL)
+      break;
+
+    box = gst_bin_get_by_name (GST_BIN (pipe), "box");
+    g_assert (box);
+
+    top = bottom = left = right = 0;
+    tdir = bdir = -10;
+    ldir = rdir = 10;
+
+    for (round = 0; round < MAX_ROUND; round++) {
+      g_print ("box to %d %d %d %d (%d/%d)   \r", top, bottom, left, right,
+          round, MAX_ROUND);
+
+      g_object_set (box, "top", top, "bottom", bottom, "left", left, "right",
+          right, NULL);
+
+      if (round == 0)
+        gst_element_set_state (pipe, GST_STATE_PLAYING);
+
+      top += tdir;
+      if (top >= 50)
+        tdir = -10;
+      else if (top < -50)
+        tdir = 10;
+
+      bottom += bdir;
+      if (bottom >= 40)
+        bdir = -10;
+      else if (bottom < -60)
+        bdir = 10;
+
+      left += ldir;
+      if (left >= 60)
+        ldir = -10;
+      else if (left < -80)
+        ldir = 10;
+
+      right += rdir;
+      if (right >= 80)
+        rdir = -10;
+      else if (right < -90)
+        rdir = 10;
+
+      message =
+          gst_bus_poll (GST_ELEMENT_BUS (pipe), GST_MESSAGE_ERROR,
+          50 * GST_MSECOND);
+      if (message) {
+        g_print ("got error           \n");
+
+        gst_message_unref (message);
+      }
+    }
+    g_print ("test %d done                    \n", type);
+
+    gst_object_unref (box);
+    gst_element_set_state (pipe, GST_STATE_NULL);
+    gst_object_unref (pipe);
+
+    type++;
+    if (type == stop)
+      break;
+  }
+  return 0;
+}