gstreamer-cvs

[gst-cvs] gst-rtsp-server: configure: set PYGOBJECT_REQ before using it

[<tp...@ke...>]

Module: gst-rtsp-server
Branch: master
Commit: 68a828ee29a446e4ed6b54e953f1f90356816841
URL:    http://cgit.freedesktop.org/gstreamer/gst-rtsp-server/commit/?id=68a828ee29a446e4ed6b54e953f1f90356816841

Author: Tim-Philipp Müller <tim...@co...>
Date:   Wed Jan 26 15:52:54 2011 +0000

configure: set PYGOBJECT_REQ before using it

https://bugzilla.gnome.org/show_bug.cgi?id=640641

---

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

diff --git a/configure.ac b/configure.ac
index 3fe547b..10b8407 100644
--- a/configure.ac
+++ b/configure.ac
@@ -112,10 +112,10 @@ fi
 AM_CHECK_PYTHON_HEADERS([HAVE_PYTHON_HEADERS=yes],[HAVE_PYTHON_HEADERS=no])
 
 dnl check for pygobject (optional, used in the bindings)
+PYGOBJECT_REQ=2.11.2
 PKG_CHECK_MODULES(PYGOBJECT, pygobject-2.0 >= $PYGOBJECT_REQ,
   [HAVE_PYGOBJECT="yes"], [HAVE_PYGOBJECT="no"])
 AC_SUBST(PYGOBJECT_CFLAGS)
-AC_SUBST(PYGOBJECT_REQ, 2.11.2)
 
 dnl check for gst-python
 PKG_CHECK_MODULES(PYGST, gst-python-0.10,

[gst-cvs] gst-plugins-base: tests: don' t run encodebin test if vorbis or theora plugins aren't available

[<tp...@ke...>]

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

Author: Tim-Philipp Müller <tim...@co...>
Date:   Wed Jan 26 15:42:48 2011 +0000

tests: don't run encodebin test if vorbis or theora plugins aren't available

---

 tests/check/Makefile.am |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am
index 0cc03a4..f284716 100644
--- a/tests/check/Makefile.am
+++ b/tests/check/Makefile.am
@@ -77,6 +77,16 @@ else
 check_theora =
 endif
 
+if USE_VORBIS
+if USE_THEORA
+check_encodebin = elements/encodebin
+else
+check_encodebin =
+endif
+else
+check_encodebin =
+endif
+
 if USE_PLUGIN_SUBPARSE
 check_subparse = elements/subparse
 else
@@ -106,7 +116,7 @@ check_PROGRAMS = \
 	elements/audiotestsrc \
 	elements/decodebin \
 	elements/decodebin2 \
-	elements/encodebin \
+	$(check_encodebin) \
 	elements/ffmpegcolorspace \
 	elements/gdpdepay \
 	elements/gdppay \

[gst-cvs] gst-plugins-base: pbutils: add description for degas images

[<tp...@ke...>]

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

Author: Tim-Philipp Müller <tim...@co...>
Date:   Wed Jan 26 09:07:26 2011 +0000

pbutils: add description for degas images

---

 gst-libs/gst/pbutils/descriptions.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/gst-libs/gst/pbutils/descriptions.c b/gst-libs/gst/pbutils/descriptions.c
index 40ae1ea..c32e3d9 100644
--- a/gst-libs/gst/pbutils/descriptions.c
+++ b/gst-libs/gst/pbutils/descriptions.c
@@ -217,6 +217,7 @@ static const FormatInfo formats[] = {
   {"image/svg+xml", "Scalable Vector Graphics (SVG)", 0},
   {"image/tiff", "TIFF", 0},
   {"image/x-cmu-raster", "CMU Raster Format", 0},
+  {"image/x-degas", "DEGAS", 0},
   {"image/x-icon", "ICO", 0},
   {"image/x-j2c", "JPEG 2000", 0},
   {"image/x-jpc", "JPEG 2000", 0},

[gst-cvs] gst-plugins-base: typefinding: use image/ x-icon as media type for ICON files

[<tp...@ke...>]

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

Author: Tim-Philipp Müller <tim...@co...>
Date:   Wed Jan 26 09:06:10 2011 +0000

typefinding: use image/x-icon as media type for ICON files

That's what we've been using so far (e.g. gdkpixbufdec).

---

 gst/typefind/gsttypefindfunctions.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/gst/typefind/gsttypefindfunctions.c b/gst/typefind/gsttypefindfunctions.c
index 6c3b1ac..55af37f 100644
--- a/gst/typefind/gsttypefindfunctions.c
+++ b/gst/typefind/gsttypefindfunctions.c
@@ -3908,7 +3908,7 @@ windows_icon_typefind (GstTypeFind * find, gpointer user_data)
     return;
 
   gst_type_find_suggest_simple (find, GST_TYPE_FIND_NEARLY_CERTAIN,
-      "image/vnd.microsoft.icon", NULL);
+      "image/x-icon", NULL);
 }
 
 
@@ -4422,7 +4422,7 @@ plugin_init (GstPlugin * plugin)
       GST_TYPE_FIND_LIKELY);
   TYPE_FIND_REGISTER_START_WITH (plugin, "application/x-yuv4mpeg",
       GST_RANK_SECONDARY, y4m_exts, "YUV4MPEG2 ", 10, GST_TYPE_FIND_LIKELY);
