CVSROOT: /sources/gnash
Module name: gnash
Changes by: Bastiaan Jacques <bjacques> 08/01/30 06:10:11
Modified files:
. : ChangeLog
server/asobj : NetStreamGst.cpp NetStreamGst.h
Log message:
Warn if decodebin can't find a decoder for the requested stream.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5522&r2=1.5523
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStreamGst.cpp?cvsroot=gnash&r1=1.75&r2=1.76
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStreamGst.h?cvsroot=gnash&r1=1.32&r2=1.33
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5522
retrieving revision 1.5523
diff -u -b -r1.5522 -r1.5523
--- ChangeLog 29 Jan 2008 22:31:51 -0000 1.5522
+++ ChangeLog 30 Jan 2008 06:10:09 -0000 1.5523
@@ -1,3 +1,8 @@
+2008-01-29 Bastiaan Jacques <[EMAIL PROTECTED]>
+
+ * server/asobj/NetStreamGst.{cpp,h}: Warn if decodebin can't find a
+ decoder for the requested stream.
+
2008-01-29 Sandro Santilli <[EMAIL PROTECTED]>
* testsuite/misc-swfmill.all/Makefile.am: distribute swfmill
Index: server/asobj/NetStreamGst.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStreamGst.cpp,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -b -r1.75 -r1.76
--- server/asobj/NetStreamGst.cpp 27 Jan 2008 07:18:19 -0000 1.75
+++ server/asobj/NetStreamGst.cpp 30 Jan 2008 06:10:10 -0000 1.76
@@ -71,6 +71,7 @@
GstElement* decoder = gst_element_factory_make ("decodebin", NULL);
g_signal_connect (decoder, "new-decoded-pad", G_CALLBACK
(NetStreamGst::decodebin_newpad_cb), this);
+ g_signal_connect (decoder, "unknown-type", G_CALLBACK
(NetStreamGst::decodebin_unknown_cb), this);
gst_bin_add_many (GST_BIN (_pipeline), _dataqueue, decoder, NULL);
gst_element_link(_dataqueue, decoder);
@@ -635,6 +636,17 @@
}
void
+NetStreamGst::decodebin_unknown_cb(GstElement* /*decodebin*/, GstPad* pad,
+ GstCaps *caps, gpointer user_data)
+{
+ GstStructure* str = gst_caps_get_structure (caps, 0);
+ const gchar* structure_name = gst_structure_get_name (str);
+
+ log_error(_("Couldn't find a decoder for stream type %s!"), structure_name);
+}
+
+
+void
NetStreamGst::queue_underrun_cb(GstElement* /*queue*/, gpointer user_data)
{
NetStreamGst* ns = static_cast<NetStreamGst*>(user_data);
Index: server/asobj/NetStreamGst.h
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStreamGst.h,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- server/asobj/NetStreamGst.h 22 Jan 2008 08:39:08 -0000 1.32
+++ server/asobj/NetStreamGst.h 30 Jan 2008 06:10:10 -0000 1.33
@@ -15,7 +15,7 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-/* $Id: NetStreamGst.h,v 1.32 2008/01/22 08:39:08 bjacques Exp $ */
+/* $Id: NetStreamGst.h,v 1.33 2008/01/30 06:10:10 bjacques Exp $ */
#ifndef __NETSTREAMGST_H__
#define __NETSTREAMGST_H__
@@ -65,6 +65,9 @@
static void
decodebin_newpad_cb(GstElement* decodebin, GstPad* pad, gboolean last,
gpointer user_data);
+ static void
+ decodebin_unknown_cb(GstElement* decodebin, GstPad* pad, GstCaps* caps,
+ gpointer user_data);
static void queue_underrun_cb(GstElement *queue, gpointer user_data);
_______________________________________________
Gnash-commit mailing list
Gnash-commit@gnu.org
http://lists.gnu.org/mailman/listinfo/gnash-commit
