[gst-cvs] gst-plugins-good: pulse: fix printf format in some debugging messages

[<tpm@ke...>]

Module: gst-plugins-good
Branch: master
Commit: 74b2af63fd9d69e019636bdde6c97ecbdb02b03a
URL:    http://cgit.freedesktop.org/gstreamer/gst-plugins-good/commit/?id=74b2af63fd9d69e019636bdde6c97ecbdb02b03a

Author: Tim-Philipp Müller <tim.muller@...>
Date:   Mon Aug  9 00:36:36 2010 +0100

pulse: fix printf format in some debugging messages

---

 ext/pulse/pulsesink.c |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/ext/pulse/pulsesink.c b/ext/pulse/pulsesink.c
index 3f6f7ba..a8d019c 100644
--- a/ext/pulse/pulsesink.c
+++ b/ext/pulse/pulsesink.c
@@ -1304,14 +1304,17 @@ gst_pulseringbuffer_commit (GstRingBuffer * buf, guint64 * sample,
             pbuf->m_writable);
       }
 
-      GST_LOG_OBJECT (psink, "requesting %u bytes of shared memory",
-          pbuf->m_writable);
+      GST_LOG_OBJECT (psink, "requesting %" G_GSIZE_FORMAT " bytes of "
+          "shared memory", pbuf->m_writable);
+
       if (pa_stream_begin_write (pbuf->stream, &pbuf->m_data,
               &pbuf->m_writable) < 0) {
         GST_LOG_OBJECT (psink, "pa_stream_begin_write() failed");
         goto writable_size_failed;
       }
-      GST_LOG_OBJECT (psink, "got %u bytes of shared memory", pbuf->m_writable);
+
+      GST_LOG_OBJECT (psink, "got %" G_GSIZE_FORMAT " bytes of shared memory",
+          pbuf->m_writable);
 
       /* Just to make sure that we didn't get more than requested */
       if (pbuf->m_writable > buf->spec.segsize) {

[gst-cvs] gst-plugins-ugly: x264: fix printf format warning in debug message

[<tpm@ke...>]

Module: gst-plugins-ugly
Branch: master
Commit: 5225f5cc16d9a1a2c99ff2ac7449efdc5154c0d0
URL:    http://cgit.freedesktop.org/gstreamer/gst-plugins-ugly/commit/?id=5225f5cc16d9a1a2c99ff2ac7449efdc5154c0d0

Author: Tim-Philipp Müller <tim.muller@...>
Date:   Mon Aug  9 00:31:15 2010 +0100

x264: fix printf format warning in debug message

---

 ext/x264/gstx264enc.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ext/x264/gstx264enc.c b/ext/x264/gstx264enc.c
index 131fb71..70e3981 100644
--- a/ext/x264/gstx264enc.c
+++ b/ext/x264/gstx264enc.c
@@ -1035,9 +1035,9 @@ gst_x264_enc_init_encoder (GstX264Enc * encoder)
         encoder->option_string->str);
     if (gst_x264_enc_parse_options (encoder,
             encoder->option_string->str) == FALSE) {
-      GST_DEBUG_OBJECT (encoder,
-          "Failed to parse internal option string. This could be due to use of an "
-          "old libx264 version.", encoder->option_string->str);
+      GST_DEBUG_OBJECT (encoder, "Failed to parse internal option string. "
+          "This could be due to use of an old libx264 version. Option string "
+          "was: %s", encoder->option_string->str);
     }
   }
 

[gst-cvs] gst-plugins-good: pkgconfig: set pluginsdir to top-level builddir without the pkgconfig/.. bits

[<tpm@ke...>]

Module: gst-plugins-good
Branch: master
Commit: 7cd836d93412d83ff78441e46923f4c9bf488269
URL:    http://cgit.freedesktop.org/gstreamer/gst-plugins-good/commit/?id=7cd836d93412d83ff78441e46923f4c9bf488269

Author: Tim-Philipp Müller <tim.muller@...>
Date:   Sun Aug  8 23:31:42 2010 +0100

pkgconfig: set pluginsdir to top-level builddir without the pkgconfig/.. bits

Removes clutter in plugin dir paths. This is only used to find the -good
plugins for unit tests of ugly/bad/ffmpeg/etc. in an uninstalled setup.

---

 pkgconfig/gstreamer-plugins-good-uninstalled.pc.in |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgconfig/gstreamer-plugins-good-uninstalled.pc.in b/pkgconfig/gstreamer-plugins-good-uninstalled.pc.in
index 0042df3..7294834 100644
--- a/pkgconfig/gstreamer-plugins-good-uninstalled.pc.in
+++ b/pkgconfig/gstreamer-plugins-good-uninstalled.pc.in
@@ -1,8 +1,8 @@
 prefix=
 exec_prefix=
-libdir=${pcfiledir}/../gst-libs/gst
-includedir=${pcfiledir}/../gst-libs
-pluginsdir=${pcfiledir}/..
+libdir=@abs_top_builddir@/gst-libs/gst
+includedir=@abs_top_builddir@/gst-libs
+pluginsdir=@abs_top_builddir@
 
 Name: GStreamer Good Plugins, Uninstalled
 Description: Streaming media framework, good plugins, uninstalled

[gst-cvs] gst-plugins-bad: vdpaumpeg4dec: fix typo in default_non_intra_quant_matrix

[<satis@ke...>]

Module: gst-plugins-bad
Branch: master
Commit: 629b6ff099cadc03eb3f252e1c31e9adf732e67b
URL:    http://cgit.freedesktop.org/gstreamer/gst-plugins-bad/commit/?id=629b6ff099cadc03eb3f252e1c31e9adf732e67b

Author: Carl-Anton Ingmarsson <ca.ingmarsson@...>
Date:   Sun Aug  8 23:56:43 2010 +0200

vdpaumpeg4dec: fix typo in default_non_intra_quant_matrix

---

 sys/vdpau/mpeg4/mpeg4util.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/sys/vdpau/mpeg4/mpeg4util.c b/sys/vdpau/mpeg4/mpeg4util.c
index d7e57b6..eeccb13 100644
--- a/sys/vdpau/mpeg4/mpeg4util.c
+++ b/sys/vdpau/mpeg4/mpeg4util.c
@@ -41,7 +41,7 @@ const guint8 default_intra_quant_mat[64] = {
 };
 
 const guint8 default_non_intra_quant_mat[64] = {
-  6, 17, 18, 19, 20, 21, 22, 23,
+  16, 17, 18, 19, 20, 21, 22, 23,
   17, 18, 19, 20, 21, 22, 23, 24,
   18, 19, 20, 21, 22, 23, 24, 25,
   19, 20, 21, 22, 23, 24, 26, 27,

[gst-cvs] gst-plugins-bad: vdpau: add mpeg4 part2 decoder

[<satis@ke...>]

Module: gst-plugins-bad
Branch: master
Commit: 8612a936ecfa2b05ce539b4be575ac6d7b39c49e
URL:    http://cgit.freedesktop.org/gstreamer/gst-plugins-bad/commit/?id=8612a936ecfa2b05ce539b4be575ac6d7b39c49e

Author: Carl-Anton Ingmarsson <ca.ingmarsson@...>
Date:   Wed Jul 14 11:03:35 2010 +0200

vdpau: add mpeg4 part2 decoder

---

 sys/vdpau/Makefile.am            |   10 +-
 sys/vdpau/gstvdpau.c             |    3 +
 sys/vdpau/mpeg4/gstmpeg4frame.c  |  109 +++++++++
 sys/vdpau/mpeg4/gstmpeg4frame.h  |   64 +++++
 sys/vdpau/mpeg4/gstvdpmpeg4dec.c |  483 ++++++++++++++++++++++++++++++++++++++
 sys/vdpau/mpeg4/gstvdpmpeg4dec.h |   62 +++++
 sys/vdpau/mpeg4/mpeg4util.c      |  466 ++++++++++++++++++++++++++++++++++++
 sys/vdpau/mpeg4/mpeg4util.h      |  179 ++++++++++++++
 8 files changed, 1374 insertions(+), 2 deletions(-)

Diff:   http://cgit.freedesktop.org/gstreamer/gst-plugins-bad/diff/?id=8612a936ecfa2b05ce539b4be575ac6d7b39c49e

[gst-cvs] gstreamer: bufferlist: Initialize the GType cache for the bufferlist again

[<slomo@ke...>]

Module: gstreamer
Branch: master
Commit: 699385f71599a5364f761f8eba85596ee844288e
URL:    http://cgit.freedesktop.org/gstreamer/gstreamer/commit/?id=699385f71599a5364f761f8eba85596ee844288e

Author: Sebastian Dröge <sebastian.droege@...>
Date:   Sun Aug  8 17:57:52 2010 +0200

bufferlist: Initialize the GType cache for the bufferlist again

This was accidentially removed with last commit.

---

 gst/gstbufferlist.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/gst/gstbufferlist.c b/gst/gstbufferlist.c
index 1da1491..239f0ce 100644
--- a/gst/gstbufferlist.c
+++ b/gst/gstbufferlist.c
@@ -171,7 +171,10 @@ G_DEFINE_TYPE (GstBufferList, gst_buffer_list, GST_TYPE_MINI_OBJECT);
 void
 _gst_buffer_list_initialize (void)
 {
-  g_type_class_ref (gst_buffer_list_get_type ());
+  GType type = gst_buffer_list_get_type ();
+
+  g_type_class_ref (type);
+  _gst_buffer_list_type = type;
 }
 
 static void

[gst-cvs] gst-plugins-base: oggstream: static forward declarations are forbidden by the C standard

[<slomo@ke...>]

Module: gst-plugins-base
Branch: master
Commit: 5fd9fc13d5e2d37b803c549b2406280748c8eb84
URL:    http://cgit.freedesktop.org/gstreamer/gst-plugins-base/commit/?id=5fd9fc13d5e2d37b803c549b2406280748c8eb84

Author: Sebastian Dröge <sebastian.droege@...>
Date:   Sun Aug  8 17:42:04 2010 +0200

oggstream: static forward declarations are forbidden by the C standard

...and actually cause compiler errors on VC++. Change it to an extern
forward declaration and non-static definition.

---

 ext/ogg/gstoggstream.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ext/ogg/gstoggstream.c b/ext/ogg/gstoggstream.c
index b42b951..be774dc 100644
--- a/ext/ogg/gstoggstream.c
+++ b/ext/ogg/gstoggstream.c
@@ -78,7 +78,7 @@ struct _GstOggMap
   GstOggMapGranuleposToKeyGranuleFunc granulepos_to_key_granule_func;
 };
 
-static const GstOggMap mappers[];
+extern const GstOggMap mappers[];
 
 GstClockTime
 gst_ogg_stream_get_packet_start_time (GstOggStream * pad, ogg_packet * packet)
@@ -1557,7 +1557,7 @@ setup_kate_mapper (GstOggStream * pad, ogg_packet * packet)
 
 /* *INDENT-OFF* */
 /* indent hates our freedoms */