-  TYPE_FIND_REGISTER (plugin, "image/vnd.microsoft.icon", GST_RANK_MARGINAL,
+  TYPE_FIND_REGISTER (plugin, "image/x-icon", GST_RANK_MARGINAL,
       windows_icon_typefind, NULL, NULL, NULL, NULL);
 
 #ifdef USE_GIO

[gst-cvs] gstreamer: docs: fix a few more typos

[<tp...@ke...>]

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

Author: Zhang Wanming <Wan...@ti...>
Date:   Tue Jan 25 09:39:45 2011 +0800

docs: fix a few more typos

https://bugzilla.gnome.org/show_bug.cgi?id=640502

---

 docs/design/part-gstbin.txt      |    2 +-
 docs/design/part-gstghostpad.txt |    2 +-
 docs/random/caps                 |    2 +-
 docs/random/omega/TODO-0.1.0     |    2 +-
 docs/random/thomasvs/capturing   |    2 +-
 docs/random/wtay/events          |    2 +-
 docs/random/wtay/events3         |    2 +-
 docs/slides/outline              |    2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/docs/design/part-gstbin.txt b/docs/design/part-gstbin.txt
index 0309cca..bf486f8 100644
--- a/docs/design/part-gstbin.txt
+++ b/docs/design/part-gstbin.txt
@@ -107,7 +107,7 @@ Subclassing
 
 Subclasses of GstBin are free to implement their own add/remove implementations.
 It is a good idea to update the GList of children so that the _iterate() functions
-can still be used if the custom bin allows acces to its children.
+can still be used if the custom bin allows access to its children.
 
 Any bin subclass can also implement a custom message handler by overriding the
 default message handler.
diff --git a/docs/design/part-gstghostpad.txt b/docs/design/part-gstghostpad.txt
index 9196774..b83523b 100644
--- a/docs/design/part-gstghostpad.txt
+++ b/docs/design/part-gstghostpad.txt
@@ -55,7 +55,7 @@ Some design requirements
           +----* internal |     
 	     (------------)
 
-  Which we will abreviate to:
+  Which we will abbreviate to:
 
 	(- X --------)      
 	|            |     
diff --git a/docs/random/caps b/docs/random/caps
index 415a74a..bbcca9b 100644
--- a/docs/random/caps
+++ b/docs/random/caps
@@ -104,7 +104,7 @@ factory:
 The static autoplugger has to be carefull when connecting the mpg123
 element with the audiosink because it is theoretically possible that
 the mpg123 element outputs raw audio with a rate that cannot be
-handled by the audiosink (ex. 4000KHz). In the absense of another
+handled by the audiosink (ex. 4000KHz). In the absence of another
 audiosink with more capabilities, the autoplugging of this simple 
 pipeline will not be possible and would fail.
 
diff --git a/docs/random/omega/TODO-0.1.0 b/docs/random/omega/TODO-0.1.0
index d7c1619..498eb36 100644
--- a/docs/random/omega/TODO-0.1.0
+++ b/docs/random/omega/TODO-0.1.0
@@ -9,7 +9,7 @@ Add interface to control the level of output, both compile- and run-time
 
 (done) Make sure the build is capable of being run without any debugging noise
 
-Make sure that the absense of any of the optional libraries will not be fatal
+Make sure that the absence of any of the optional libraries will not be fatal
 
 Make sure all the old plugins don't build normally, via some configure option?
 
diff --git a/docs/random/thomasvs/capturing b/docs/random/thomasvs/capturing
index 9832c67..806e8fa 100644
--- a/docs/random/thomasvs/capturing
+++ b/docs/random/thomasvs/capturing
@@ -60,7 +60,7 @@ ELEMENTS (v4lsrc, alsasrc, osssrc)
 
 - a second element can be responsible for making the stream time-contiguous.
   (ie, T1 + D1 = T2 for all buffers).  This way they are made
-  acceptible for gapless presentation (which is useful for audio).
+  acceptable for gapless presentation (which is useful for audio).
   - The element treats the incoming stream as data-contiguous but not
     necessarily time-contiguous.
   - If the timestamps are contiguous as well, then everything is fine and
diff --git a/docs/random/wtay/events b/docs/random/wtay/events
index 5498a68..c49f6fd 100644
--- a/docs/random/wtay/events
+++ b/docs/random/wtay/events
@@ -11,7 +11,7 @@ and properties are still used for plugin-app communication).
 
 Events will be generated by either a plugin or the app. It should be
 possible for a plugin to generate an event on one of its pads and it
-should be possible for an app to insert an event on an abitrary pad in
+should be possible for an app to insert an event on an arbitrary pad in
 the pipeline.
 
 
diff --git a/docs/random/wtay/events3 b/docs/random/wtay/events3
index 493d673..0996223 100644
--- a/docs/random/wtay/events3
+++ b/docs/random/wtay/events3
@@ -11,7 +11,7 @@ and properties are still used for plugin-app communication).
 
 Events will be generated by either a plugin or the app. It should be
 possible for a plugin to generate an event on one of its pads and it
-should be possible for an app to insert an event on an abitrary pad or
+should be possible for an app to insert an event on an arbitrary pad or
 element in the pipeline.
 
 
diff --git a/docs/slides/outline b/docs/slides/outline
index 5808dbb..10fc8c0 100644
--- a/docs/slides/outline
+++ b/docs/slides/outline
@@ -3,7 +3,7 @@ Introduction (1)
 	GStreamer is a library and set of tools to build arbitrary,
 	 reconfigurable filter graphs.  It derives from the OGI Pipeline
 	 and DirectShow (docs, no experience), and is in its second
-	 generation (first was completed/abandonded *in* Atlanta on the
+	 generation (first was completed/abandoned *in* Atlanta on the
 	 way to the Linux Expo).
 	0.1.0 release is scheduled for Oct 31, 1999.
 	Will cover Background, Goals, Design, and Futures

[gst-cvs] gst-plugins-good: matroskamux: don' t leak ebml writer caps when re-using matroskamux

[<tp...@ke...>]

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

Author: Ognyan Tonchev <ogn...@ax...>
Date:   Wed Jan 26 08:48:43 2011 +0000

matroskamux: don't leak ebml writer caps when re-using matroskamux

https://bugzilla.gnome.org/show_bug.cgi?id=640542

---

 gst/matroska/ebml-write.c          |    6 ++++
 tests/check/elements/matroskamux.c |   51 ++++++++++++++++++++++++++++++++++++
 2 files changed, 57 insertions(+), 0 deletions(-)

diff --git a/gst/matroska/ebml-write.c b/gst/matroska/ebml-write.c
index ed39c51..b660987 100644
--- a/gst/matroska/ebml-write.c
+++ b/gst/matroska/ebml-write.c
@@ -133,6 +133,12 @@ gst_ebml_write_reset (GstEbmlWrite * ebml)
     gst_byte_writer_free (ebml->cache);
     ebml->cache = NULL;
   }
