From: David S. <dsc...@us...> - 2003-10-29 03:22:08
|
CVS Root: /cvsroot/gstreamer Module: gst-plugins Changes by: dschleef Date: Tue Oct 28 2003 19:22:06 PST Log message: Clean up a warning Modified files: gst/typefind : gsttypefindfunctions.c Links: http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/gst/typefind/gsttypefindfunctions.c.diff?r1=1.2&r2=1.3 ====Begin Diffs==== Index: gsttypefindfunctions.c =================================================================== RCS file: /cvsroot/gstreamer/gst-plugins/gst/typefind/gsttypefindfunctions.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- gsttypefindfunctions.c 28 Oct 2003 20:52:41 -0000 1.2 +++ gsttypefindfunctions.c 29 Oct 2003 03:21:54 -0000 1.3 @@ -567,7 +567,7 @@ static void mpeg1_sys_type_find (GstTypeFind *tf, gpointer unused) { - guint8 *data; + guint8 *data = NULL; guint size = 0; guint64 skipped = 0; |
From: David S. <dsc...@us...> - 2003-11-06 00:06:17
|
CVS Root: /cvsroot/gstreamer Module: gst-plugins Changes by: dschleef Date: Wed Nov 05 2003 16:06:16 PST Log message: Add 'pnot' as a valid atom name in quicktime Modified files: gst/typefind : gsttypefindfunctions.c Links: http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/gst/typefind/gsttypefindfunctions.c.diff?r1=1.9&r2=1.10 ====Begin Diffs==== Index: gsttypefindfunctions.c =================================================================== RCS file: /cvsroot/gstreamer/gst-plugins/gst/typefind/gsttypefindfunctions.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- gsttypefindfunctions.c 31 Oct 2003 20:03:26 -0000 1.9 +++ gsttypefindfunctions.c 6 Nov 2003 00:06:03 -0000 1.10 @@ -625,6 +625,7 @@ if (strncmp (&data[4], "wide", 4) != 0 && strncmp (&data[4], "moov", 4) != 0 && strncmp (&data[4], "mdat", 4) != 0 && + strncmp (&data[4], "pnot", 4) != 0 && strncmp (&data[4], "free", 4) != 0) { tip = 0; break; |
From: David S. <dsc...@us...> - 2003-11-06 02:29:44
|
CVS Root: /cvsroot/gstreamer Module: gst-plugins Changes by: dschleef Date: Wed Nov 05 2003 18:29:43 PST Log message: Added mpeg/video video stream typefinding Modified files: gst/typefind : gsttypefindfunctions.c Links: http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/gst/typefind/gsttypefindfunctions.c.diff?r1=1.10&r2=1.11 ====Begin Diffs==== Index: gsttypefindfunctions.c =================================================================== RCS file: /cvsroot/gstreamer/gst-plugins/gst/typefind/gsttypefindfunctions.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- gsttypefindfunctions.c 6 Nov 2003 00:06:03 -0000 1.10 +++ gsttypefindfunctions.c 6 Nov 2003 02:29:30 -0000 1.11 @@ -611,6 +611,24 @@ } } +/*** video/mpeg video stream **************************************************/ + +#define MPEG_VIDEO_CAPS \ + GST_CAPS_NEW ("mpeg_type_find", "video/mpeg", \ + "systemstream", GST_PROPS_BOOLEAN (FALSE)) +static void +mpeg_video_type_find (GstTypeFind *tf, gpointer unused) +{ + static const guint8 sequence_header[] = { 0x00, 0x00, 0x01, 0xb3 }; + guint8 *data = NULL; + + data = gst_type_find_peek (tf, 0, 8); + + if (data && memcmp(data, sequence_header, 4)==0){ + gst_type_find_suggest (tf, GST_TYPE_FIND_MAXIMUM, MPEG_VIDEO_CAPS); + } +} + /*** video/quicktime***********************************************************/ #define QT_CAPS gst_caps_new ("qt_typefind", "video/quicktime", NULL) @@ -1093,6 +1111,7 @@ "s3m", "stm", "stx", "ult", "xm", NULL}; static gchar * mp3_exts[] = {"mp3", "mp2", "mp1", "mpga", NULL}; static gchar * mpeg_sys_exts[] = {"mpe", "mpeg", "mpg", NULL}; + static gchar * mpeg_video_exts[] = {"mpv", "mpeg", "mpg", NULL}; static gchar * ogg_exts[] = {"ogg", NULL}; static gchar * qt_exts[] = {"mov", NULL}; static gchar * rm_exts[] = {"ra", "ram", "rm", NULL}; @@ -1142,6 +1161,8 @@ mpeg2_sys_type_find, mpeg_sys_exts, MPEG_SYS_CAPS (2), NULL); TYPE_FIND_REGISTER (plugin, "application/ogg", GST_RANK_PRIMARY, ogg_type_find, ogg_exts, OGG_CAPS, NULL); + TYPE_FIND_REGISTER (plugin, "video/mpeg", GST_RANK_SECONDARY, + mpeg_video_type_find, mpeg_video_exts, MPEG_VIDEO_CAPS, NULL); TYPE_FIND_REGISTER (plugin, "video/quicktime", GST_RANK_SECONDARY, qt_type_find, qt_exts, QT_CAPS, NULL); TYPE_FIND_REGISTER (plugin, "application/vnd.rn-realmedia", GST_RANK_SECONDARY, |
From: David S. <dsc...@us...> - 2003-11-06 03:29:49
|
CVS Root: /cvsroot/gstreamer Module: gst-plugins Changes by: dschleef Date: Wed Nov 05 2003 19:29:49 PST Log message: Add 'PICT' as possible qt atom type Modified files: gst/typefind : gsttypefindfunctions.c Links: http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/gst/typefind/gsttypefindfunctions.c.diff?r1=1.11&r2=1.12 ====Begin Diffs==== Index: gsttypefindfunctions.c =================================================================== RCS file: /cvsroot/gstreamer/gst-plugins/gst/typefind/gsttypefindfunctions.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- gsttypefindfunctions.c 6 Nov 2003 02:29:30 -0000 1.11 +++ gsttypefindfunctions.c 6 Nov 2003 03:29:36 -0000 1.12 @@ -644,6 +644,7 @@ strncmp (&data[4], "moov", 4) != 0 && strncmp (&data[4], "mdat", 4) != 0 && strncmp (&data[4], "pnot", 4) != 0 && + strncmp (&data[4], "PICT", 4) != 0 && strncmp (&data[4], "free", 4) != 0) { tip = 0; break; |