-static const GstOggMap mappers[] = {
+const GstOggMap mappers[] = {
   {
     "\200theora", 7, 42,
     "video/x-theora",

[gst-cvs] gst-plugins-bad: checks: skip id3mux unit tests that need id3demux if id3demux is not available

[<tpm@ke...>]

Module: gst-plugins-bad
Branch: master
Commit: 49ce307cb7957ceab2bf71ad8f75d1a44526ec85
URL:    http://cgit.freedesktop.org/gstreamer/gst-plugins-bad/commit/?id=49ce307cb7957ceab2bf71ad8f75d1a44526ec85

Author: Tim-Philipp Müller <tim.muller@...>
Date:   Sun Aug  8 12:46:01 2010 +0100

checks: skip id3mux unit tests that need id3demux if id3demux is not available

---

 tests/check/elements/id3mux.c |   27 +++++++++------------------
 1 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/tests/check/elements/id3mux.c b/tests/check/elements/id3mux.c
index 32c6ddd..42e4391 100644
--- a/tests/check/elements/id3mux.c
+++ b/tests/check/elements/id3mux.c
@@ -546,25 +546,16 @@ id3mux_suite (void)
   TCase *tc_chain = tcase_create ("general");
 
   suite_add_tcase (s, tc_chain);
-  tcase_add_test (tc_chain, test_id3mux_v2_3);
-  tcase_add_test (tc_chain, test_id3mux_v2_4);
+
+  if (gst_default_registry_check_feature_version ("id3demux",
+          GST_VERSION_MAJOR, GST_VERSION_MINOR, 0)) {
+    tcase_add_test (tc_chain, test_id3mux_v2_3);
+    tcase_add_test (tc_chain, test_id3mux_v2_4);
+  } else {
+    GST_WARNING ("id3demux element not available, skipping tests");
+  }
 
   return s;
 }
 
-int
-main (int argc, char **argv)
-{
-  int nf;
-
-  Suite *s = id3mux_suite ();
-  SRunner *sr = srunner_create (s);
-
-  gst_check_init (&argc, &argv);
-
-  srunner_run_all (sr, CK_NORMAL);
-  nf = srunner_ntests_failed (sr);
-  srunner_free (sr);
-
-  return nf;
-}
+GST_CHECK_MAIN (id3mux);

[gst-cvs] gst-plugins-bad: configure: build and dist new coloreffects plugin

[<tpm@ke...>]

Module: gst-plugins-bad
Branch: master
Commit: caa8f156b6bf03b61539c47f76aaa7818ddbc24f
URL:    http://cgit.freedesktop.org/gstreamer/gst-plugins-bad/commit/?id=caa8f156b6bf03b61539c47f76aaa7818ddbc24f

Author: Tim-Philipp Müller <tim.muller@...>
Date:   Sun Aug  8 12:26:55 2010 +0100

configure: build and dist new coloreffects plugin

Fixes make distcheck.

---

 configure.ac |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 42add81..9697ae5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -267,10 +267,10 @@ AG_GST_CHECK_PLUGIN(aiff)
 AG_GST_CHECK_PLUGIN(asfmux)
 AG_GST_CHECK_PLUGIN(audioparsers)
 AG_GST_CHECK_PLUGIN(autoconvert)
-AG_GST_CHECK_PLUGIN(camerabin)
-AG_GST_CHECK_PLUGIN(legacyresample)
 AG_GST_CHECK_PLUGIN(bayer)
+AG_GST_CHECK_PLUGIN(camerabin)
 AG_GST_CHECK_PLUGIN(cdxaparse)
+AG_GST_CHECK_PLUGIN(coloreffects)
 AG_GST_CHECK_PLUGIN(dataurisrc)
 AG_GST_CHECK_PLUGIN(dccp)
 AG_GST_CHECK_PLUGIN(debugutils)
@@ -287,6 +287,7 @@ AG_GST_CHECK_PLUGIN(id3tag)
 AG_GST_CHECK_PLUGIN(invtelecine)
 AG_GST_CHECK_PLUGIN(ivfparse)
 AG_GST_CHECK_PLUGIN(jpegformat)
+AG_GST_CHECK_PLUGIN(legacyresample)
 AG_GST_CHECK_PLUGIN(librfb)
 AG_GST_CHECK_PLUGIN(liveadder)
 AG_GST_CHECK_PLUGIN(mpegdemux)

[gst-cvs] gst-plugins-bad: frei0r: Only check the plugin filenames, not the directory names

[<slomo@ke...>]

Module: gst-plugins-bad
Branch: master
Commit: 6050642addaad34600b1c30126cc28cf90bb7dc4
URL:    http://cgit.freedesktop.org/gstreamer/gst-plugins-bad/commit/?id=6050642addaad34600b1c30126cc28cf90bb7dc4

Author: Sebastian Dröge <sebastian.droege@...>
Date:   Sun Aug  8 12:01:31 2010 +0200

frei0r: Only check the plugin filenames, not the directory names

---

 gst/frei0r/gstfrei0r.c |   15 ++++++++-------
 1 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/gst/frei0r/gstfrei0r.c b/gst/frei0r/gstfrei0r.c
index b783435..cfda108 100644
--- a/gst/frei0r/gstfrei0r.c
+++ b/gst/frei0r/gstfrei0r.c
@@ -594,7 +594,7 @@ register_plugins (GstPlugin * plugin, GHashTable * plugin_names,
   GDir *dir;
   gchar *filename;
   const gchar *entry_name;
-  gboolean ret = FALSE, this_ret;
+  gboolean ret = FALSE;
 
   GST_DEBUG ("Scanning director '%s' for frei0r plugins", path);
 
@@ -603,8 +603,6 @@ register_plugins (GstPlugin * plugin, GHashTable * plugin_names,
     return FALSE;
 
   while ((entry_name = g_dir_read_name (dir))) {
-    this_ret = FALSE;
-
     if (g_hash_table_lookup_extended (plugin_names, entry_name, NULL, NULL))
       continue;
 
@@ -614,13 +612,16 @@ register_plugins (GstPlugin * plugin, GHashTable * plugin_names,
             || g_str_has_suffix (filename, GST_EXTRA_MODULE_SUFFIX)
 #endif
         ) && g_file_test (filename, G_FILE_TEST_IS_REGULAR)) {
+      gboolean this_ret;
+
       this_ret = register_plugin (plugin, filename);
+      if (this_ret)
+        g_hash_table_insert (plugin_names, g_strdup (entry_name), NULL);
+
+      ret = ret && this_ret;
     } else if (g_file_test (filename, G_FILE_TEST_IS_DIR)) {
-      this_ret = register_plugins (plugin, plugin_names, filename);
+      ret = ret && register_plugins (plugin, plugin_names, filename);
     }
-    if (this_ret)
-      g_hash_table_insert (plugin_names, g_strdup (entry_name), NULL);
-    ret = ret && this_ret;
     g_free (filename);
   }
   g_dir_close (dir);

[gst-cvs] gst-plugins-bad: frei0r: Don't try to register/ load the same frei0r plugin at different locations twice

[<slomo@ke...>]

Module: gst-plugins-bad
Branch: master
Commit: 1e3ec9e3bd798c7d9c30e328702a293ff53ec344
URL:    http://cgit.freedesktop.org/gstreamer/gst-plugins-bad/commit/?id=1e3ec9e3bd798c7d9c30e328702a293ff53ec344

Author: Sebastian Dröge <sebastian.droege@...>
Date:   Sun Aug  8 11:56:42 2010 +0200

frei0r: Don't try to register/load the same frei0r plugin at different locations twice

This could happen because for example /usr/lib is linked
to /usr/lib64 and both are loaded. The frei0r specification
says that the plugin init function must only be called once
and for some plugin weird things (including crashes) are
happening.

Fixes bug #623710.

---

 gst/frei0r/gstfrei0r.c |   38 +++++++++++++++++++++++++++-----------
 1 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/gst/frei0r/gstfrei0r.c b/gst/frei0r/gstfrei0r.c
index 6d2c6fc..b783435 100644
--- a/gst/frei0r/gstfrei0r.c
+++ b/gst/frei0r/gstfrei0r.c
@@ -588,12 +588,13 @@ invalid_frei0r_plugin:
 }
 
 static gboolean
-register_plugins (GstPlugin * plugin, const gchar * path)
+register_plugins (GstPlugin * plugin, GHashTable * plugin_names,
+    const gchar * path)
 {
   GDir *dir;
   gchar *filename;
   const gchar *entry_name;
-  gboolean ret = FALSE;
+  gboolean ret = FALSE, this_ret;
 
   GST_DEBUG ("Scanning director '%s' for frei0r plugins", path);
 
@@ -602,16 +603,24 @@ register_plugins (GstPlugin * plugin, const gchar * path)
     return FALSE;
 
   while ((entry_name = g_dir_read_name (dir))) {
+    this_ret = FALSE;
+
+    if (g_hash_table_lookup_extended (plugin_names, entry_name, NULL, NULL))
+      continue;
+
     filename = g_build_filename (path, entry_name, NULL);
     if ((g_str_has_suffix (filename, G_MODULE_SUFFIX)
 #ifdef GST_EXTRA_MODULE_SUFFIX
             || g_str_has_suffix (filename, GST_EXTRA_MODULE_SUFFIX)
 #endif
         ) && g_file_test (filename, G_FILE_TEST_IS_REGULAR)) {
-      ret |= register_plugin (plugin, filename);
+      this_ret = register_plugin (plugin, filename);
     } else if (g_file_test (filename, G_FILE_TEST_IS_DIR)) {
-      ret |= register_plugins (plugin, filename);
+      this_ret = register_plugins (plugin, plugin_names, filename);
     }
+    if (this_ret)
+      g_hash_table_insert (plugin_names, g_strdup (entry_name), NULL);
+    ret = ret && this_ret;
     g_free (filename);
   }
   g_dir_close (dir);
@@ -624,6 +633,7 @@ plugin_init (GstPlugin * plugin)
 {
   const gchar *homedir;
   gchar *path;
+  GHashTable *plugin_names;
 
   GST_DEBUG_CATEGORY_INIT (frei0r_debug, "frei0r", 0, "frei0r");
 
@@ -636,17 +646,23 @@ plugin_init (GstPlugin * plugin)
       "/usr/lib64/frei0r-1:/usr/local/lib64/frei0r-1",
       NULL, GST_PLUGIN_DEPENDENCY_FLAG_RECURSE);
 
+  plugin_names =
+      g_hash_table_new_full ((GHashFunc) g_str_hash, (GEqualFunc) g_str_equal,
+      (GDestroyNotify) g_free, NULL);
+
   homedir = g_get_home_dir ();
   path = g_build_filename (homedir, ".frei0r-1", NULL);
-  register_plugins (plugin, path);
+  register_plugins (plugin, plugin_names, path);
   g_free (path);
 
-  register_plugins (plugin, "/usr/local/lib/frei0r-1");
-  register_plugins (plugin, "/usr/lib/frei0r-1");
-  register_plugins (plugin, "/usr/local/lib32/frei0r-1");
-  register_plugins (plugin, "/usr/lib32/frei0r-1");
-  register_plugins (plugin, "/usr/local/lib64/frei0r-1");
-  register_plugins (plugin, "/usr/lib64/frei0r-1");
+  register_plugins (plugin, plugin_names, "/usr/local/lib/frei0r-1");
+  register_plugins (plugin, plugin_names, "/usr/lib/frei0r-1");
+  register_plugins (plugin, plugin_names, "/usr/local/lib32/frei0r-1");
+  register_plugins (plugin, plugin_names, "/usr/lib32/frei0r-1");
+  register_plugins (plugin, plugin_names, "/usr/local/lib64/frei0r-1");
+  register_plugins (plugin, plugin_names, "/usr/lib64/frei0r-1");
+
+  g_hash_table_unref (plugin_names);
 
   return TRUE;
 }