#include <sys/soundcard.h>
#include <errno.h>
#include <unistd.h>
+#include <string.h>
#include "gstosssink.h"
/* elementfactory information */
-static GstElementDetails gst_osssink_details = GST_ELEMENT_DETAILS (
- "Audio Sink (OSS)",
- "Sink/Audio",
- "Output to a sound card via OSS",
- "Erik Walthinsen <omega@cse.ogi.edu>, "
- "Wim Taymans <wim.taymans@chello.be>"
-);
-
-static void gst_osssink_base_init (gpointer g_class);
-static void gst_osssink_class_init (GstOssSinkClass *klass);
-static void gst_osssink_init (GstOssSink *osssink);
-static void gst_osssink_dispose (GObject *object);
-
-static GstElementStateReturn gst_osssink_change_state (GstElement *element);
-static void gst_osssink_set_clock (GstElement *element, GstClock *clock);
-static GstClock* gst_osssink_get_clock (GstElement *element);
-static GstClockTime gst_osssink_get_time (GstClock *clock, gpointer data);
-
-static const GstFormat* gst_osssink_get_formats (GstPad *pad);
-static gboolean gst_osssink_convert (GstPad *pad, GstFormat src_format, gint64 src_value,
- GstFormat *dest_format, gint64 *dest_value);
-static const GstQueryType* gst_osssink_get_query_types (GstPad *pad);
-static gboolean gst_osssink_query (GstElement *element, GstQueryType type,
- GstFormat *format, gint64 *value);
-static gboolean gst_osssink_sink_query (GstPad *pad, GstQueryType type,
- GstFormat *format, gint64 *value);
-
-static GstPadLinkReturn gst_osssink_sinkconnect (GstPad *pad, const GstCaps *caps);
-
-static void gst_osssink_set_property (GObject *object, guint prop_id, const GValue *value,
- GParamSpec *pspec);
-static void gst_osssink_get_property (GObject *object, guint prop_id, GValue *value,
- GParamSpec *pspec);
-
-static void gst_osssink_chain (GstPad *pad,GstData *_data);
+static GstElementDetails gst_osssink_details =
+GST_ELEMENT_DETAILS ("Audio Sink (OSS)",
+ "Sink/Audio",
+ "Output to a sound card via OSS",
+ "Erik Walthinsen <omega@cse.ogi.edu>, "
+ "Wim Taymans <wim.taymans@chello.be>");
+
+static void gst_osssink_base_init (gpointer g_class);
+static void gst_osssink_class_init (GstOssSinkClass * klass);
+static void gst_osssink_init (GstOssSink * osssink);
+static void gst_osssink_dispose (GObject * object);
+
+static GstElementStateReturn gst_osssink_change_state (GstElement * element);
+static void gst_osssink_set_clock (GstElement * element, GstClock * clock);
+static GstClock *gst_osssink_get_clock (GstElement * element);
+static GstClockTime gst_osssink_get_time (GstClock * clock, gpointer data);
+
+static const GstFormat *gst_osssink_get_formats (GstPad * pad);
+static gboolean gst_osssink_convert (GstPad * pad, GstFormat src_format,
+ gint64 src_value, GstFormat * dest_format, gint64 * dest_value);
+static const GstQueryType *gst_osssink_get_query_types (GstPad * pad);
+static gboolean gst_osssink_query (GstElement * element, GstQueryType type,
+ GstFormat * format, gint64 * value);
+static gboolean gst_osssink_sink_query (GstPad * pad, GstQueryType type,
+ GstFormat * format, gint64 * value);
+
+static GstCaps *gst_osssink_sink_fixate (GstPad * pad, const GstCaps * caps);
+static GstPadLinkReturn gst_osssink_sinkconnect (GstPad * pad,
+ const GstCaps * caps);
+
+static void gst_osssink_set_property (GObject * object, guint prop_id,
+ const GValue * value, GParamSpec * pspec);
+static void gst_osssink_get_property (GObject * object, guint prop_id,
+ GValue * value, GParamSpec * pspec);
+
+static void gst_osssink_chain (GstPad * pad, GstData * _data);
/* OssSink signals and args */
-enum {
+enum
+{
SIGNAL_HANDOFF,
LAST_SIGNAL
};
-enum {
+enum
+{
ARG_0,
ARG_MUTE,
ARG_FRAGMENT,
};
static GstStaticPadTemplate osssink_sink_factory =
-GST_STATIC_PAD_TEMPLATE (
- "sink",
- GST_PAD_SINK,
- GST_PAD_ALWAYS,
- GST_STATIC_CAPS ("audio/x-raw-int, "
- "endianness = (int) BYTE_ORDER, "
- "signed = (boolean) { TRUE, FALSE }, "
- "width = (int) { 8, 16 }, "
- "depth = (int) { 8, 16 }, "
- "rate = (int) [ 1000, 48000 ], "
- "channels = (int) [ 1, 2 ]"
- )
-);
+GST_STATIC_PAD_TEMPLATE ("sink",
+ GST_PAD_SINK,
+ GST_PAD_ALWAYS,
+ GST_STATIC_CAPS ("audio/x-raw-int, "
+ "endianness = (int) BYTE_ORDER, "
+ "signed = (boolean) { TRUE, FALSE }, "
+ "width = (int) { 8, 16 }, "
+ "depth = (int) { 8, 16 }, "
+ "rate = (int) [ 1000, 48000 ], " "channels = (int) [ 1, 2 ]")
+ );
static GstElementClass *parent_class = NULL;
static guint gst_osssink_signals[LAST_SIGNAL] = { 0 };
GType
-gst_osssink_get_type (void)
+gst_osssink_get_type (void)
{
static GType osssink_type = 0;
if (!osssink_type) {
static const GTypeInfo osssink_info = {
- sizeof(GstOssSinkClass),
+ sizeof (GstOssSinkClass),
gst_osssink_base_init,
NULL,
- (GClassInitFunc)gst_osssink_class_init,
+ (GClassInitFunc) gst_osssink_class_init,
NULL,
NULL,
- sizeof(GstOssSink),
+ sizeof (GstOssSink),
0,
- (GInstanceInitFunc)gst_osssink_init,
+ (GInstanceInitFunc) gst_osssink_init,
};
- osssink_type = g_type_register_static (GST_TYPE_OSSELEMENT, "GstOssSink", &osssink_info, 0);
+ osssink_type =
+ g_type_register_static (GST_TYPE_OSSELEMENT, "GstOssSink",
+ &osssink_info, 0);
}
return osssink_type;
}
static void
-gst_osssink_dispose (GObject *object)
+gst_osssink_dispose (GObject * object)
{
GstOssSink *osssink = (GstOssSink *) object;
gst_osssink_base_init (gpointer g_class)
{
GstElementClass *element_class = GST_ELEMENT_CLASS (g_class);
-
+
gst_element_class_set_details (element_class, &gst_osssink_details);
- gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&osssink_sink_factory));
+ gst_element_class_add_pad_template (element_class,
+ gst_static_pad_template_get (&osssink_sink_factory));
}
static void
-gst_osssink_class_init (GstOssSinkClass *klass)
+gst_osssink_class_init (GstOssSinkClass * klass)
{
GObjectClass *gobject_class;
GstElementClass *gstelement_class;
- gobject_class = (GObjectClass*)klass;
- gstelement_class = (GstElementClass*)klass;
+ gobject_class = (GObjectClass *) klass;
+ gstelement_class = (GstElementClass *) klass;
- parent_class = g_type_class_ref(GST_TYPE_OSSELEMENT);
+ parent_class = g_type_class_ref (GST_TYPE_OSSELEMENT);
g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_MUTE,
- g_param_spec_boolean ("mute", "Mute", "Mute the audio",
- FALSE, G_PARAM_READWRITE));
+ g_param_spec_boolean ("mute", "Mute", "Mute the audio",
+ FALSE, G_PARAM_READWRITE));
g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_SYNC,
- g_param_spec_boolean ("sync", "Sync", "If syncing on timestamps should be enabled",
- TRUE, G_PARAM_READWRITE));
+ g_param_spec_boolean ("sync", "Sync",
+ "If syncing on timestamps should be enabled", TRUE,
+ G_PARAM_READWRITE));
g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_FRAGMENT,
- g_param_spec_int ("fragment", "Fragment",
- "The fragment as 0xMMMMSSSS (MMMM = total fragments, 2^SSSS = fragment size)",
- 0, G_MAXINT, 6, G_PARAM_READWRITE));
+ g_param_spec_int ("fragment", "Fragment",
+ "The fragment as 0xMMMMSSSS (MMMM = total fragments, 2^SSSS = fragment size)",
+ 0, G_MAXINT, 6, G_PARAM_READWRITE));
g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_BUFFER_SIZE,
- g_param_spec_uint ("buffer_size", "Buffer size", "Size of buffers in osssink's bufferpool (bytes)",
- 0, G_MAXINT, 4096, G_PARAM_READWRITE));
+ g_param_spec_uint ("buffer_size", "Buffer size",
+ "Size of buffers in osssink's bufferpool (bytes)", 0, G_MAXINT, 4096,
+ G_PARAM_READWRITE));
g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_CHUNK_SIZE,
- g_param_spec_uint ("chunk_size", "Chunk size", "Write data in chunk sized buffers",
- 0, G_MAXUINT, 4096, G_PARAM_READWRITE));
+ g_param_spec_uint ("chunk_size", "Chunk size",
+ "Write data in chunk sized buffers", 0, G_MAXUINT, 4096,
+ G_PARAM_READWRITE));
gst_osssink_signals[SIGNAL_HANDOFF] =
- g_signal_new ("handoff", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (GstOssSinkClass, handoff), NULL, NULL,
- g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-
+ g_signal_new ("handoff", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (GstOssSinkClass, handoff), NULL, NULL,
+ g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+
gobject_class->set_property = gst_osssink_set_property;
gobject_class->get_property = gst_osssink_get_property;
- gobject_class->dispose = gst_osssink_dispose;
-
+ gobject_class->dispose = gst_osssink_dispose;
+
gstelement_class->change_state = GST_DEBUG_FUNCPTR (gst_osssink_change_state);
- gstelement_class->query = GST_DEBUG_FUNCPTR (gst_osssink_query);
- gstelement_class->set_clock = gst_osssink_set_clock;
- gstelement_class->get_clock = gst_osssink_get_clock;
-
+ gstelement_class->query = GST_DEBUG_FUNCPTR (gst_osssink_query);
+ gstelement_class->set_clock = gst_osssink_set_clock;
+ gstelement_class->get_clock = gst_osssink_get_clock;
+
}
-static void
-gst_osssink_init (GstOssSink *osssink)
+static void
+gst_osssink_init (GstOssSink * osssink)
{
- osssink->sinkpad = gst_pad_new_from_template (
- gst_static_pad_template_get (&osssink_sink_factory), "sink");
+ osssink->sinkpad =
+ gst_pad_new_from_template (gst_static_pad_template_get
+ (&osssink_sink_factory), "sink");
gst_element_add_pad (GST_ELEMENT (osssink), osssink->sinkpad);
gst_pad_set_link_function (osssink->sinkpad, gst_osssink_sinkconnect);
+ gst_pad_set_fixate_function (osssink->sinkpad, gst_osssink_sink_fixate);
gst_pad_set_convert_function (osssink->sinkpad, gst_osssink_convert);
gst_pad_set_query_function (osssink->sinkpad, gst_osssink_sink_query);
- gst_pad_set_query_type_function (osssink->sinkpad, gst_osssink_get_query_types);
+ gst_pad_set_query_type_function (osssink->sinkpad,
+ gst_osssink_get_query_types);
gst_pad_set_formats_function (osssink->sinkpad, gst_osssink_get_formats);
gst_pad_set_chain_function (osssink->sinkpad, gst_osssink_chain);
+ GST_DEBUG ("initializing osssink");
osssink->bufsize = 4096;
osssink->chunk_size = 4096;
- osssink->resync = FALSE;
osssink->mute = FALSE;
osssink->sync = TRUE;
- osssink->provided_clock = gst_audio_clock_new ("ossclock", gst_osssink_get_time, osssink);
- gst_object_set_parent (GST_OBJECT (osssink->provided_clock), GST_OBJECT (osssink));
+ osssink->resync = TRUE;
+ osssink->provided_clock =
+ gst_audio_clock_new ("ossclock", gst_osssink_get_time, osssink);
+ gst_object_set_parent (GST_OBJECT (osssink->provided_clock),
+ GST_OBJECT (osssink));
osssink->handled = 0;
GST_FLAG_SET (osssink, GST_ELEMENT_THREAD_SUGGESTED);
GST_FLAG_SET (osssink, GST_ELEMENT_EVENT_AWARE);
}
+static GstCaps *
+gst_osssink_sink_fixate (GstPad * pad, const GstCaps * caps)
+{
+ GstCaps *newcaps;
+ GstStructure *structure;
+
+ newcaps =
+ gst_caps_new_full (gst_structure_copy (gst_caps_get_structure (caps, 0)),
+ NULL);
+ structure = gst_caps_get_structure (newcaps, 0);
-static GstPadLinkReturn
-gst_osssink_sinkconnect (GstPad *pad, const GstCaps *caps)
+ if (gst_caps_structure_fixate_field_nearest_int (structure, "rate", 44100)) {
+ return newcaps;
+ }
+ if (gst_caps_structure_fixate_field_nearest_int (structure, "depth", 16)) {
+ return newcaps;
+ }
+ if (gst_caps_structure_fixate_field_nearest_int (structure, "width", 16)) {
+ return newcaps;
+ }
+ if (gst_caps_structure_fixate_field_nearest_int (structure, "channels", 2)) {
+ return newcaps;
+ }
+
+ gst_caps_free (newcaps);
+
+ return NULL;
+}
+
+static GstPadLinkReturn
+gst_osssink_sinkconnect (GstPad * pad, const GstCaps * caps)
{
GstOssSink *osssink = GST_OSSSINK (gst_pad_get_parent (pad));
return GST_PAD_LINK_OK;
}
-static inline gint64
-gst_osssink_get_delay (GstOssSink *osssink)
+static inline gint
+gst_osssink_get_delay (GstOssSink * osssink)
{
gint delay = 0;
+ gint ret;
if (GST_OSSELEMENT (osssink)->fd == -1)
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;
+
if (ioctl (GST_OSSELEMENT (osssink)->fd, SNDCTL_DSP_GETOSPACE, &info) < 0) {
delay = 0;
- }
- else {
- delay = (info.fragstotal * info.fragsize) - info.bytes;
+ } else {
+ delay = (info.fragstotal * info.fragsize) - info.bytes;
}
}
+
return delay;
}
-static GstClockTime
-gst_osssink_get_time (GstClock *clock, gpointer data)
+static GstClockTime
+gst_osssink_get_time (GstClock * clock, gpointer data)
{
GstOssSink *osssink = GST_OSSSINK (data);
gint delay;
- GstClockTime res;
+ GstClockTimeDiff res;
if (!GST_OSSELEMENT (osssink)->bps)
return 0;
delay = gst_osssink_get_delay (osssink);
- /* sometimes delay is bigger than the number of bytes sent to the device,
- * which screws up this calculation, we assume that everything is still
- * in the device then */
- if (((guint64)delay) > osssink->handled) {
+ /* sometimes delay is bigger than the number of bytes sent to the device,
+ * which screws up this calculation, we assume that everything is still
+ * in the device then
+ * thomas: with proper handling of the return value, this doesn't seem to
+ * happen anymore, so remove the second code path after april 2004 */
+ if (delay > (gint64) osssink->handled) {
+ /*g_warning ("Delay %d > osssink->handled %" G_GUINT64_FORMAT
+ ", setting to osssink->handled",
+ delay, osssink->handled); */
delay = osssink->handled;
}
- res = (osssink->handled - delay) * GST_SECOND / GST_OSSELEMENT (osssink)->bps;
+ res =
+ ((gint64) osssink->handled -
+ delay) * GST_SECOND / GST_OSSELEMENT (osssink)->bps;
+ if (res < 0)
+ res = 0;
return res;
}
-static GstClock*
-gst_osssink_get_clock (GstElement *element)
+static GstClock *
+gst_osssink_get_clock (GstElement * element)
{
GstOssSink *osssink;
-
+
osssink = GST_OSSSINK (element);
return GST_CLOCK (osssink->provided_clock);
}
static void
-gst_osssink_set_clock (GstElement *element, GstClock *clock)
+gst_osssink_set_clock (GstElement * element, GstClock * clock)
{
GstOssSink *osssink;
-
+
osssink = GST_OSSSINK (element);
- osssink->clock = clock;
+ osssink->clock = clock;
}
-static void
-gst_osssink_chain (GstPad *pad, GstData *_data)
+static void
+gst_osssink_chain (GstPad * pad, GstData * _data)
{
GstBuffer *buf = GST_BUFFER (_data);
GstOssSink *osssink;
- GstClockTime buftime;
+ GstClockTimeDiff buftime, soundtime, elementtime;
+ guchar *data;
+ guint to_write;
+ gint delay;
/* this has to be an audio buffer */
osssink = GST_OSSSINK (gst_pad_get_parent (pad));
switch (GST_EVENT_TYPE (event)) {
case GST_EVENT_EOS:
- ioctl (GST_OSSELEMENT (osssink)->fd, SNDCTL_DSP_SYNC);
- gst_audio_clock_set_active (GST_AUDIO_CLOCK (osssink->provided_clock), FALSE);
+ ioctl (GST_OSSELEMENT (osssink)->fd, SNDCTL_DSP_SYNC, 0);
+ gst_audio_clock_set_active (GST_AUDIO_CLOCK (osssink->provided_clock),
+ FALSE);
gst_pad_event_default (pad, event);
- return;
+ return;
case GST_EVENT_DISCONTINUOUS:
- {
- gint64 value;
-
- ioctl (GST_OSSELEMENT (osssink)->fd, SNDCTL_DSP_RESET);
- if (gst_event_discont_get_value (event, GST_FORMAT_TIME, &value)) {
- if (!gst_clock_handle_discont (osssink->clock, value))
- gst_audio_clock_set_active (GST_AUDIO_CLOCK (osssink->provided_clock), FALSE);
- osssink->handled = 0;
- }
- osssink->resync = TRUE;
-
- break;
- }
+ osssink->resync = TRUE;
+ /* pass-through */
default:
gst_pad_event_default (pad, event);
- return;
+ return;
}
- gst_event_unref (event);
- return;
+ g_assert_not_reached ();
}
if (!GST_OSSELEMENT (osssink)->bps) {
gst_buffer_unref (buf);
- gst_element_error (GST_ELEMENT (osssink), "capsnego was never performed, unknown data type");
+ GST_ELEMENT_ERROR (osssink, CORE, NEGOTIATION, (NULL),
+ ("format wasn't negotiated before chain function"));
return;
}
- buftime = GST_BUFFER_TIMESTAMP (buf);
-
- if (GST_OSSELEMENT (osssink)->fd >= 0) {
- if (!osssink->mute) {
- guchar *data = GST_BUFFER_DATA (buf);
- gint size = GST_BUFFER_SIZE (buf);
- gint to_write = 0;
-
- if (osssink->clock) {
- gint delay = 0;
- gint64 queued;
- GstClockTimeDiff jitter;
-
- delay = gst_osssink_get_delay (osssink);
- queued = delay * GST_SECOND / GST_OSSELEMENT (osssink)->bps;
-
- if (osssink->resync && osssink->sync) {
- GstClockID id = gst_clock_new_single_shot_id (osssink->clock, buftime - queued);
-
- gst_element_clock_wait (GST_ELEMENT (osssink), id, &jitter);
- gst_clock_id_free (id);
-
- if (jitter >= 0) {
- gst_clock_handle_discont (osssink->clock, buftime - queued + jitter);
- to_write = size;
- gst_audio_clock_set_active ((GstAudioClock*)osssink->provided_clock, TRUE);
- osssink->resync = FALSE;
- }
+ data = GST_BUFFER_DATA (buf);
+ to_write = GST_BUFFER_SIZE (buf);
+ /* sync audio with buffers timestamp. elementtime is the *current* time.
+ * soundtime is the time if the soundcard has processed all queued data. */
+ elementtime = gst_element_get_time (GST_ELEMENT (osssink));
+ delay = gst_osssink_get_delay (osssink);
+ if (delay < 0)
+ delay = 0;
+ soundtime = elementtime + delay * GST_SECOND / GST_OSSELEMENT (osssink)->bps;
+ if (GST_BUFFER_TIMESTAMP_IS_VALID (buf)) {
+ buftime = GST_BUFFER_TIMESTAMP (buf);
+ } else {
+ buftime = soundtime;
+ }
+ GST_LOG_OBJECT (osssink,
+ "time: real %" G_GUINT64_FORMAT ", buffer: %" G_GUINT64_FORMAT, soundtime,
+ buftime);
+ if (MAX (buftime, soundtime) - MIN (buftime, soundtime) > (GST_SECOND / 10)) {
+ /* we need to adjust to the buffers here */
+ GST_INFO_OBJECT (osssink,
+ "need sync: real %" G_GUINT64_FORMAT ", buffer: %" G_GUINT64_FORMAT,
+ soundtime, buftime);
+ if (soundtime > buftime) {
+ /* do *not* throw frames out. It's useless. The next frame will come in
+ * too late. And the next one. And so on. We don't want to lose sound.
+ * This is a placeholder for what - some day - should become QoS, i.e.
+ * sending events upstream to drop buffers. */
+ } else {
+ guint64 to_handle =
+ (((buftime -
+ soundtime) * GST_OSSELEMENT (osssink)->bps / GST_SECOND) /
+ ((GST_OSSELEMENT (osssink)->width / 8) *
+ GST_OSSELEMENT (osssink)->channels)) *
+ (GST_OSSELEMENT (osssink)->width / 8) *
+ GST_OSSELEMENT (osssink)->channels;
+
+ if (!osssink->resync) {
+ guint8 *buf = g_new (guint8, to_handle);
+
+ memset (buf, (GST_OSSELEMENT (osssink)->width == 8) ? 0 : 128,
+ to_handle);
+ while (to_handle > 0) {
+ gint done = write (GST_OSSELEMENT (osssink)->fd, buf,
+ MIN (to_handle, osssink->chunk_size));
+
+ if (done == -1 && errno != EINTR) {
+ break;
+ } else {
+ to_handle -= done;
+ osssink->handled += done;
+ }
}
- else {
- to_write = size;
- }
+ g_free (buf);
+ } else {
+ /* Timestamps at start-of-stream (MPEG) or after seek (hey,
+ * again MPEG!) can be borken, therefore this hacklet. */
+ osssink->handled += to_handle;
}
- /* no clock, try to be as fast as possible */
- else {
- audio_buf_info ospace;
-
- ioctl (GST_OSSELEMENT (osssink)->fd, SNDCTL_DSP_GETOSPACE, &ospace);
+ }
+ }
- if (ospace.bytes >= size) {
- to_write = size;
- }
- }
+ if (GST_OSSELEMENT (osssink)->fd >= 0 && to_write > 0) {
+ if (!osssink->mute) {
while (to_write > 0) {
- gint done = write (GST_OSSELEMENT (osssink)->fd, data,
- MIN (to_write, osssink->chunk_size));
+ gint done = write (GST_OSSELEMENT (osssink)->fd, data,
+ MIN (to_write, osssink->chunk_size));
- if (done == -1) {
- if (errno != EINTR)
+ if (done == -1) {
+ if (errno != EINTR)
break;
- }
- else {
+ } else {
to_write -= done;
data += done;
osssink->handled += done;
}
}
+ } else {
+ g_warning ("muting osssinks unimplemented wrt clocks!");
}
}
- gst_audio_clock_update_time ((GstAudioClock*)osssink->provided_clock, buftime);
+ gst_audio_clock_update_time ((GstAudioClock *) osssink->provided_clock,
+ gst_osssink_get_time (osssink->provided_clock, osssink));
gst_buffer_unref (buf);
}
-static const GstFormat*
-gst_osssink_get_formats (GstPad *pad)
+static const GstFormat *
+gst_osssink_get_formats (GstPad * pad)
{
static const GstFormat formats[] = {
GST_FORMAT_TIME,
}
static gboolean
-gst_osssink_convert (GstPad *pad, GstFormat src_format, gint64 src_value,
- GstFormat *dest_format, gint64 *dest_value)
+gst_osssink_convert (GstPad * pad, GstFormat src_format, gint64 src_value,
+ GstFormat * dest_format, gint64 * dest_value)
{
GstOssSink *osssink;
osssink = GST_OSSSINK (gst_pad_get_parent (pad));
-
+
return gst_osselement_convert (GST_OSSELEMENT (osssink),
- src_format, src_value,
- dest_format, dest_value);
+ src_format, src_value, dest_format, dest_value);
}
-static const GstQueryType*
-gst_osssink_get_query_types (GstPad *pad)
+static const GstQueryType *
+gst_osssink_get_query_types (GstPad * pad)
{
static const GstQueryType query_types[] = {
GST_QUERY_LATENCY,
}
static gboolean
-gst_osssink_sink_query (GstPad *pad, GstQueryType type, GstFormat *format, gint64 *value)
+gst_osssink_sink_query (GstPad * pad, GstQueryType type, GstFormat * format,
+ gint64 * value)
{
gboolean res = TRUE;
GstOssSink *osssink;
osssink = GST_OSSSINK (gst_pad_get_parent (pad));
-
+
switch (type) {
case GST_QUERY_LATENCY:
- if (!gst_osssink_convert (pad,
- GST_FORMAT_BYTES, gst_osssink_get_delay (osssink),
- format, value))
- {
- res = FALSE;
+ if (!gst_osssink_convert (pad,
+ GST_FORMAT_BYTES, gst_osssink_get_delay (osssink),
+ format, value)) {
+ res = FALSE;
}
break;
case GST_QUERY_POSITION:
- if (!gst_osssink_convert (pad,
- GST_FORMAT_TIME, gst_clock_get_time (osssink->provided_clock),
- format, value))
- {
- res = FALSE;
+ if (!gst_osssink_convert (pad,
+ GST_FORMAT_TIME, gst_element_get_time (GST_ELEMENT (osssink)),
+ format, value)) {
+ res = FALSE;
}
break;
default:
- res = gst_pad_query (gst_pad_get_peer (osssink->sinkpad), type, format, value);
+ res =
+ gst_pad_query (gst_pad_get_peer (osssink->sinkpad), type, format,
+ value);
break;
}
}
static gboolean
-gst_osssink_query (GstElement *element, GstQueryType type, GstFormat *format, gint64 *value)
+gst_osssink_query (GstElement * element, GstQueryType type, GstFormat * format,
+ gint64 * value)
{
GstOssSink *osssink = GST_OSSSINK (element);
return gst_osssink_sink_query (osssink->sinkpad, type, format, value);
}
-static void
-gst_osssink_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec)
+static void
+gst_osssink_set_property (GObject * object, guint prop_id, const GValue * value,
+ GParamSpec * pspec)
{
GstOssSink *osssink;
}
}
-static void
-gst_osssink_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
+static void
+gst_osssink_get_property (GObject * object, guint prop_id, GValue * value,
+ GParamSpec * pspec)
{
GstOssSink *osssink;
}
}
-static GstElementStateReturn
-gst_osssink_change_state (GstElement *element)
+static GstElementStateReturn
+gst_osssink_change_state (GstElement * element)
{
GstOssSink *osssink;
case GST_STATE_READY_TO_PAUSED:
break;
case GST_STATE_PAUSED_TO_PLAYING:
- osssink->resync = TRUE;
+ gst_audio_clock_set_active (GST_AUDIO_CLOCK (osssink->provided_clock),
+ TRUE);
break;
case GST_STATE_PLAYING_TO_PAUSED:
- if (GST_FLAG_IS_SET (element, GST_OSSSINK_OPEN))
- ioctl (GST_OSSELEMENT (osssink)->fd, SNDCTL_DSP_RESET, 0);
- gst_audio_clock_set_active (GST_AUDIO_CLOCK (osssink->provided_clock), FALSE);
- osssink->resync = TRUE;
+ if (GST_FLAG_IS_SET (element, GST_OSSSINK_OPEN))
+ ioctl (GST_OSSELEMENT (osssink)->fd, SNDCTL_DSP_RESET, 0);
+ gst_audio_clock_set_active (GST_AUDIO_CLOCK (osssink->provided_clock),
+ FALSE);
break;
case GST_STATE_PAUSED_TO_READY:
if (GST_FLAG_IS_SET (element, GST_OSSSINK_OPEN))
- ioctl (GST_OSSELEMENT (osssink)->fd, SNDCTL_DSP_RESET, 0);
+ ioctl (GST_OSSELEMENT (osssink)->fd, SNDCTL_DSP_RESET, 0);
gst_osselement_reset (GST_OSSELEMENT (osssink));
+ osssink->handled = 0;
+ osssink->resync = TRUE;
break;
default:
break;
}
-
+
if (GST_ELEMENT_CLASS (parent_class)->change_state)
return GST_ELEMENT_CLASS (parent_class)->change_state (element);