+
+  if (ebml->caps) {
+    gst_caps_unref (ebml->caps);
+    ebml->caps = NULL;
+  }
+
   ebml->last_write_result = GST_FLOW_OK;
   ebml->timestamp = GST_CLOCK_TIME_NONE;
 }
diff --git a/tests/check/elements/matroskamux.c b/tests/check/elements/matroskamux.c
index 9d6f375..bbc1862 100644
--- a/tests/check/elements/matroskamux.c
+++ b/tests/check/elements/matroskamux.c
@@ -387,6 +387,56 @@ GST_START_TEST (test_block_group)
 
 GST_END_TEST;
 
+GST_START_TEST (test_reset)
+{
+  GstElement *matroskamux;
+  GstBuffer *inbuffer;
+  GstBuffer *outbuffer;
+  int num_buffers;
+  int i;
+
+  matroskamux = setup_matroskamux (&srcac3template);
+  fail_unless (gst_element_set_state (matroskamux,
+          GST_STATE_PLAYING) == GST_STATE_CHANGE_SUCCESS,
+      "could not set to playing");
+
+  inbuffer = gst_buffer_new_and_alloc (1);
+  ASSERT_BUFFER_REFCOUNT (inbuffer, "inbuffer", 1);
+  fail_unless (gst_pad_push (mysrcpad, inbuffer) == GST_FLOW_OK);
+  num_buffers = g_list_length (buffers);
+  fail_unless (num_buffers >= 1,
+      "expected at least 1 buffer, but got only %d", num_buffers);
+
+  fail_unless (gst_element_set_state (matroskamux,
+          GST_STATE_NULL) == GST_STATE_CHANGE_SUCCESS, "could not set to null");
+
+  fail_unless (gst_element_set_state (matroskamux,
+          GST_STATE_PLAYING) == GST_STATE_CHANGE_SUCCESS,
+      "could not set to playing");
+
+  inbuffer = gst_buffer_new_and_alloc (1);
+  ASSERT_BUFFER_REFCOUNT (inbuffer, "inbuffer", 1);
+  fail_unless (gst_pad_push (mysrcpad, inbuffer) == GST_FLOW_OK);
+  num_buffers = g_list_length (buffers);
+  fail_unless (num_buffers >= 2,
+      "expected at least 2 buffers, but got only %d", num_buffers);
+
+  for (i = 0; i < num_buffers; ++i) {
+    outbuffer = GST_BUFFER (buffers->data);
+    fail_if (outbuffer == NULL);
+    buffers = g_list_remove (buffers, outbuffer);
+
+    ASSERT_BUFFER_REFCOUNT (outbuffer, "outbuffer", 1);
+    gst_buffer_unref (outbuffer);
+  }
+
+  cleanup_matroskamux (matroskamux);
+  g_list_free (buffers);
+  buffers = NULL;
+}
+
+GST_END_TEST;
+
 static Suite *
 matroskamux_suite (void)
 {
@@ -397,6 +447,7 @@ matroskamux_suite (void)
   tcase_add_test (tc_chain, test_ebml_header);
   tcase_add_test (tc_chain, test_vorbis_header);
   tcase_add_test (tc_chain, test_block_group);
+  tcase_add_test (tc_chain, test_reset);
 
   return s;
 }

[gst-cvs] gst-plugins-good: rtpjitterbuffer: don't divide by 0

[<en...@ke...>]

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

Author: Stefan Kost <en...@us...>
Date:   Tue Jan 25 21:56:19 2011 +0200

rtpjitterbuffer: don't divide by 0

---

 gst/rtpmanager/rtpjitterbuffer.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/gst/rtpmanager/rtpjitterbuffer.c b/gst/rtpmanager/rtpjitterbuffer.c
