summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog17
-rw-r--r--configure.ac1
-rw-r--r--docs/libs/Makefile.am1
-rw-r--r--docs/libs/gst-plugins-base-libs-docs.sgml20
-rw-r--r--docs/libs/gst-plugins-base-libs-sections.txt64
-rw-r--r--ext/gnomevfs/gstgnomevfssrc.c39
-rw-r--r--ext/gnomevfs/gstgnomevfssrc.h4
-rw-r--r--gst-libs/gst/Makefile.am1
-rw-r--r--pkgconfig/gstreamer-plugins-base-uninstalled.pc.in4
-rw-r--r--pkgconfig/gstreamer-plugins-base.pc.in2
-rw-r--r--sys/v4l/v4lsrc_calls.c2
-rw-r--r--tests/examples/Makefile.am2
-rw-r--r--win32/common/config.h11
13 files changed, 37 insertions, 131 deletions
diff --git a/ChangeLog b/ChangeLog
index fbea8cfcd..db7f90489 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,22 @@
2007-08-23 Stefan Kost <ensonic@users.sf.net>
+ * configure.ac:
+ * docs/libs/Makefile.am:
+ * docs/libs/gst-plugins-base-libs-docs.sgml:
+ * docs/libs/gst-plugins-base-libs-sections.txt:
+ * ext/gnomevfs/gstgnomevfssrc.c:
+ * ext/gnomevfs/gstgnomevfssrc.h:
+ * gst-libs/gst/Makefile.am:
+ * pkgconfig/gstreamer-plugins-base-uninstalled.pc.in:
+ * pkgconfig/gstreamer-plugins-base.pc.in:
+ * sys/v4l/v4lsrc_calls.c:
+ * tests/examples/Makefile.am:
+ * win32/common/config.h:
+ Revert unwanted commit. many thanks to moap. I want a fix for
+ https://thomas.apestaart.org/moap/trac/ticket/239
+
+2007-08-23 Stefan Kost <ensonic@users.sf.net>
+
* gst/volume/gstvolume.c:
Move passthrough below gst_object_sync_values(). Fixes #442654.
diff --git a/configure.ac b/configure.ac
index 8ca59c37b..6a985a1fc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -648,7 +648,6 @@ gst-libs/Makefile
gst-libs/gst/Makefile
gst-libs/gst/audio/Makefile
gst-libs/gst/cdda/Makefile
-gst-libs/gst/fft/Makefile
gst-libs/gst/floatcast/Makefile
gst-libs/gst/interfaces/Makefile
gst-libs/gst/netbuffer/Makefile
diff --git a/docs/libs/Makefile.am b/docs/libs/Makefile.am
index 310b69362..42b57ccb7 100644
--- a/docs/libs/Makefile.am
+++ b/docs/libs/Makefile.am
@@ -69,7 +69,6 @@ SCANOBJ_DEPS = \
$(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-@GST_MAJORMINOR@.la \
$(top_builddir)/gst-libs/gst/audio/libgstaudio-@GST_MAJORMINOR@.la \
$(top_builddir)/gst-libs/gst/cdda/libgstcdda-@GST_MAJORMINOR@.la \
- $(top_builddir)/gst-libs/gst/fft/libgstfft-@GST_MAJORMINOR@.la \
$(top_builddir)/gst-libs/gst/rtp/libgstrtp-@GST_MAJORMINOR@.la \
$(top_builddir)/gst-libs/gst/rtsp/libgstrtsp-@GST_MAJORMINOR@.la \
$(top_builddir)/gst-libs/gst/sdp/libgstsdp-@GST_MAJORMINOR@.la \
diff --git a/docs/libs/gst-plugins-base-libs-docs.sgml b/docs/libs/gst-plugins-base-libs-docs.sgml
index cb75caab6..3ef293dc9 100644
--- a/docs/libs/gst-plugins-base-libs-docs.sgml
+++ b/docs/libs/gst-plugins-base-libs-docs.sgml
@@ -17,12 +17,6 @@
<!ENTITY GstRingBuffer SYSTEM "xml/gstringbuffer.xml">
<!-- cdda -->
<!ENTITY GstCddaBaseSrc SYSTEM "xml/gstcddabasesrc.xml">
-<!-- fft -->
-<!ENTITY GstFFT SYSTEM "xml/gstfft.xml">
-<!ENTITY GstFFTS16 SYSTEM "xml/gstffts16.xml">
-<!ENTITY GstFFTS32 SYSTEM "xml/gstffts32.xml">
-<!ENTITY GstFFTF32 SYSTEM "xml/gstfftf32.xml">
-<!ENTITY GstFFTF64 SYSTEM "xml/gstfftf64.xml">
<!-- floatcast -->
<!ENTITY GstFloatCast SYSTEM "xml/gstfloatcast.xml">
<!-- interfaces -->
@@ -123,20 +117,6 @@
&GstCddaBaseSrc;
</chapter>
- <chapter id="gstreamer-ffft">
- <title>FFT Library</title>
- <para>
- This library should be linked to by getting cflags and libs from
- <filename>gstreamer-plugins-base-&GST_MAJORMINOR;.pc</filename> and adding
- <filename>-lgstfft-&GST_MAJORMINOR;</filename> to the library flags.
- </para>
- &GstFFT;
- &GstFFTS16;
- &GstFFTS32;
- &GstFFTF32;
- &GstFFTF64;
- </chapter>
-
<chapter id="gstreamer-floatcast">
<title>FloatCast Library</title>
<para>
diff --git a/docs/libs/gst-plugins-base-libs-sections.txt b/docs/libs/gst-plugins-base-libs-sections.txt
index 875230348..e9b8d31b9 100644
--- a/docs/libs/gst-plugins-base-libs-sections.txt
+++ b/docs/libs/gst-plugins-base-libs-sections.txt
@@ -226,70 +226,6 @@ GST_TYPE_CDDA_BASE_SRC
gst_cdda_base_src_get_type
</SECTION>
-# fft
-
-<SECTION>
-<FILE>gstfft</FILE>
-<INCLUDE>gst/fft/gstfft.h</INCLUDE>
-GstFFTWindow
-gst_fft_next_fast_length
-</SECTION>
-
-<SECTION>
-<FILE>gstffts16</FILE>
-<INCLUDE>gst/fft/gstffts16.h</INCLUDE>
-GstFFTS16
-GstFFTS16Complex
-gst_fft_s16_new
-gst_fft_s16_fft
-gst_fft_s16_inverse_fft
-gst_fft_s16_free
-gst_fft_s16_magnitude
-gst_fft_s16_phase
-gst_fft_s16_window
-</SECTION>
-
-<SECTION>
-<FILE>gstffts32</FILE>
-<INCLUDE>gst/fft/gstffts32.h</INCLUDE>
-GstFFTS32
-GstFFTS32Complex
-gst_fft_s32_new
-gst_fft_s32_fft
-gst_fft_s32_inverse_fft
-gst_fft_s32_free
-gst_fft_s32_magnitude
-gst_fft_s32_phase
-gst_fft_s32_window
-</SECTION>
-
-<SECTION>
-<FILE>gstfftf32</FILE>
-<INCLUDE>gst/fft/gstfftf32.h</INCLUDE>
-GstFFTF32
-GstFFTF32Complex
-gst_fft_f32_new
-gst_fft_f32_fft
-gst_fft_f32_inverse_fft
-gst_fft_f32_free
-gst_fft_f32_magnitude
-gst_fft_f32_phase
-gst_fft_f32_window
-</SECTION>
-
-<SECTION>
-<FILE>gstfftf64</FILE>
-<INCLUDE>gst/fft/gstfftf64.h</INCLUDE>
-GstFFTF64
-GstFFTF64Complex
-gst_fft_f64_new
-gst_fft_f64_fft
-gst_fft_f64_inverse_fft
-gst_fft_f64_free
-gst_fft_f64_magnitude
-gst_fft_f64_phase
-gst_fft_f64_window
-</SECTION>
# floatcast
diff --git a/ext/gnomevfs/gstgnomevfssrc.c b/ext/gnomevfs/gstgnomevfssrc.c
index 071c3559c..6b0504cb1 100644
--- a/ext/gnomevfs/gstgnomevfssrc.c
+++ b/ext/gnomevfs/gstgnomevfssrc.c
@@ -132,8 +132,7 @@ enum
ARG_IRADIO_NAME,
ARG_IRADIO_GENRE,
ARG_IRADIO_URL,
- ARG_IRADIO_TITLE,
- ARG_RANDOM_ACCESS
+ ARG_IRADIO_TITLE
};
static void gst_gnome_vfs_src_base_init (gpointer g_class);
@@ -255,12 +254,6 @@ gst_gnome_vfs_src_class_init (GstGnomeVFSSrcClass * klass)
"iradio-title",
"Name of currently playing song", NULL, G_PARAM_READABLE));
- g_object_class_install_property (gobject_class,
- ARG_RANDOM_ACCESS,
- g_param_spec_boolean ("random-access",
- "random-mode",
- "Enable random file access", FALSE, G_PARAM_READWRITE));
-
gstbasesrc_class->start = GST_DEBUG_FUNCPTR (gst_gnome_vfs_src_start);
gstbasesrc_class->stop = GST_DEBUG_FUNCPTR (gst_gnome_vfs_src_stop);
gstbasesrc_class->get_size = GST_DEBUG_FUNCPTR (gst_gnome_vfs_src_get_size);
@@ -446,9 +439,6 @@ gst_gnome_vfs_src_set_property (GObject * object, guint prop_id,
case ARG_IRADIO_MODE:
src->iradio_mode = g_value_get_boolean (value);
break;
- case ARG_RANDOM_ACCESS:
- src->random_access = g_value_get_boolean (value);
- break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
@@ -485,9 +475,6 @@ gst_gnome_vfs_src_get_property (GObject * object, guint prop_id, GValue * value,
case ARG_IRADIO_TITLE:
g_value_set_string (value, src->iradio_title);
break;
- case ARG_RANDOM_ACCESS:
- g_value_set_boolean (value, src->random_access);
- break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
@@ -675,6 +662,7 @@ gst_gnome_vfs_src_create (GstBaseSrc * basesrc, guint64 offset, guint size,
gst_buffer_set_caps (buf, src->icy_caps);
data = GST_BUFFER_DATA (buf);
+ GST_BUFFER_OFFSET (buf) = src->curoffset;
res = gnome_vfs_read (src->handle, data, size, &readbytes);
@@ -682,11 +670,11 @@ gst_gnome_vfs_src_create (GstBaseSrc * basesrc, guint64 offset, guint size,
&& readbytes == 0)))
goto eos;
+ GST_BUFFER_SIZE (buf) = readbytes;
+
if (G_UNLIKELY (res != GNOME_VFS_OK))
goto read_failed;
- GST_BUFFER_OFFSET (buf) = src->curoffset;
- GST_BUFFER_SIZE (buf) = readbytes;
src->curoffset += readbytes;
/* we're done, return the buffer */
@@ -746,7 +734,7 @@ gst_gnome_vfs_src_check_get_range (GstBaseSrc * basesrc)
return FALSE;
}
- if (gnome_vfs_uri_is_local (src->uri) || src->random_access) {
+ if (gnome_vfs_uri_is_local (src->uri)) {
GST_LOG_OBJECT (src, "local URI (%s), assuming random access is possible",
GST_STR_NULL (src->uri_name));
return TRUE;
@@ -834,16 +822,11 @@ gst_gnome_vfs_src_start (GstBaseSrc * basesrc)
if (src->uri != NULL) {
GnomeVFSOpenMode mode;
- if (src->random_access)
- mode = GNOME_VFS_OPEN_READ | GNOME_VFS_OPEN_RANDOM;
- else
- mode = GNOME_VFS_OPEN_READ;
-
/* this can block... */
+ mode = GNOME_VFS_OPEN_READ;
res = gnome_vfs_open_uri (&src->handle, src->uri, mode);
- if (res != GNOME_VFS_OK) {
+ if (res != GNOME_VFS_OK)
goto open_failed;
- }
src->own_handle = TRUE;
} else if (!src->handle) {
goto no_filename;
@@ -899,13 +882,7 @@ gst_gnome_vfs_src_stop (GstBaseSrc * basesrc)
gst_gnome_vfs_src_pop_callbacks (src);
if (src->own_handle) {
- GnomeVFSResult res;
-
- res = gnome_vfs_close (src->handle);
- if (res != GNOME_VFS_OK) {
- GST_ELEMENT_ERROR (src, RESOURCE, CLOSE, (NULL),
- ("Could not close vfs handle: %s", gnome_vfs_result_to_string (res)));
- }
+ gnome_vfs_close (src->handle);
src->handle = NULL;
}
src->curoffset = 0;
diff --git a/ext/gnomevfs/gstgnomevfssrc.h b/ext/gnomevfs/gstgnomevfssrc.h
index abf0700c8..8c37fe8d0 100644
--- a/ext/gnomevfs/gstgnomevfssrc.h
+++ b/ext/gnomevfs/gstgnomevfssrc.h
@@ -73,9 +73,6 @@ struct _GstGnomeVFSSrc
gchar *iradio_genre;
gchar *iradio_url;
gchar *iradio_title;
-
- /* random acces read mode */
- gboolean random_access;
};
struct _GstGnomeVFSSrcClass
@@ -89,3 +86,4 @@ G_END_DECLS
#endif /* __GST_GNOME_VFS_SRC_H__ */
+
diff --git a/gst-libs/gst/Makefile.am b/gst-libs/gst/Makefile.am
index d935ae45d..f4db55ace 100644
--- a/gst-libs/gst/Makefile.am
+++ b/gst-libs/gst/Makefile.am
@@ -7,7 +7,6 @@ SUBDIRS = \
tag \
audio \
cdda \
- fft \
floatcast \
netbuffer \
pbutils \
diff --git a/pkgconfig/gstreamer-plugins-base-uninstalled.pc.in b/pkgconfig/gstreamer-plugins-base-uninstalled.pc.in
index 815040033..2431d4e24 100644
--- a/pkgconfig/gstreamer-plugins-base-uninstalled.pc.in
+++ b/pkgconfig/gstreamer-plugins-base-uninstalled.pc.in
@@ -9,7 +9,7 @@ Description: Streaming media framework, base plugins libraries, uninstalled
Version: @VERSION@
Requires: gstreamer-@GST_MAJORMINOR@
-Libs: -L${libdir}/audio -L${libdir}/cdda -L${libdir}/fft -L${libdir}/floatcast -L${libdir}/interfaces -L${libdir}/netbuffer -L${libdir}/riff -L${libdir}/rtp -L${libdir}/rtsp -L${libdir}/sdp -L${libdir}/tag -L${libdir}/pbutils -L${libdir}/video
+Libs: -L${libdir}/audio -L${libdir}/cdda -L${libdir}/floatcast -L${libdir}/interfaces -L${libdir}/netbuffer -L${libdir}/riff -L${libdir}/rtp -L${libdir}/rtsp -L${libdir}/sdp -L${libdir}/tag -L${libdir}/pbutils -L${libdir}/video
Cflags: -I${includedir}
-libraries=audio cdda fft floatcast interfaces netbuffer riff tag pbutils video
+libraries=audio cdda floatcast interfaces netbuffer riff tag pbutils video
diff --git a/pkgconfig/gstreamer-plugins-base.pc.in b/pkgconfig/gstreamer-plugins-base.pc.in
index 4bc6088c2..397681d84 100644
--- a/pkgconfig/gstreamer-plugins-base.pc.in
+++ b/pkgconfig/gstreamer-plugins-base.pc.in
@@ -11,4 +11,4 @@ Version: @VERSION@
Libs: -L${libdir}
Cflags: -I${includedir}
-libraries=audio cdda fft floatcast interfaces netbuffer riff rtp tag pbutils video
+libraries=audio cdda floatcast interfaces netbuffer riff rtp tag pbutils video
diff --git a/sys/v4l/v4lsrc_calls.c b/sys/v4l/v4lsrc_calls.c
index cd98bcd77..39e45174a 100644
--- a/sys/v4l/v4lsrc_calls.c
+++ b/sys/v4l/v4lsrc_calls.c
@@ -721,7 +721,7 @@ gst_v4lsrc_buffer_new (GstV4lSrc * v4lsrc, gint num)
if (timestamp > latency)
timestamp -= latency;
else
- timestamp = GST_CLOCK_TIME_NONE;
+ timestamp = 0;
GST_BUFFER_TIMESTAMP (buf) = timestamp;
GST_BUFFER_DURATION (buf) = duration;
diff --git a/tests/examples/Makefile.am b/tests/examples/Makefile.am
index 25264c597..ee8e63263 100644
--- a/tests/examples/Makefile.am
+++ b/tests/examples/Makefile.am
@@ -4,7 +4,7 @@ else
FT2_SUBDIRS =
endif
-SUBDIRS = $(FT2_SUBDIRS) volume xerror
+SUBDIRS = $(FT2_SUBDIRS) volume
DIST_SUBDIRS = seek volume xerror
diff --git a/win32/common/config.h b/win32/common/config.h
index 79d91d57d..a475c6f3f 100644
--- a/win32/common/config.h
+++ b/win32/common/config.h
@@ -39,7 +39,7 @@
#define GST_LICENSE "LGPL"
/* package name in plugins */
-#define GST_PACKAGE_NAME "GStreamer Base Plug-ins CVS/prerelease"
+#define GST_PACKAGE_NAME "GStreamer Base Plug-ins source release"
/* package origin */
#define GST_PACKAGE_ORIGIN "Unknown package origin"
@@ -211,13 +211,13 @@
#undef PACKAGE_NAME "GStreamer Base Plug-ins"
/* Define to the full name and version of this package. */
-#undef PACKAGE_STRING "GStreamer Base Plug-ins 0.10.14.1"
+#undef PACKAGE_STRING "GStreamer Base Plug-ins 0.10.14"
/* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME "gst-plugins-base"
/* Define to the version of this package. */
-#undef PACKAGE_VERSION "0.10.14.1"
+#undef PACKAGE_VERSION "0.10.14"
/* directory where plugins are located */
#undef PLUGINDIR
@@ -241,7 +241,7 @@
#undef STDC_HEADERS
/* Version number of package */
-#define VERSION "0.10.14.1"
+#define VERSION "0.10.14"
/* Define to 1 if your processor stores words with the most significant byte
first (like Motorola and SPARC, unlike Intel and VAX). */
@@ -256,4 +256,5 @@
#undef inline
#endif
-#define GST_INSTALL_PLUGINS_HELPER "/usr/bin/gnome-codec-install"
+#define GST_INSTALL_PLUGINS_HELPER "/home/jan/.install/libexec/gst-install-plugins-helper"
+
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-21 15:14:47 +0000