From: Thomas V. S. <tho...@us...> - 2002-04-28 19:38:19
|
CVS Root: /cvsroot/gstreamer Module: gstreamer Changes by: thomasvs Date: Sun Apr 28 2002 10:09:11 PDT Log message: rename operation Modified files: gst/elements : Makefile.am gstelements.c Added files: gst/elements : gstfilesink.c gstfilesink.h Links: http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/elements/Makefile.am.diff?r1=1.46&r2=1.47 http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/elements/gstelements.c.diff?r1=1.39&r2=1.40 http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/elements/gstfilesink.c?rev=1.1&content-type=text/vnd.viewcvs-markup http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/elements/gstfilesink.h?rev=1.1&content-type=text/vnd.viewcvs-markup ====Begin Diffs==== Index: Makefile.am =================================================================== RCS file: /cvsroot/gstreamer/gstreamer/gst/elements/Makefile.am,v retrieving revision 1.46 retrieving revision 1.47 diff -u -d -r1.46 -r1.47 --- Makefile.am 19 Mar 2002 05:46:38 -0000 1.46 +++ Makefile.am 28 Apr 2002 17:08:59 -0000 1.47 @@ -9,7 +9,7 @@ gstidentity.c \ gstfakesink.c \ gstfilesrc.c \ - gstdisksink.c \ + gstfilesink.c \ gstfdsrc.c \ gstfdsink.c \ gstmultidisksrc.c \ @@ -26,7 +26,7 @@ gstfakesrc.h \ gstidentity.h \ gstfakesink.h \ - gstdisksink.h \ + gstfilesink.h \ gstfdsrc.h \ gstmultidisksrc.h \ gstfdsink.h \ Index: gstelements.c =================================================================== RCS file: /cvsroot/gstreamer/gstreamer/gst/elements/gstelements.c,v retrieving revision 1.39 retrieving revision 1.40 diff -u -d -r1.39 -r1.40 --- gstelements.c 11 Apr 2002 20:35:15 -0000 1.39 +++ gstelements.c 28 Apr 2002 17:08:59 -0000 1.40 @@ -23,7 +23,7 @@ #include <gst/gst.h> -#include "gstdisksink.h" +#include "gstfilesink.h" #include "gstidentity.h" #include "gstfakesink.h" #include "gstfakesrc.h" @@ -52,7 +52,7 @@ { "fakesrc", gst_fakesrc_get_type, &gst_fakesrc_details, gst_fakesrc_factory_init }, { "fakesink", gst_fakesink_get_type, &gst_fakesink_details, gst_fakesink_factory_init }, { "filesrc", gst_filesrc_get_type, &gst_filesrc_details, NULL }, - { "disksink", gst_disksink_get_type, &gst_disksink_details, NULL }, + { "filesink", gst_filesink_get_type, &gst_filesink_details, NULL }, { "identity", gst_identity_get_type, &gst_identity_details, NULL }, { "fdsink", gst_fdsink_get_type, &gst_fdsink_details, NULL }, { "fdsrc", gst_fdsrc_get_type, &gst_fdsrc_details, NULL }, --- NEW FILE: gstfilesink.c --- /* GStreamer * Copyright (C) 1999,2000 Erik Walthinsen <om...@cs...> * 2000 Wim Taymans <wt...@ch...> * * gstfilesink.c: * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public * License as published by the Free Software Foundation; either * version 2 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Library General Public License for more details. * * You should have received a copy of the GNU Library General Public * License along with this library; if not, write to the * Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. */ #include <gst/gst.h> #include <errno.h> #include "gstfilesink.h" #include <string.h> GstElementDetails gst_filesink_details = { "File Sink", "Sink/File", "Write stream to a file", VERSION, "Thomas <th...@ap...>", "(C) 2001" }; /* FileSink signals and args */ enum { /* FILL ME */ SIGNAL_HANDOFF, LAST_SIGNAL }; enum { ARG_0, ARG_LOCATION, ARG_MAXFILESIZE, }; static void gst_filesink_class_init (GstFileSinkClass *klass); static void gst_filesink_init (GstFileSink *filesink); static void gst_filesink_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec); static void gst_filesink_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec); static gboolean gst_filesink_open_file (GstFileSink *sink); static void gst_filesink_close_file (GstFileSink *sink); static gboolean gst_filesink_handle_event (GstPad *pad, GstEvent *event); static void gst_filesink_chain (GstPad *pad,GstBuffer *buf); static GstElementStateReturn gst_filesink_change_state (GstElement *element); static GstElementClass *parent_class = NULL; static guint gst_filesink_signals[LAST_SIGNAL] = { 0 }; GType gst_filesink_get_type (void) { static GType filesink_type = 0; if (!filesink_type) { static const GTypeInfo filesink_info = { sizeof(GstFileSinkClass), NULL, NULL, (GClassInitFunc)gst_filesink_class_init, NULL, NULL, sizeof(GstFileSink), 0, (GInstanceInitFunc)gst_filesink_init, }; filesink_type = g_type_register_static (GST_TYPE_ELEMENT, "GstFileSink", &filesink_info, 0); } return filesink_type; } static void gst_filesink_class_init (GstFileSinkClass *klass) { GObjectClass *gobject_class; GstElementClass *gstelement_class; gobject_class = (GObjectClass*)klass; gstelement_class = (GstElementClass*)klass; parent_class = g_type_class_ref (GST_TYPE_ELEMENT); gst_element_class_install_std_props ( GST_ELEMENT_CLASS (klass), "location", ARG_LOCATION, G_PARAM_READWRITE, NULL); g_object_class_install_property(G_OBJECT_CLASS(klass), ARG_MAXFILESIZE, g_param_spec_int("maxfilesize","MaxFileSize","Maximum Size Per File", G_MININT,G_MAXINT,0,G_PARAM_READWRITE)); gst_filesink_signals[SIGNAL_HANDOFF] = g_signal_new ("handoff", G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GstFileSinkClass, handoff), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); gobject_class->set_property = gst_filesink_set_property; gobject_class->get_property = gst_filesink_get_property; gstelement_class->change_state = gst_filesink_change_state; } static void gst_filesink_init (GstFileSink *filesink) { GstPad *pad; pad = gst_pad_new ("sink", GST_PAD_SINK); gst_element_add_pad (GST_ELEMENT (filesink), pad); gst_pad_set_chain_function (pad, gst_filesink_chain); GST_FLAG_SET (GST_ELEMENT(filesink), GST_ELEMENT_EVENT_AWARE); gst_pad_set_event_function(pad, gst_filesink_handle_event); filesink->filename = NULL; filesink->file = NULL; filesink->filenum = 0; filesink->maxfilesize = -1; } static char * gst_filesink_getcurrentfilename (GstFileSink *filesink) { g_return_val_if_fail(filesink != NULL, NULL); g_return_val_if_fail(GST_IS_FILESINK(filesink), NULL); if (filesink->filename == NULL) return NULL; g_return_val_if_fail(filesink->filenum >= 0, NULL); if (!strstr(filesink->filename, "%")) { if (!filesink->filenum) return g_strdup(filesink->filename); else return NULL; } return g_strdup_printf(filesink->filename, filesink->filenum); } static void gst_filesink_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec) { GstFileSink *sink; /* it's not null if we got it, but it might not be ours */ sink = GST_FILESINK (object); switch (prop_id) { case ARG_LOCATION: /* the element must be stopped or paused in order to do this */ g_return_if_fail ((GST_STATE (sink) < GST_STATE_PLAYING) || (GST_STATE (sink) == GST_STATE_PAUSED)); if (sink->filename) g_free (sink->filename); sink->filename = g_strdup (g_value_get_string (value)); if ( (GST_STATE (sink) == GST_STATE_PAUSED) && (sink->filename != NULL)) { gst_filesink_close_file (sink); gst_filesink_open_file (sink); } break; case ARG_MAXFILESIZE: sink->maxfilesize = g_value_get_int(value); break; default: break; } } static void gst_filesink_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec) { GstFileSink *sink; /* it's not null if we got it, but it might not be ours */ g_return_if_fail (GST_IS_FILESINK (object)); sink = GST_FILESINK (object); switch (prop_id) { case ARG_LOCATION: g_value_set_string (value, gst_filesink_getcurrentfilename(sink)); break; case ARG_MAXFILESIZE: g_value_set_int (value, sink->maxfilesize); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; } } static gboolean gst_filesink_open_file (GstFileSink *sink) { g_return_val_if_fail (!GST_FLAG_IS_SET (sink, GST_FILESINK_OPEN), FALSE); /* open the file */ if (!gst_filesink_getcurrentfilename(sink)) { /* Out of files */ gst_element_set_eos(GST_ELEMENT(sink)); return FALSE; } sink->file = fopen (gst_filesink_getcurrentfilename(sink), "w"); if (sink->file == NULL) { perror ("open"); gst_element_error (GST_ELEMENT (sink), g_strconcat("Error opening file \"", gst_filesink_getcurrentfilename(sink), "\": ", sys_errlist[errno], NULL)); return FALSE; } GST_FLAG_SET (sink, GST_FILESINK_OPEN); sink->data_written = 0; return TRUE; } static void gst_filesink_close_file (GstFileSink *sink) { g_return_if_fail (GST_FLAG_IS_SET (sink, GST_FILESINK_OPEN)); if (fclose (sink->file) != 0) { perror ("close"); gst_element_error (GST_ELEMENT (sink), g_strconcat("Error closing file \"", gst_filesink_getcurrentfilename(sink), "\": ", sys_errlist[errno], NULL)); } else { GST_FLAG_UNSET (sink, GST_FILESINK_OPEN); } } /* handle events (search) */ static gboolean gst_filesink_handle_event (GstPad *pad, GstEvent *event) { GstEventType type; GstFileSink *filesink; filesink = GST_FILESINK (gst_pad_get_parent (pad)); type = event ? GST_EVENT_TYPE (event) : GST_EVENT_UNKNOWN; switch (type) { case GST_EVENT_SEEK: /* we need to seek */ if (GST_EVENT_SEEK_FLUSH(event)) if (fflush(filesink->file)) gst_element_error(GST_ELEMENT(filesink), "Error flushing the buffer cache of file \'%s\' to disk: %s", gst_filesink_getcurrentfilename(filesink), sys_errlist[errno]); switch (GST_EVENT_SEEK_TYPE(event)) { case GST_SEEK_BYTEOFFSET_SET: fseek(filesink->file, GST_EVENT_SEEK_OFFSET(event), SEEK_SET); break; case GST_SEEK_BYTEOFFSET_CUR: fseek(filesink->file, GST_EVENT_SEEK_OFFSET(event), SEEK_CUR); break; case GST_SEEK_BYTEOFFSET_END: fseek(filesink->file, GST_EVENT_SEEK_OFFSET(event), SEEK_END); break; default: g_warning("Any other then byte-offset seeking is not supported!\n"); break; } break; case GST_EVENT_NEW_MEDIA: /* we need to open a new file! */ gst_filesink_close_file(filesink); filesink->filenum++; if (!gst_filesink_open_file(filesink)) return FALSE; break; case GST_EVENT_FLUSH: if (fflush(filesink->file)) gst_element_error(GST_ELEMENT(filesink), "Error flushing the buffer cache of file \'%s\' to disk: %s", gst_filesink_getcurrentfilename(filesink), sys_errlist[errno]); break; default: gst_pad_event_default (pad, event); break; } return TRUE; } /** * gst_filesink_chain: * @pad: the pad this filesink is connected to * @buf: the buffer that has to be absorbed * * take the buffer from the pad and write to file if it's open */ static void gst_filesink_chain (GstPad *pad, GstBuffer *buf) { GstFileSink *filesink; gint bytes_written = 0; g_return_if_fail (pad != NULL); g_return_if_fail (GST_IS_PAD (pad)); g_return_if_fail (buf != NULL); filesink = GST_FILESINK (gst_pad_get_parent (pad)); if (GST_IS_EVENT(buf)) { gst_filesink_handle_event(pad, GST_EVENT(buf)); return; } if (filesink->maxfilesize > 0) { if ((filesink->data_written + GST_BUFFER_SIZE(buf))/(1024*1024) > filesink->maxfilesize) { if (GST_ELEMENT_IS_EVENT_AWARE(GST_ELEMENT(filesink))) { GstEvent *event; event = gst_event_new(GST_EVENT_NEW_MEDIA); gst_pad_send_event(pad, event); } } } if (GST_FLAG_IS_SET (filesink, GST_FILESINK_OPEN)) { bytes_written = fwrite (GST_BUFFER_DATA (buf), 1, GST_BUFFER_SIZE (buf), filesink->file); if (bytes_written < GST_BUFFER_SIZE (buf)) { printf ("filesink : Warning : %d bytes should be written, only %d bytes written\n", GST_BUFFER_SIZE (buf), bytes_written); } } filesink->data_written += GST_BUFFER_SIZE(buf); gst_buffer_unref (buf); g_signal_emit (G_OBJECT (filesink), gst_filesink_signals[SIGNAL_HANDOFF], 0, filesink); } static GstElementStateReturn gst_filesink_change_state (GstElement *element) { g_return_val_if_fail (GST_IS_FILESINK (element), GST_STATE_FAILURE); if (GST_STATE_PENDING (element) == GST_STATE_NULL) { if (GST_FLAG_IS_SET (element, GST_FILESINK_OPEN)) gst_filesink_close_file (GST_FILESINK (element)); } else { if (!GST_FLAG_IS_SET (element, GST_FILESINK_OPEN)) { if (!gst_filesink_open_file (GST_FILESINK (element))) return GST_STATE_FAILURE; } } if (GST_ELEMENT_CLASS (parent_class)->change_state) return GST_ELEMENT_CLASS (parent_class)->change_state (element); return GST_STATE_SUCCESS; } --- NEW FILE: gstfilesink.h --- /* GStreamer * Copyright (C) 1999,2000 Erik Walthinsen <om...@cs...> * 2000 Wim Taymans <wt...@ch...> * * gstfilesink.h: * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public * License as published by the Free Software Foundation; either * version 2 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Library General Public License for more details. * * You should have received a copy of the GNU Library General Public * License along with this library; if not, write to the * Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. */ #ifndef __GST_FILESINK_H__ #define __GST_FILESINK_H__ #include <config.h> #include <gst/gst.h> #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ GstElementDetails gst_filesink_details; #define GST_TYPE_FILESINK \ (gst_filesink_get_type()) #define GST_FILESINK(obj) \ (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_FILESINK,GstFileSink)) #define GST_FILESINK_CLASS(klass) \ (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_FILESINK,GstFileSinkClass)) #define GST_IS_FILESINK(obj) \ (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_FILESINK)) #define GST_IS_FILESINK_CLASS(obj) \ (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_FILESINK)) typedef struct _GstFileSink GstFileSink; typedef struct _GstFileSinkClass GstFileSinkClass; typedef enum { GST_FILESINK_OPEN = GST_ELEMENT_FLAG_LAST, GST_FILESINK_FLAG_LAST = GST_ELEMENT_FLAG_LAST + 2, } GstFileSinkFlags; struct _GstFileSink { GstElement element; gchar *filename; FILE *file; gint filenum; guint64 data_written; gint maxfilesize; }; struct _GstFileSinkClass { GstElementClass parent_class; /* signals */ void (*handoff) (GstElement *element,GstPad *pad); }; GType gst_filesink_get_type(void); #ifdef __cplusplus } #endif /* __cplusplus */ #endif /* __GST_FILESINK_H__ */ |
From: Thomas V. S. <tho...@us...> - 2002-09-21 18:30:04
|
CVS Root: /cvsroot/gstreamer Module: gstreamer Changes by: thomasvs Date: Sat Sep 21 2002 11:30:03 PDT Branch: BRANCH-RELEASE-0_4_1 Log message: md5sink fix Modified files: gst/elements : gstmd5sink.c Links: http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/elements/gstmd5sink.c.diff?r1=1.5&r2=1.5.6.1 ====Begin Diffs==== Index: gstmd5sink.c =================================================================== RCS file: /cvsroot/gstreamer/gstreamer/gst/elements/gstmd5sink.c,v retrieving revision 1.5 retrieving revision 1.5.6.1 diff -u -d -r1.5 -r1.5.6.1 --- gstmd5sink.c 11 Apr 2002 20:35:15 -0000 1.5 +++ gstmd5sink.c 21 Sep 2002 18:29:50 -0000 1.5.6.1 @@ -375,11 +375,12 @@ (GClassInitFunc) gst_md5sink_class_init, NULL, NULL, - sizeof(GstMD5Sink), + sizeof (GstMD5Sink), 0, (GInstanceInitFunc) gst_md5sink_init, }; - md5sink_type = g_type_register_static (GST_TYPE_ELEMENT, "GstMD5Sink", &md5sink_info, 0); + md5sink_type = g_type_register_static (GST_TYPE_ELEMENT, "GstMD5Sink", + &md5sink_info, 0); } return md5sink_type; } @@ -396,8 +397,8 @@ parent_class = g_type_class_ref (GST_TYPE_ELEMENT); g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_MD5, - g_param_spec_pointer ("md5", "md5", "current value of the md5 sum", - G_PARAM_READABLE)); + g_param_spec_string ("md5", "md5", "current value of the md5 sum", + "", G_PARAM_READABLE)); gstelement_class->change_state = GST_DEBUG_FUNCPTR(gst_md5sink_change_state); @@ -456,9 +457,19 @@ switch (prop_id) { case ARG_MD5: - /* you could actually get a value for the current md5. This is currently disabled. - * md5_read_ctx (sink, sink->md5); */ - g_value_set_pointer (value, sink->md5); + { + /* you could actually get a value for the current md5. + * This is currently disabled. + * md5_read_ctx (sink, sink->md5); */ + /* md5 is a guchar[16] */ + int i; + guchar *md5string = g_malloc0 (33); + + for (i = 0; i < 16; ++i) + sprintf (md5string + i * 2, "%02x", sink->md5[i]); + g_value_set_string (value, md5string); + g_free (md5string); + } break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); |
From: Thomas V. S. <tho...@us...> - 2002-09-23 06:04:44
|
CVS Root: /cvsroot/gstreamer Module: gstreamer Changes by: thomasvs Date: Sun Sep 22 2002 23:04:44 PDT Log message: backport fixes Modified files: gst/elements : gstmd5sink.c Links: http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/elements/gstmd5sink.c.diff?r1=1.5&r2=1.6 ====Begin Diffs==== Index: gstmd5sink.c =================================================================== RCS file: /cvsroot/gstreamer/gstreamer/gst/elements/gstmd5sink.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- gstmd5sink.c 11 Apr 2002 20:35:15 -0000 1.5 +++ gstmd5sink.c 23 Sep 2002 06:04:32 -0000 1.6 @@ -375,11 +375,12 @@ (GClassInitFunc) gst_md5sink_class_init, NULL, NULL, - sizeof(GstMD5Sink), + sizeof (GstMD5Sink), 0, (GInstanceInitFunc) gst_md5sink_init, }; - md5sink_type = g_type_register_static (GST_TYPE_ELEMENT, "GstMD5Sink", &md5sink_info, 0); + md5sink_type = g_type_register_static (GST_TYPE_ELEMENT, "GstMD5Sink", + &md5sink_info, 0); } return md5sink_type; } @@ -396,8 +397,8 @@ parent_class = g_type_class_ref (GST_TYPE_ELEMENT); g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_MD5, - g_param_spec_pointer ("md5", "md5", "current value of the md5 sum", - G_PARAM_READABLE)); + g_param_spec_string ("md5", "md5", "current value of the md5 sum", + "", G_PARAM_READABLE)); gstelement_class->change_state = GST_DEBUG_FUNCPTR(gst_md5sink_change_state); @@ -456,9 +457,19 @@ switch (prop_id) { case ARG_MD5: - /* you could actually get a value for the current md5. This is currently disabled. - * md5_read_ctx (sink, sink->md5); */ - g_value_set_pointer (value, sink->md5); + { + /* you could actually get a value for the current md5. + * This is currently disabled. + * md5_read_ctx (sink, sink->md5); */ + /* md5 is a guchar[16] */ + int i; + guchar *md5string = g_malloc0 (33); + + for (i = 0; i < 16; ++i) + sprintf (md5string + i * 2, "%02x", sink->md5[i]); + g_value_set_string (value, md5string); + g_free (md5string); + } break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); |
From: Thomas V. S. <tho...@us...> - 2003-06-05 21:32:35
|
CVS Root: /cvsroot/gstreamer Module: gstreamer Changes by: thomasvs Date: Thu Jun 05 2003 14:32:33 PDT Branch: BRANCH-GSTREAMER-0_6 Log message: make internal functions static fixes #114519 Modified files: gst/elements : gstmd5sink.c Links: http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/elements/gstmd5sink.c.diff?r1=1.8&r2=1.8.4.1 ====Begin Diffs==== Index: gstmd5sink.c =================================================================== RCS file: /cvsroot/gstreamer/gstreamer/gst/elements/gstmd5sink.c,v retrieving revision 1.8 retrieving revision 1.8.4.1 diff -u -d -r1.8 -r1.8.4.1 --- gstmd5sink.c 21 Jan 2003 20:50:27 -0000 1.8 +++ gstmd5sink.c 5 Jun 2003 21:32:20 -0000 1.8.4.1 @@ -68,11 +68,11 @@ /* MD5 stuff */ -void md5_init_ctx (GstMD5Sink *ctx); -gpointer md5_read_ctx (GstMD5Sink *ctx, gpointer resbuf); -gpointer md5_finish_ctx (GstMD5Sink *ctx, gpointer resbuf); -void md5_process_bytes (const void *buffer, size_t len, GstMD5Sink *ctx); -void md5_process_block (const void *buffer, size_t len, GstMD5Sink *ctx); +static void md5_init_ctx (GstMD5Sink *ctx); +static gpointer md5_read_ctx (GstMD5Sink *ctx, gpointer resbuf); +static gpointer md5_finish_ctx (GstMD5Sink *ctx, gpointer resbuf); +static void md5_process_bytes (const void *buffer, size_t len, GstMD5Sink *ctx); +static void md5_process_block (const void *buffer, size_t len, GstMD5Sink *ctx); /* This array contains the bytes used to pad the buffer to the next 64-byte boundary. (RFC 1321, 3.1: Step 1) */ @@ -81,7 +81,7 @@ /* MD5 functions */ /* Initialize structure containing state of computation. (RFC 1321, 3.3: Step 3) */ -void +static void md5_init_ctx (GstMD5Sink *ctx) { ctx->A = 0x67452301; @@ -97,7 +97,7 @@ IMPORTANT: On some systems it is required that RESBUF is correctly aligned for a 32 bits value. */ -gpointer +static gpointer md5_finish_ctx (GstMD5Sink *ctx, gpointer resbuf) { /* Take yet unprocessed bytes into account. */ @@ -127,7 +127,7 @@ IMPORTANT: On some systems it is required that RESBUF is correctly aligned for a 32 bits value. */ -gpointer +static gpointer md5_read_ctx (GstMD5Sink *ctx, gpointer resbuf) { ((guint32 *) resbuf)[0] = GUINT32_TO_LE (ctx->A); @@ -138,7 +138,7 @@ return resbuf; } -void +static void md5_process_bytes (const void *buffer, size_t len, GstMD5Sink *ctx) { /*const void aligned_buffer = buffer; */ @@ -213,7 +213,7 @@ /* Process LEN bytes of BUFFER, accumulating context into CTX. It is assumed that LEN % 64 == 0. */ -void +static void md5_process_block (const void *buffer, size_t len, GstMD5Sink *ctx) { guint32 correct_words[16]; |
From: Thomas V. S. <tho...@us...> - 2003-06-05 21:42:19
|
CVS Root: /cvsroot/gstreamer Module: gstreamer Changes by: thomasvs Date: Thu Jun 05 2003 14:33:15 PDT Log message: make functions static taaz patch Modified files: gst/elements : gstmd5sink.c Links: http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/elements/gstmd5sink.c.diff?r1=1.8&r2=1.9 ====Begin Diffs==== Index: gstmd5sink.c =================================================================== RCS file: /cvsroot/gstreamer/gstreamer/gst/elements/gstmd5sink.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- gstmd5sink.c 21 Jan 2003 20:50:27 -0000 1.8 +++ gstmd5sink.c 5 Jun 2003 21:33:03 -0000 1.9 @@ -68,11 +68,11 @@ /* MD5 stuff */ -void md5_init_ctx (GstMD5Sink *ctx); -gpointer md5_read_ctx (GstMD5Sink *ctx, gpointer resbuf); -gpointer md5_finish_ctx (GstMD5Sink *ctx, gpointer resbuf); -void md5_process_bytes (const void *buffer, size_t len, GstMD5Sink *ctx); -void md5_process_block (const void *buffer, size_t len, GstMD5Sink *ctx); +static void md5_init_ctx (GstMD5Sink *ctx); +static gpointer md5_read_ctx (GstMD5Sink *ctx, gpointer resbuf); +static gpointer md5_finish_ctx (GstMD5Sink *ctx, gpointer resbuf); +static void md5_process_bytes (const void *buffer, size_t len, GstMD5Sink *ctx); +static void md5_process_block (const void *buffer, size_t len, GstMD5Sink *ctx); /* This array contains the bytes used to pad the buffer to the next 64-byte boundary. (RFC 1321, 3.1: Step 1) */ @@ -81,7 +81,7 @@ /* MD5 functions */ /* Initialize structure containing state of computation. (RFC 1321, 3.3: Step 3) */ -void +static void md5_init_ctx (GstMD5Sink *ctx) { ctx->A = 0x67452301; @@ -97,7 +97,7 @@ IMPORTANT: On some systems it is required that RESBUF is correctly aligned for a 32 bits value. */ -gpointer +static gpointer md5_finish_ctx (GstMD5Sink *ctx, gpointer resbuf) { /* Take yet unprocessed bytes into account. */ @@ -127,7 +127,7 @@ IMPORTANT: On some systems it is required that RESBUF is correctly aligned for a 32 bits value. */ -gpointer +static gpointer md5_read_ctx (GstMD5Sink *ctx, gpointer resbuf) { ((guint32 *) resbuf)[0] = GUINT32_TO_LE (ctx->A); @@ -138,7 +138,7 @@ return resbuf; } -void +static void md5_process_bytes (const void *buffer, size_t len, GstMD5Sink *ctx) { /*const void aligned_buffer = buffer; */ @@ -213,7 +213,7 @@ /* Process LEN bytes of BUFFER, accumulating context into CTX. It is assumed that LEN % 64 == 0. */ -void +static void md5_process_block (const void *buffer, size_t len, GstMD5Sink *ctx) { guint32 correct_words[16]; |
From: Thomas V. S. <tho...@pd...> - 2004-01-20 15:04:36
|
CVS Root: /home/cvs/gstreamer Module: gstreamer Changes by: thomasvs Date: Tue Jan 20 2004 07:05:54 PST Log message: fix rename Modified files: gst/elements : gsttypefind.c Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/elements/gsttypefind.c.diff?r1=1.11&r2=1.12 ====Begin Diffs==== Index: gsttypefind.c =================================================================== RCS file: /home/cvs/gstreamer/gstreamer/gst/elements/gsttypefind.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- gsttypefind.c 18 Jan 2004 21:36:19 -0000 1.11 +++ gsttypefind.c 20 Jan 2004 15:05:42 -0000 1.12 @@ -38,7 +38,7 @@ # include "config.h" #endif -#include "gsttypefindelement.h" +#include "gsttypefind.h" #include "gst/gst_private.h" #include "gst/gst-i18n-lib.h" |
From: Thomas V. S. <tho...@pd...> - 2004-02-11 18:51:15
|
CVS Root: /cvs/gstreamer Module: gstreamer Changes by: thomasvs Date: Wed Feb 11 2004 10:50:28 PST Log message: removing old files Removed files: gst/elements : gstmultidisksrc.c gstmultidisksrc.h Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/elements/gstmultidisksrc.c http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/elements/gstmultidisksrc.h ====Begin Diffs==== --- gstmultidisksrc.c DELETED --- --- gstmultidisksrc.h DELETED --- |
From: <tho...@fr...> - 2005-06-28 12:45:43
|
CVS Root: /cvs/gstreamer Module: gstreamer Changes by: thomasvs Date: Tue Jun 28 2005 05:45:35 PDT Log message: fix fake elements too Modified files: gst/elements : gstfakesink.c gstfakesrc.c Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/elements/gstfakesink.c.diff?r1=1.78&r2=1.79 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/elements/gstfakesrc.c.diff?r1=1.95&r2=1.96 ====Begin Diffs==== Index: gstfakesink.c =================================================================== RCS file: /cvs/gstreamer/gstreamer/gst/elements/gstfakesink.c,v retrieving revision 1.78 retrieving revision 1.79 diff -u -d -r1.78 -r1.79 --- gstfakesink.c 27 May 2005 09:27:35 -0000 1.78 +++ gstfakesink.c 28 Jun 2005 12:45:21 -0000 1.79 @@ -137,11 +137,11 @@ { GObjectClass *gobject_class; GstElementClass *gstelement_class; - GstBaseSinkClass *gstbasesink_class; + GstBaseSinkClass *gstbase_sink_class; gobject_class = (GObjectClass *) klass; gstelement_class = (GstElementClass *) klass; - gstbasesink_class = (GstBaseSinkClass *) klass; + gstbase_sink_class = (GstBaseSinkClass *) klass; gobject_class->set_property = GST_DEBUG_FUNCPTR (gst_fakesink_set_property); gobject_class->get_property = GST_DEBUG_FUNCPTR (gst_fakesink_get_property); @@ -178,10 +178,10 @@ gstelement_class->change_state = GST_DEBUG_FUNCPTR (gst_fakesink_change_state); - gstbasesink_class->event = GST_DEBUG_FUNCPTR (gst_fakesink_event); - gstbasesink_class->preroll = GST_DEBUG_FUNCPTR (gst_fakesink_preroll); - gstbasesink_class->render = GST_DEBUG_FUNCPTR (gst_fakesink_render); - gstbasesink_class->get_times = GST_DEBUG_FUNCPTR (gst_fakesink_get_times); + gstbase_sink_class->event = GST_DEBUG_FUNCPTR (gst_fakesink_event); + gstbase_sink_class->preroll = GST_DEBUG_FUNCPTR (gst_fakesink_preroll); + gstbase_sink_class->render = GST_DEBUG_FUNCPTR (gst_fakesink_render); + gstbase_sink_class->get_times = GST_DEBUG_FUNCPTR (gst_fakesink_get_times); } static void Index: gstfakesrc.c RCS file: /cvs/gstreamer/gstreamer/gst/elements/gstfakesrc.c,v retrieving revision 1.95 retrieving revision 1.96 diff -u -d -r1.95 -r1.96 --- gstfakesrc.c 23 Jun 2005 10:37:09 -0000 1.95 +++ gstfakesrc.c 28 Jun 2005 12:45:21 -0000 1.96 @@ -213,11 +213,11 @@ - GstBaseSrcClass *gstbasesrc_class; + GstBaseSrcClass *gstbase_src_class; - gstbasesrc_class = (GstBaseSrcClass *) klass; + gstbase_src_class = (GstBaseSrcClass *) klass; gobject_class->set_property = GST_DEBUG_FUNCPTR (gst_fakesrc_set_property); gobject_class->get_property = GST_DEBUG_FUNCPTR (gst_fakesrc_get_property); @@ -295,11 +295,11 @@ G_STRUCT_OFFSET (GstFakeSrcClass, handoff), NULL, NULL, gst_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 1, G_TYPE_OBJECT); - /*gstbasesrc_class->is_seekable = GST_DEBUG_FUNCPTR (gst_fakesrc_is_seekable); */ - gstbasesrc_class->start = GST_DEBUG_FUNCPTR (gst_fakesrc_start); - gstbasesrc_class->stop = GST_DEBUG_FUNCPTR (gst_fakesrc_stop); - gstbasesrc_class->event = GST_DEBUG_FUNCPTR (gst_fakesrc_event_handler); - gstbasesrc_class->create = GST_DEBUG_FUNCPTR (gst_fakesrc_create); + /*gstbase_src_class->is_seekable = GST_DEBUG_FUNCPTR (gst_fakesrc_is_seekable); */ + gstbase_src_class->start = GST_DEBUG_FUNCPTR (gst_fakesrc_start); + gstbase_src_class->stop = GST_DEBUG_FUNCPTR (gst_fakesrc_stop); + gstbase_src_class->event = GST_DEBUG_FUNCPTR (gst_fakesrc_event_handler); + gstbase_src_class->create = GST_DEBUG_FUNCPTR (gst_fakesrc_create); @@ -436,7 +436,7 @@ src->has_getrange = g_value_get_boolean (value); break; case PROP_IS_LIVE: - gst_basesrc_set_live (basesrc, g_value_get_boolean (value)); + gst_base_src_set_live (basesrc, g_value_get_boolean (value)); default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); @@ -513,7 +513,7 @@ g_value_set_boolean (value, src->has_getrange); - g_value_set_boolean (value, gst_basesrc_is_live (basesrc)); + g_value_set_boolean (value, gst_base_src_is_live (basesrc)); |
From: <tho...@fr...> - 2005-10-07 15:26:03
|
CVS Root: /cvs/gstreamer Module: gstreamer Changes by: thomasvs Date: Fri Oct 07 2005 08:26:01 PDT Log message: fdsrc does not build currently on win32 due to socketpair Modified files: gst/elements : gstelements.c Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/elements/gstelements.c.diff?r1=1.66&r2=1.67 ====Begin Diffs==== Index: gstelements.c =================================================================== RCS file: /cvs/gstreamer/gstreamer/gst/elements/gstelements.c,v retrieving revision 1.66 retrieving revision 1.67 diff -u -d -r1.66 -r1.67 --- gstelements.c 9 Sep 2005 17:42:20 -0000 1.66 +++ gstelements.c 7 Oct 2005 15:25:49 -0000 1.67 @@ -51,7 +51,9 @@ {"capsfilter", GST_RANK_NONE, gst_capsfilter_get_type}, {"fakesrc", GST_RANK_NONE, gst_fake_src_get_type}, {"fakesink", GST_RANK_NONE, gst_fake_sink_get_type}, +#ifndef WIN32 {"fdsrc", GST_RANK_NONE, gst_fdsrc_get_type}, +#endif {"filesrc", GST_RANK_NONE, gst_file_src_get_type}, {"identity", GST_RANK_NONE, gst_identity_get_type}, {"filesink", GST_RANK_NONE, gst_file_sink_get_type}, |
From: <tho...@fr...> - 2005-10-13 17:52:13
|
CVS Root: /cvs/gstreamer Module: gstreamer Changes by: thomasvs Date: Thu Oct 13 2005 10:52:03 PDT Log message: add correct header for WIN32 Modified files: gst/elements : gstelements.c gstfilesrc.c Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/elements/gstelements.c.diff?r1=1.68&r2=1.69 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/elements/gstfilesrc.c.diff?r1=1.125&r2=1.126 ====Begin Diffs==== Index: gstelements.c =================================================================== RCS file: /cvs/gstreamer/gstreamer/gst/elements/gstelements.c,v retrieving revision 1.68 retrieving revision 1.69 diff -u -d -r1.68 -r1.69 --- gstelements.c 10 Oct 2005 13:52:18 -0000 1.68 +++ gstelements.c 13 Oct 2005 17:51:51 -0000 1.69 @@ -51,9 +51,9 @@ {"capsfilter", GST_RANK_NONE, gst_capsfilter_get_type}, {"fakesrc", GST_RANK_NONE, gst_fake_src_get_type}, {"fakesink", GST_RANK_NONE, gst_fake_sink_get_type}, -#ifndef WIN32 +#ifndef HAVE_WIN32 {"fdsrc", GST_RANK_NONE, gst_fdsrc_get_type}, -#endif //WIN32 +#endif {"filesrc", GST_RANK_NONE, gst_file_src_get_type}, {"identity", GST_RANK_NONE, gst_identity_get_type}, {"filesink", GST_RANK_NONE, gst_file_sink_get_type}, Index: gstfilesrc.c RCS file: /cvs/gstreamer/gstreamer/gst/elements/gstfilesrc.c,v retrieving revision 1.125 retrieving revision 1.126 diff -u -d -r1.125 -r1.126 --- gstfilesrc.c 13 Oct 2005 17:43:36 -0000 1.125 +++ gstfilesrc.c 13 Oct 2005 17:51:51 -0000 1.126 @@ -39,12 +39,19 @@ #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> + #ifdef HAVE_UNISTD_H -#include <unistd.h> +# include <unistd.h> #endif #ifdef HAVE_MMAP -#include <sys/mman.h> +# include <sys/mman.h> +#ifdef HAVE_WIN32 +# include <io.h> /* lseek, open, close, read */ #include <errno.h> #include <string.h> @@ -732,7 +739,7 @@ goto could_not_read; /* regular files should have given us what we expected */ - if ((gint) ret < length && src->is_regular) + if ((guint) ret < length && src->is_regular) goto unexpected_eos; /* other files should eos if they read 0 */ |
From: <tho...@fr...> - 2005-11-28 14:03:20
|
CVS Root: /cvs/gstreamer Module: gstreamer Changes by: thomasvs Date: Mon Nov 28 2005 06:03:06 PST Log message: log caps Modified files: gst/elements : gstcapsfilter.c Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/elements/gstcapsfilter.c.diff?r1=1.15&r2=1.16 ====Begin Diffs==== Index: gstcapsfilter.c =================================================================== RCS file: /cvs/gstreamer/gstreamer/gst/elements/gstcapsfilter.c,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- gstcapsfilter.c 21 Oct 2005 15:13:08 -0000 1.15 +++ gstcapsfilter.c 28 Nov 2005 14:02:54 -0000 1.16 @@ -154,9 +154,9 @@ switch (prop_id) { case PROP_FILTER_CAPS:{ - const GstCaps *new_caps_val = gst_value_get_caps (value); GstCaps *new_caps; GstCaps *old_caps; + const GstCaps *new_caps_val = gst_value_get_caps (value); if (new_caps_val == NULL) { new_caps = gst_caps_new_any (); @@ -168,6 +168,8 @@ capsfilter->filter_caps = new_caps; gst_caps_unref (old_caps); + GST_DEBUG_OBJECT (capsfilter, "set new caps %" GST_PTR_FORMAT, new_caps); + /* FIXME: Need to activate these caps on the pads */ break; } |