index 59307df..341388b 100644
--- a/gst/rtpmanager/rtpjitterbuffer.c
+++ b/gst/rtpmanager/rtpjitterbuffer.c
@@ -283,7 +283,7 @@ update_buffer_level (RTPJitterBuffer * jbuf, gint * percent)
   if (post) {
     gint perc;
 
-    if (jbuf->buffering) {
+    if (jbuf->buffering && (jbuf->high_level != 0)) {
       perc = (level * 100 / jbuf->high_level);
       perc = MIN (perc, 100);
     } else {

[gst-cvs] gst-plugins-base: snapshot: use a keyframe seek

[<en...@ke...>]

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

Author: Stefan Kost <en...@us...>
Date:   Tue Jan 18 10:20:29 2011 +0200

snapshot: use a keyframe seek

One would usualy get good quality snapshots quickly. The exact seek position
does not really matter.

---

 tests/examples/snapshot/snapshot.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/examples/snapshot/snapshot.c b/tests/examples/snapshot/snapshot.c
index 335c836..14f2809 100644
--- a/tests/examples/snapshot/snapshot.c
+++ b/tests/examples/snapshot/snapshot.c
@@ -99,8 +99,8 @@ main (int argc, char *argv[])
    * by seeking to somewhere else we have a bigger chance of getting something
    * more interesting. An optimisation would be to detect black images and then
    * seek a little more */
-  gst_element_seek_simple (pipeline, GST_FORMAT_TIME, GST_SEEK_FLAG_FLUSH,
-      position);
+  gst_element_seek_simple (pipeline, GST_FORMAT_TIME,
+      GST_SEEK_FLAG_KEY_UNIT | GST_SEEK_FLAG_FLUSH, position);
 
   /* get the preroll buffer from appsink, this block untils appsink really
    * prerolls */

[gst-cvs] gst-plugins-base: snapshot: add a newline to the usage and error output

[<en...@ke...>]

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

Author: Stefan Kost <en...@us...>
Date:   Mon Jan 17 23:13:29 2011 +0200

snapshot: add a newline to the usage and error output

---

 tests/examples/snapshot/snapshot.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/examples/snapshot/snapshot.c b/tests/examples/snapshot/snapshot.c
index b307111..335c836 100644
--- a/tests/examples/snapshot/snapshot.c
+++ b/tests/examples/snapshot/snapshot.c
@@ -41,7 +41,7 @@ main (int argc, char *argv[])
   gst_init (&argc, &argv);
 
   if (argc != 2) {
-    g_print ("usage: %s <uri>\n Writes snapshot.png in the current directory",
+    g_print ("usage: %s <uri>\n Writes snapshot.png in the current directory\n",
         argv[0]);
     exit (-1);
   }
@@ -53,7 +53,7 @@ main (int argc, char *argv[])
   pipeline = gst_parse_launch (descr, &error);
 
   if (error != NULL) {
-    g_print ("could not construct pipeline: %s", error->message);
+    g_print ("could not construct pipeline: %s\n", error->message);
     g_error_free (error);
     exit (-1);
   }

[gst-cvs] gstreamer: docs: flesh out typefindelement docs some more

[<tp...@ke...>]

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

Author: Tim-Philipp Müller <tim...@co...>
Date:   Tue Jan 25 18:48:40 2011 +0000

docs: flesh out typefindelement docs some more

Mention that have-type signal may be emitted from streaming
thread or application thread, and fix a typo.

---

 plugins/elements/gsttypefindelement.c |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/plugins/elements/gsttypefindelement.c b/plugins/elements/gsttypefindelement.c
index e584e3e..0b545e0 100644
--- a/plugins/elements/gsttypefindelement.c
+++ b/plugins/elements/gsttypefindelement.c
@@ -26,7 +26,9 @@
  * to the found media type.
  *
  * Whenever a type is found the #GstTypeFindElement::have-type signal is
- * emitted.
+ * emitted, either from the streaming thread or the application thread
+ * (the latter may happen when typefinding is done pull-based from the
+ * state change function).
  *
  * Plugins can register custom typefinders by using #GstTypeFindFactory.
  */
@@ -53,8 +55,8 @@
  *    is assumed that the peer element is happy with whatever format we
  *    eventually read.
  *
- * By default it tries to do pull based typefinding (this avoid joining received
- * buffers and holding them back in store.)
+ * By default it tries to do pull based typefinding (this avoids joining
+ * received buffers and holding them back in store.)
  *
  * When the element has no connected srcpad, and the sinkpad can operate in
  * getrange based mode, the element starts its own task to figure out the

[gst-cvs] gst-plugins-base: decodebin2: add comment and whitespace trimming

[<en...@ke...>]

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

Author: Stefan Kost <en...@us...>
Date:   Tue Jan 25 18:03:23 2011 +0200

decodebin2: add comment and whitespace trimming

---

 gst/playback/gstdecodebin2.c |   22 ++++++++++++----------
 1 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/gst/playback/gstdecodebin2.c b/gst/playback/gstdecodebin2.c
index bcf4731..064d62e 100644
--- a/gst/playback/gstdecodebin2.c
+++ b/gst/playback/gstdecodebin2.c
@@ -667,11 +667,11 @@ gst_decode_bin_class_init (GstDecodeBinClass * klass)
    *
    * This function is emited when an array of possible factories for @caps on
    * @pad is needed. Decodebin2 will by default return an array with all
-   * compatible factories, sorted by rank. 
+   * compatible factories, sorted by rank.
    *
    * If this function returns NULL, @pad will be exposed as a final caps.
    *
-   * If this function returns an empty array, the pad will be considered as 
+   * If this function returns an empty array, the pad will be considered as
    * having an unhandled type media type.
    *
    * Returns: a #GValueArray* with a list of factories to try. The factories are
@@ -867,7 +867,7 @@ gst_decode_bin_class_init (GstDecodeBinClass * klass)
    * If set to %FALSE, then only the streams that can be decoded to the final
    * caps (see 'caps' property) will have a pad exposed. Streams that do not
    * match those caps but could have been decoded will not have decoder plugged
-   * in internally and will not have a pad exposed. 
+   * in internally and will not have a pad exposed.
    *
    * Since: 0.10.30
    */
@@ -1362,6 +1362,8 @@ analyze_new_pad (GstDecodeBin * dbin, GstElement * src, GstPad * pad,
     GstDecodeGroup *group;
     GstDecodeChain *oldchain = chain;
 
+    /* we are adding a new pad for a demuxer (see is_demuxer_element(),
+     * start a new chain for it */
     CHAIN_MUTEX_LOCK (oldchain);
     group = gst_decode_chain_get_current_group (chain);
     if (group) {
@@ -1446,7 +1448,7 @@ analyze_new_pad (GstDecodeBin * dbin, GstElement * src, GstPad * pad,
     GST_DEBUG ("Checking if we can abort early");
 
     /* 1.e Do an early check to see if the candidates are potential decoders, but
-     * due to the fact that they decode to a mediatype that is not final we don't 
+     * due to the fact that they decode to a mediatype that is not final we don't
      * need them */
 
     for (i = 0; i < factories->n_values && !dontuse; i++) {
@@ -2150,7 +2152,7 @@ caps_notify_cb (GstPad * pad, GParamSpec * unused, GstDecodeChain * chain)
   gst_object_unref (element);
 }
 
-/* Decide whether an element is a demuxer based on the 
+/* Decide whether an element is a demuxer based on the
  * klass and number/type of src pad templates it has */
 static gboolean
 is_demuxer_element (GstElement * srcelement)
@@ -2202,7 +2204,7 @@ is_demuxer_element (GstElement * srcelement)
 
 /* Returns TRUE if the caps are compatible with the caps specified in the 'caps'
  * property (which by default are the raw caps)
- * 
+ *
  * The decodebin_lock should be taken !
  */
 static gboolean
@@ -2431,7 +2433,7 @@ gst_decode_chain_new (GstDecodeBin * dbin, GstDecodeGroup * parent,
 /* The overrun callback is used to expose groups that have not yet had their
  * no_more_pads called while the (large) multiqueue overflowed. When this
  * happens we must assume that the no_more_pads will not arrive anymore and we
- * must expose the pads that we have. 
+ * must expose the pads that we have.
  */
 static void
 multi_queue_overrun_cb (GstElement * queue, GstDecodeGroup * group)
@@ -2536,7 +2538,7 @@ gst_decode_group_free (GstDecodeGroup * group)
  * unrefed here.
  *
  * Can be called from streaming threads.
- * 
+ *
  * Not MT-safe, call with parent's chain lock!
  */
 static void
@@ -2760,7 +2762,7 @@ out:
   return complete;
 }
 
-/* check if the group is drained, meaning all pads have seen an EOS 
+/* check if the group is drained, meaning all pads have seen an EOS
  * event.  */
 static void
 gst_decode_pad_handle_eos (GstDecodePad * pad)
@@ -2773,7 +2775,7 @@ gst_decode_pad_handle_eos (GstDecodePad * pad)
 }
 
 /* gst_decode_chain_handle_eos:
- * 
+ *
  * Checks if there are next groups in any parent chain
  * to which we can switch or if everything is drained.
  *

[gst-cvs] gst-plugins-base: pbutils: add description for x-annodex

[<en...@ke...>]

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

Author: Stefan Kost <en...@us...>
Date:   Wed Jan 12 14:03:12 2011 +0200

pbutils: add description for x-annodex

---

 gst-libs/gst/pbutils/descriptions.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/gst-libs/gst/pbutils/descriptions.c b/gst-libs/gst/pbutils/descriptions.c
index cd67a6b..40ae1ea 100644
--- a/gst-libs/gst/pbutils/descriptions.c
+++ b/gst-libs/gst/pbutils/descriptions.c
@@ -66,6 +66,7 @@ static const FormatInfo formats[] = {
   {"application/ogg", "Ogg", FLAG_CONTAINER},
   {"application/mxf", "Material eXchange Format (MXF)", FLAG_CONTAINER},
   {"application/vnd.rn-realmedia", "Realmedia", FLAG_CONTAINER},
+  {"application/x-annodex", "Ogg", FLAG_CONTAINER},
   {"application/x-id3", N_("ID3 tag"), FLAG_CONTAINER},
   {"application/x-ape", N_("APE tag"), FLAG_CONTAINER},
   {"application/x-apetag", N_("APE tag"), FLAG_CONTAINER},

[gst-cvs] gst-ffmpeg: codecmap: Add mapping for g722

[<bi...@ke...>]

Module: gst-ffmpeg
Branch: master
Commit: a2a4ee93c4f86cc890b1ba090531b82c036b0f62
URL:    http://cgit.freedesktop.org/gstreamer/gst-ffmpeg/commit/?id=a2a4ee93c4f86cc890b1ba090531b82c036b0f62

Author: Edward Hervey <edw...@co...>
Date:   Tue Jan 25 16:34:04 2011 +0100

codecmap: Add mapping for g722

---

 ext/ffmpeg/gstffmpegcodecmap.c |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/ext/ffmpeg/gstffmpegcodecmap.c b/ext/ffmpeg/gstffmpegcodecmap.c
index 0815443..de3bd5f 100644
--- a/ext/ffmpeg/gstffmpegcodecmap.c
+++ b/ext/ffmpeg/gstffmpegcodecmap.c
@@ -1293,6 +1293,14 @@ gst_ffmpeg_codecid_to_caps (enum CodecID codec_id,
       caps = gst_ff_aud_caps_new (context, codec_id, "audio/x-alaw", NULL);
       break;
 
+    case CODEC_ID_ADPCM_G722:
+      caps = gst_ff_aud_caps_new (context, codec_id, "audio/G722", NULL);
+      if (context)
+        gst_caps_set_simple (caps,
+            "block_align", G_TYPE_INT, context->block_align,
+            "bitrate", G_TYPE_INT, context->bit_rate, NULL);
+      break;
+
     case CODEC_ID_ADPCM_G726:
     {
       /* the G726 decoder can also handle G721 */

[gst-cvs] gstreamer: nettimeprovider: handle invalid network addresses earlier

[<en...@ke...>]

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

Author: Stefan Kost <en...@us...>
Date:   Wed Jan 12 12:58:44 2011 +0200

nettimeprovider: handle invalid network addresses earlier

Handle inet_aton() return code.

---

 libs/gst/net/gstnettimeprovider.c |   15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/libs/gst/net/gstnettimeprovider.c b/libs/gst/net/gstnettimeprovider.c
index 446e610..a3e80e0 100644
--- a/libs/gst/net/gstnettimeprovider.c
+++ b/libs/gst/net/gstnettimeprovider.c
@@ -373,8 +373,11 @@ gst_net_time_provider_start (GstNetTimeProvider * self)
   my_addr.sin_family = AF_INET; /* host byte order */
   my_addr.sin_port = htons ((gint16) self->port);       /* short, network byte order */
   my_addr.sin_addr.s_addr = INADDR_ANY;
-  if (self->address)
-    inet_aton (self->address, &my_addr.sin_addr);
+  if (self->address) {
+    ret = inet_aton (self->address, &my_addr.sin_addr);
+    if (ret == 0)
+      goto invalid_address_error;
+  }
 
   GST_DEBUG_OBJECT (self, "binding on port %d", self->port);
   ret =
@@ -428,6 +431,14 @@ setsockopt_error:
         g_strerror (errno), errno);
     return FALSE;
   }
+invalid_address_error:
+  {
+    close (self->priv->sock.fd);
+    self->priv->sock.fd = -1;
+    GST_ERROR_OBJECT (self, "invalid network address %s: %s (%d)",
+        self->address, g_strerror (errno), errno);
+    return FALSE;
+  }
 bind_error:
   {
     close (self->priv->sock.fd);

[gst-cvs] gstreamer: typefind: code and comment cleanups

[<en...@ke...>]

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

Author: Stefan Kost <en...@us...>
Date:   Wed Jan 12 16:03:57 2011 +0200

typefind: code and comment cleanups

Make code two places of the code the pushes the buffer store more similar. More
comments and debug logging.

---

 plugins/elements/gsttypefindelement.c |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/plugins/elements/gsttypefindelement.c b/plugins/elements/gsttypefindelement.c
index e32adf7..e584e3e 100644
--- a/plugins/elements/gsttypefindelement.c
+++ b/plugins/elements/gsttypefindelement.c
@@ -53,6 +53,9 @@
  *    is assumed that the peer element is happy with whatever format we
  *    eventually read.
  *
+ * By default it tries to do pull based typefinding (this avoid joining received
+ * buffers and holding them back in store.)
+ *
  * When the element has no connected srcpad, and the sinkpad can operate in
  * getrange based mode, the element starts its own task to figure out the
  * type of the stream.
@@ -646,15 +649,14 @@ gst_type_find_element_setcaps (GstPad * pad, GstCaps * caps)
     gst_type_find_element_send_cached_events (typefind);
     GST_OBJECT_LOCK (typefind);
     if (typefind->store) {
-      GstBuffer *store = typefind->store;
+      GstBuffer *store;
 
+      store = gst_buffer_make_metadata_writable (typefind->store);
       typefind->store = NULL;
-      GST_DEBUG_OBJECT (typefind, "Pushing store: %d", GST_BUFFER_SIZE (store));
-
-      store = gst_buffer_make_metadata_writable (store);
       gst_buffer_set_caps (store, typefind->caps);
       GST_OBJECT_UNLOCK (typefind);
 
+      GST_DEBUG_OBJECT (typefind, "Pushing store: %d", GST_BUFFER_SIZE (store));
       gst_pad_push (typefind->src, store);
     } else {
       GST_OBJECT_UNLOCK (typefind);
@@ -927,6 +929,8 @@ gst_type_find_element_activate (GstPad * pad)
     return gst_pad_activate_push (pad, TRUE);
   }
 
+  GST_DEBUG_OBJECT (typefind, "find type in pull mode");
+
   /* 2 */
   {
     GstPad *peer;

[gst-cvs] gstreamer: trace: ensure messages are \0 terminated

[<en...@ke...>]

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

Author: Stefan Kost <en...@us...>
Date:   Wed Jan 12 13:05:06 2011 +0200

trace: ensure messages are \0 terminated

---

 gst/gsttrace.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/gst/gsttrace.c b/gst/gsttrace.c
index 4370589..498e4c2 100644
--- a/gst/gsttrace.c
+++ b/gst/gsttrace.c
@@ -105,7 +105,7 @@ gint _gst_trace_on = 1;
  * @filename: a filename
  * @size: the max size of the file
  *
- * Create a ringbuffer of @size in the file with @filename to 
+ * Create a ringbuffer of @size in the file with @filename to
  * store trace results in.
  *
  * Free-function: gst_trace_destroy
@@ -183,7 +183,7 @@ gst_trace_flush (GstTrace * trace)
  * gst_trace_text_flush:
  * @trace: the #GstTrace to flush.
  *
- * Flush any pending trace entries in @trace to the trace file, 
+ * Flush any pending trace entries in @trace to the trace file,
  * formatted as a text line with timestamp and sequence numbers.
  * @trace can be NULL in which case the default #GstTrace will be
  * flushed.
@@ -241,6 +241,7 @@ _gst_trace_add_entry (GstTrace * trace, guint32 seq, guint32 data, gchar * msg)
   entry->sequence = seq;
   entry->data = data;
   strncpy (entry->message, msg, 112);
+  entry->message[111] = '\0';
   trace->bufoffset++;
 
   gst_trace_flush (trace);

[gst-cvs] gstreamer: registry: remove dead code

[<en...@ke...>]

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

Author: Stefan Kost <en...@us...>
Date:   Wed Jan 12 12:43:04 2011 +0200

registry: remove dead code

The GError is only used for the mmap operations. If we have an error we handle
and clean it there already.

---

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

diff --git a/gst/gstregistrybinary.c b/gst/gstregistrybinary.c
index 54f9abb..1a58837 100644
--- a/gst/gstregistrybinary.c
+++ b/gst/gstregistrybinary.c
@@ -349,7 +349,7 @@ gst_registry_binary_initialize_magic (GstBinaryRegistryMagic * m)
  * @location: a filename
  *
  * Write the @registry to a cache to file at given @location.
- * 
+ *
  * Returns: %TRUE on success.
  */
 gboolean
@@ -617,9 +617,6 @@ done:
   /* TODO: once we re-use the pointers to registry contents, return here */
 
 Error:
-  if (err)
-    g_error_free (err);
-
 #ifndef GST_DISABLE_GST_DEBUG
   g_timer_destroy (timer);
 #endif

[gst-cvs] gstreamer: docs: small controller api docs improvement

[<en...@ke...>]

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

Author: Stefan Kost <en...@us...>
Date:   Wed Jan 12 09:33:53 2011 +0200

docs: small controller api docs improvement

---

 libs/gst/controller/gstcontroller.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/libs/gst/controller/gstcontroller.c b/libs/gst/controller/gstcontroller.c
index 407bc80..9bb1d6d 100644
--- a/libs/gst/controller/gstcontroller.c
+++ b/libs/gst/controller/gstcontroller.c
@@ -767,7 +767,7 @@ gst_controller_get_value_arrays (GstController * self,
  *
  * All fields of @value_array must be filled correctly. Especially the
  * @value_array->values array must be big enough to keep the requested amount
- * of values.
+ * of values (as indicated by the nbsamples field).
  *
  * The type of the values in the array is the same as the property's type.
  *

[gst-cvs] gstreamer: checks: add a comment to indicate that we intentionally leave out the 'break'

[<en...@ke...>]

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

Author: Stefan Kost <en...@us...>
Date:   Wed Jan 12 12:44:59 2011 +0200

checks: add a comment to indicate that we intentionally leave out the 'break'

---

 libs/gst/check/gstconsistencychecker.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/libs/gst/check/gstconsistencychecker.c b/libs/gst/check/gstconsistencychecker.c
index 5253b4c..ded047e 100644
--- a/libs/gst/check/gstconsistencychecker.c
+++ b/libs/gst/check/gstconsistencychecker.c
@@ -79,6 +79,7 @@ source_pad_data_cb (GstPad * pad, GstMiniObject * data,
         break;
       case GST_EVENT_TAG:
         GST_DEBUG_OBJECT (pad, "tag %" GST_PTR_FORMAT, event->structure);
+        /* fall through */
       default:
         if (GST_EVENT_IS_SERIALIZED (event) && GST_EVENT_IS_DOWNSTREAM (event)) {
           fail_if (consist->eos, "Event received after EOS");

[gst-cvs] gstreamer: docs: mention have-type signal in the docs.

[<en...@ke...>]

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

Author: Stefan Kost <en...@us...>
Date:   Tue Jan 11 15:09:30 2011 +0200

docs: mention have-type signal in the docs.

---

 plugins/elements/gsttypefindelement.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/plugins/elements/gsttypefindelement.c b/plugins/elements/gsttypefindelement.c
index 0e97ec7..18a39bd 100644
--- a/plugins/elements/gsttypefindelement.c
+++ b/plugins/elements/gsttypefindelement.c
@@ -25,6 +25,9 @@
  * order of their rank. One the type has been deteted it sets its src pad caps
  * to the found media type.
  *
+ * Whenever a type is found the #GstTypeFindElement::have-type signal is
+ * emitted.
+ *
  * Plugins can register custom typefinders by using #GstTypeFindFactory.
  */
 
@@ -230,7 +233,7 @@ gst_type_find_element_class_init (GstTypeFindElementClass * typefind_class)
    * @probability: the probability of the type found
    * @caps: the caps of the type found
    *
-   * This signal gets emitted when the type and its probability has 
+   * This signal gets emitted when the type and its probability has
    * been found.
    */
   gst_type_find_element_signals[HAVE_TYPE] = g_signal_new ("have_type",

[gst-cvs] gstreamer: typefind: canonicalize signal name

[<en...@ke...>]

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

Author: Stefan Kost <en...@us...>
Date:   Tue Jan 11 15:09:52 2011 +0200

typefind: canonicalize signal name

---

 plugins/elements/gsttypefindelement.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/plugins/elements/gsttypefindelement.c b/plugins/elements/gsttypefindelement.c
index 18a39bd..e32adf7 100644
--- a/plugins/elements/gsttypefindelement.c
+++ b/plugins/elements/gsttypefindelement.c
@@ -236,7 +236,7 @@ gst_type_find_element_class_init (GstTypeFindElementClass * typefind_class)
    * This signal gets emitted when the type and its probability has
    * been found.
    */
-  gst_type_find_element_signals[HAVE_TYPE] = g_signal_new ("have_type",
+  gst_type_find_element_signals[HAVE_TYPE] = g_signal_new ("have-type",
       G_TYPE_FROM_CLASS (typefind_class), G_SIGNAL_RUN_FIRST,
       G_STRUCT_OFFSET (GstTypeFindElementClass, have_type), NULL, NULL,
       gst_marshal_VOID__UINT_BOXED, G_TYPE_NONE, 2,

[gst-cvs] gst-python: tests: fix checks when the locale is not the default one

[<tp...@ke...>]

Module: gst-python
Branch: master
Commit: 8c60dc788ee1babe35b73bef59840cf999bbf818
URL:    http://cgit.freedesktop.org/gstreamer/gst-python/commit/?id=8c60dc788ee1babe35b73bef59840cf999bbf818

Author: Andoni Morales Alastruey <amo...@fl...>
Date:   Fri Jan 21 18:13:57 2011 +0100

tests: fix checks when the locale is not the default one

Some tests (test_pbutils.py) checks against strings for the
english locale, so we should force it before running any test

https://bugzilla.gnome.org/show_bug.cgi?id=640207

---

 testsuite/runtests.py |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/testsuite/runtests.py b/testsuite/runtests.py
index f3e9b1f..592a4e3 100644
--- a/testsuite/runtests.py
+++ b/testsuite/runtests.py
@@ -28,6 +28,8 @@ import unittest
 
 SKIP_FILES = ['common', 'runtests']
 
+os.environ['LC_MESSAGES'] = 'C'
+
 def gettestnames(which):
     if not which:
         dir = os.path.split(os.path.abspath(__file__))[0]

[gst-cvs] www: Add George Kiagiadakis

[<ur...@ke...>]

Module: www
Branch: master
Commit: 3034d06fc300fe2780af5dd63be52073105cc18f
URL:    http://cgit.freedesktop.org/gstreamer/www/commit/?id=3034d06fc300fe2780af5dd63be52073105cc18f

Author: Christian Fredrik Kalager Schaller <chr...@co...>
Date:   Tue Jan 25 14:05:39 2011 +0000

Add George Kiagiadakis

---

 planet/config.ini |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/planet/config.ini b/planet/config.ini
index 734f475..42791d7 100644
--- a/planet/config.ini
+++ b/planet/config.ini
@@ -351,3 +351,7 @@ link = http://guij.emont.org/blog/category/geekeries/
 face = guillameemont.png
 facewidth = 65
 faceheight = 100
+
+[http://gkiagia.wordpress.com/category/gstreamer-2/feed/]
+name = George Kiagiadakis
+link = http://gkiagia.wordpress.com/category/gstreamer-2/

[gst-cvs] gst-plugins-base: typefind: add typefinder for DEGAS images

[<tp...@ke...>]

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

Author: Vincent Penquerc'h <vin...@co...>
Date:   Tue Jan 25 13:39:25 2011 +0000

typefind: add typefinder for DEGAS images

This fixes at least one DEGAS image from being misdetected as DTS audio.

https://bugzilla.gnome.org/show_bug.cgi?id=625129

---

 gst/typefind/gsttypefindfunctions.c |   51 +++++++++++++++++++++++++++++++++++
 1 files changed, 51 insertions(+), 0 deletions(-)

diff --git a/gst/typefind/gsttypefindfunctions.c b/gst/typefind/gsttypefindfunctions.c
index afdff15..6c3b1ac 100644
--- a/gst/typefind/gsttypefindfunctions.c
+++ b/gst/typefind/gsttypefindfunctions.c
@@ -3911,6 +3911,54 @@ windows_icon_typefind (GstTypeFind * find, gpointer user_data)
       "image/vnd.microsoft.icon", NULL);
 }
 
+
+/*** DEGAS Atari images (also to avoid false positives, see #625129) ***/
+static void
+degas_type_find (GstTypeFind * tf, gpointer private)
+{
+  /* No magic, but it should have a fixed size and a few invalid values */
+  /* http://www.fileformat.info/format/atari/spec/6ecf9f6eb5be494284a47feb8a214687/view.htm */
+  gint64 len;
+  const guint8 *data;
+  guint16 resolution;
+  int n;
+
+  len = gst_type_find_get_length (tf);
+  if (len < 34)                 /* smallest header of the lot */
+    return;
+  data = gst_type_find_peek (tf, 0, 4);
+  resolution = GST_READ_UINT16_BE (data);
+  if (len == 32034) {
+    /* could be DEGAS */
+    if (resolution <= 2)
+      gst_type_find_suggest_simple (tf, GST_TYPE_FIND_POSSIBLE + 5,
+          "image/x-degas", NULL);
+  } else if (len == 32066) {
+    /* could be DEGAS Elite */
+    if (resolution <= 2) {
+      data = gst_type_find_peek (tf, len - 16, 8);
+      for (n = 0; n < 4; n++) {
+        if (GST_READ_UINT16_BE (data + n * 2) > 2)
+          return;
+      }
+      gst_type_find_suggest_simple (tf, GST_TYPE_FIND_POSSIBLE + 5,
+          "image/x-degas", NULL);
+    }
+  } else if (len >= 66 && len < 32066) {
+    /* could be compressed DEGAS Elite, but it's compressed and so we can't rely on size,
+       it does have 4 16 bytes values near the end that are 0-2 though. */
+    if ((resolution & 0x8000) && (resolution & 0x7fff) <= 2) {
+      data = gst_type_find_peek (tf, len - 16, 8);
+      for (n = 0; n < 4; n++) {
+        if (GST_READ_UINT16_BE (data + n * 2) > 2)
+          return;
+      }
+      gst_type_find_suggest_simple (tf, GST_TYPE_FIND_POSSIBLE + 5,
+          "image/x-degas", NULL);
+    }
+  }
+}
+
 /*** generic typefind for streams that have some data at a specific position***/
 typedef struct
 {
@@ -4382,6 +4430,9 @@ plugin_init (GstPlugin * plugin)
       xdgmime_typefind, NULL, NULL, NULL, NULL);
 #endif
 
+  TYPE_FIND_REGISTER (plugin, "image/x-degas", GST_RANK_MARGINAL,
+      degas_type_find, NULL, NULL, NULL, NULL);
+
   return TRUE;
 }
 

[gst-cvs] www: Fix .htaccess installation

[<tp...@ke...>]

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

Author: Tim-Philipp Müller <tim...@co...>
Date:   Tue Jan 25 10:08:44 2011 +0000

Fix .htaccess installation

Not very elegant, but at least doesn't interfere with the other
rule for foo/.htaccess.

---

 src/{htdocs/.htaccess => copy/dot-htaccess} |    0 
 src/htdocs/Makefile.am                      |    5 ++++-
 2 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/src/htdocs/.htaccess b/src/copy/dot-htaccess
similarity index 100%
rename from src/htdocs/.htaccess
rename to src/copy/dot-htaccess
diff --git a/src/htdocs/Makefile.am b/src/htdocs/Makefile.am
index 0bb776a..0b286f9 100644
--- a/src/htdocs/Makefile.am
+++ b/src/htdocs/Makefile.am
@@ -24,6 +24,9 @@ data:
 robots.txt: $(top_srcdir)/copy/robots.txt
 	cp $(top_srcdir)/copy/robots.txt $@
 
-all-local: media pkg src data robots.txt
+toplevel-htaccess: $(top_srcdir)/copy/dot-htaccess
+	cp $(top_srcdir)/copy/dot-htaccess .htaccess
+
+all-local: media pkg src data robots.txt toplevel-htaccess
 
 include $(top_srcdir)/html.make