From: Benjamin O. <co...@pd...> - 2004-04-27 16:00:14
|
CVS Root: /home/cvs/gstreamer Module: gst-plugins Changes by: company Date: Tue Apr 27 2004 09:00:09 PDT Log message: * gst/monoscope/gstmonoscope.c: make sure we only provide 256x128 * gst/monoscope/monoscope.c: (monoscope_init): assert size of 256x128 Modified files: . : ChangeLog gst/monoscope : gstmonoscope.c monoscope.c Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/ChangeLog.diff?r1=1.573&r2=1.574 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/gst/monoscope/gstmonoscope.c.diff?r1=1.28&r2=1.29 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/gst/monoscope/monoscope.c.diff?r1=1.7&r2=1.8 ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /home/cvs/gstreamer/gst-plugins/ChangeLog,v retrieving revision 1.573 retrieving revision 1.574 diff -u -d -r1.573 -r1.574 --- a/ChangeLog 27 Apr 2004 15:08:22 -0000 1.573 +++ b/ChangeLog 27 Apr 2004 15:59:57 -0000 1.574 @@ -1,3 +1,10 @@ +2004-04-27 Benjamin Otte <in...@pu...> + + * gst/monoscope/gstmonoscope.c: + make sure we only provide 256x128 + * gst/monoscope/monoscope.c: (monoscope_init): + assert size of 256x128 2004-04-27 Thomas Vander Stichele <thomas at apestaart dot org> * Makefile.am: Index: gstmonoscope.c RCS file: /home/cvs/gstreamer/gst-plugins/gst/monoscope/gstmonoscope.c,v retrieving revision 1.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- a/gstmonoscope.c 15 Mar 2004 19:32:07 -0000 1.28 +++ b/gstmonoscope.c 27 Apr 2004 15:59:57 -0000 1.29 @@ -88,7 +88,20 @@ static GstStaticPadTemplate src_template = GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_SRC, GST_PAD_ALWAYS, - GST_STATIC_CAPS (GST_VIDEO_CAPS_xRGB_HOST_ENDIAN) + GST_STATIC_CAPS ("video/x-raw-rgb, " + "bpp = (int) 32, " + "depth = (int) 24, " "endianness = (int) BIG_ENDIAN, " +#if G_BYTE_ORDER == G_BIG_ENDIAN + "red_mask = (int) " GST_VIDEO_BYTE2_MASK_32 ", " + "green_mask = (int) " GST_VIDEO_BYTE3_MASK_32 ", " + "blue_mask = (int) " GST_VIDEO_BYTE4_MASK_32 ", " +#else + "red_mask = (int) " GST_VIDEO_BYTE3_MASK_32 ", " + "green_mask = (int) " GST_VIDEO_BYTE2_MASK_32 ", " + "blue_mask = (int) " GST_VIDEO_BYTE1_MASK_32 ", " +#endif + "width = (int)256, " + "height = (int)128, " "framerate = " GST_VIDEO_FPS_RANGE) ); static GstStaticPadTemplate sink_template = GST_STATIC_PAD_TEMPLATE ("sink", Index: monoscope.c RCS file: /home/cvs/gstreamer/gst-plugins/gst/monoscope/monoscope.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- a/monoscope.c 15 Mar 2004 19:32:07 -0000 1.7 +++ b/monoscope.c 27 Apr 2004 15:59:57 -0000 1.8 @@ -45,6 +45,10 @@ monoscope_init (guint32 resx, guint32 resy) { struct monoscope_state *stateptr; + /* I didn't program monoscope to only do 256*128, but it works that way */ + g_return_val_if_fail (resx == 256, 0); + g_return_val_if_fail (resy == 128, 0); stateptr = calloc (1, sizeof (struct monoscope_state)); if (stateptr == 0) return 0; |