mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-30 21:51:09 +00:00
- use common code to write samples to the device
Original commit message from CVS: - use common code to write samples to the device - add some error handling
This commit is contained in:
parent
04b611b88c
commit
f11e5be82f
1 changed files with 20 additions and 12 deletions
|
@ -22,6 +22,7 @@
|
||||||
|
|
||||||
#include <sys/ioctl.h>
|
#include <sys/ioctl.h>
|
||||||
#include <sys/soundcard.h>
|
#include <sys/soundcard.h>
|
||||||
|
#include <errno.h>
|
||||||
|
|
||||||
#include <gstosssink.h>
|
#include <gstosssink.h>
|
||||||
|
|
||||||
|
@ -383,6 +384,7 @@ gst_osssink_chain (GstPad *pad, GstBuffer *buf)
|
||||||
if (!osssink->mute) {
|
if (!osssink->mute) {
|
||||||
guchar *data = GST_BUFFER_DATA (buf);
|
guchar *data = GST_BUFFER_DATA (buf);
|
||||||
gint size = GST_BUFFER_SIZE (buf);
|
gint size = GST_BUFFER_SIZE (buf);
|
||||||
|
gint to_write = 0;
|
||||||
|
|
||||||
if (osssink->clock) {
|
if (osssink->clock) {
|
||||||
gint delay = 0;
|
gint delay = 0;
|
||||||
|
@ -400,22 +402,13 @@ gst_osssink_chain (GstPad *pad, GstBuffer *buf)
|
||||||
|
|
||||||
if (jitter >= 0) {
|
if (jitter >= 0) {
|
||||||
gst_clock_handle_discont (osssink->clock, buftime - queued + jitter);
|
gst_clock_handle_discont (osssink->clock, buftime - queued + jitter);
|
||||||
write (osssink->common.fd, data, size);
|
to_write = size;
|
||||||
gst_oss_clock_set_active (osssink->provided_clock, TRUE);
|
gst_oss_clock_set_active (osssink->provided_clock, TRUE);
|
||||||
osssink->resync = FALSE;
|
osssink->resync = FALSE;
|
||||||
osssink->handled += size;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
gint to_write;
|
to_write = size;
|
||||||
while (size > 0) {
|
|
||||||
to_write = MIN (size, osssink->chunk_size);
|
|
||||||
|
|
||||||
write (osssink->common.fd, data, to_write);
|
|
||||||
size -= to_write;
|
|
||||||
data += to_write;
|
|
||||||
osssink->handled += to_write;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
/* no clock, try to be as fast as possible */
|
/* no clock, try to be as fast as possible */
|
||||||
|
@ -425,7 +418,22 @@ gst_osssink_chain (GstPad *pad, GstBuffer *buf)
|
||||||
ioctl (osssink->common.fd, SNDCTL_DSP_GETOSPACE, &ospace);
|
ioctl (osssink->common.fd, SNDCTL_DSP_GETOSPACE, &ospace);
|
||||||
|
|
||||||
if (ospace.bytes >= size) {
|
if (ospace.bytes >= size) {
|
||||||
write (osssink->common.fd, data, size);
|
to_write = size;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
while (to_write > 0) {
|
||||||
|
gint done = write (osssink->common.fd, data,
|
||||||
|
MIN (to_write, osssink->chunk_size));
|
||||||
|
|
||||||
|
if (done == -1) {
|
||||||
|
if (errno != EINTR)
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
to_write -= done;
|
||||||
|
data += done;
|
||||||
|
osssink->handled += done;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue