mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-23 18:21:04 +00:00
Code Issues 1 Projects Releases Wiki Activity

patches from jmmv@menta.net (Julio M. Merino Vidal)

Browse source 
Original commit message from CVS:
patches from jmmv@menta.net (Julio M. Merino Vidal)
* gst/interleave/deinterleave.c: (deinterleave_chain): Fix
GST_ELEMENT_ERROR call (bug #135634)
* gst/interleave/interleave.c: (interleave_buffered_loop),
(interleave_bytestream_loop): Don't use alloca() (bug #135640)
* sys/cdrom/gstcdplayer_ioctl_bsd.h: Fix ioctls on NetBSD (bug #135645)
* sys/oss/gstosssink.c: (gst_osssink_get_delay),
(gst_osssink_chain): Fix ioctls on NetBSD. (bug #135644)
* sys/v4l/v4lmjpegsrc_calls.c: (gst_v4lmjpegsrc_sync_next_frame),
(gst_v4lmjpegsrc_set_capture), (gst_v4lmjpegsrc_set_capture_m),
(gst_v4lmjpegsrc_capture_init), (gst_v4lmjpegsrc_requeue_frame):
Fix GST_ELEMENT_ERROR call.
* sys/v4l/v4lsrc_calls.c: (gst_v4lsrc_try_palette): Fix
GST_ELEMENT_ERROR call.
This commit is contained in:
David Schleef 2004-02-27 23:36:43 +00:00
parent d266c49719
commit ee5fb6167b
2 changed files with 26 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
ChangeLog
View file

@ -1,3 +1,21 @@
2004-02-27 David Schleef <ds@schleef.org>
patches from jmmv@menta.net (Julio M. Merino Vidal)
* gst/interleave/deinterleave.c: (deinterleave_chain): Fix
GST_ELEMENT_ERROR call (bug #135634)
* gst/interleave/interleave.c: (interleave_buffered_loop),
(interleave_bytestream_loop): Don't use alloca() (bug #135640)
* sys/cdrom/gstcdplayer_ioctl_bsd.h: Fix ioctls on NetBSD (bug #135645)
* sys/oss/gstosssink.c: (gst_osssink_get_delay),
(gst_osssink_chain): Fix ioctls on NetBSD. (bug #135644)
* sys/v4l/v4lmjpegsrc_calls.c: (gst_v4lmjpegsrc_sync_next_frame),
(gst_v4lmjpegsrc_set_capture), (gst_v4lmjpegsrc_set_capture_m),
(gst_v4lmjpegsrc_capture_init), (gst_v4lmjpegsrc_requeue_frame):
Fix GST_ELEMENT_ERROR call.
* sys/v4l/v4lsrc_calls.c: (gst_v4lsrc_try_palette): Fix
GST_ELEMENT_ERROR call.
2004-02-27 Benjamin Otte <otte@gnome.org> 2004-02-27 Benjamin Otte <otte@gnome.org>
* gst-libs/gst/audio/audio.h: * gst-libs/gst/audio/audio.h:

10
sys/oss/gstosssink.c
View file

@ -261,11 +261,17 @@ static inline gint64
gst_osssink_get_delay (GstOssSink *osssink) gst_osssink_get_delay (GstOssSink *osssink)
{ {
gint delay = 0; gint delay = 0;
gint ret;
if (GST_OSSELEMENT (osssink)->fd == -1) if (GST_OSSELEMENT (osssink)->fd == -1)
return 0; return 0;
if (ioctl (GST_OSSELEMENT (osssink)->fd, SNDCTL_DSP_GETODELAY, &delay) < 0) { #ifdef SNDCTL_DSP_GETODELAY
ret = ioctl (GST_OSSELEMENT (osssink)->fd, SNDCTL_DSP_GETODELAY, &delay);
#else
ret = -1;
#endif
if (ret < 0) {
audio_buf_info info; audio_buf_info info;
if (ioctl (GST_OSSELEMENT (osssink)->fd, SNDCTL_DSP_GETOSPACE, &info) < 0) { if (ioctl (GST_OSSELEMENT (osssink)->fd, SNDCTL_DSP_GETOSPACE, &info) < 0) {
delay = 0; delay = 0;
@ -337,7 +343,7 @@ gst_osssink_chain (GstPad *pad, GstData *_data)
switch (GST_EVENT_TYPE (event)) { switch (GST_EVENT_TYPE (event)) {
case GST_EVENT_EOS: case GST_EVENT_EOS:
ioctl (GST_OSSELEMENT (osssink)->fd, SNDCTL_DSP_SYNC); ioctl (GST_OSSELEMENT (osssink)->fd, SNDCTL_DSP_SYNC, 0);
gst_audio_clock_set_active (GST_AUDIO_CLOCK (osssink->provided_clock), FALSE); gst_audio_clock_set_active (GST_AUDIO_CLOCK (osssink->provided_clock), FALSE);
gst_pad_event_default (pad, event); gst_pad_event_default (pad, event);
return; return;