Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Seungha Yang
gst-plugins-base
Commits
dc5bb008
Commit
dc5bb008
authored
Sep 09, 2012
by
Thibault Saunier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
audio: port to the new GLib thread API
parent
acde0579
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
15 deletions
+12
-15
gst-libs/gst/audio/gstaudioringbuffer.c
gst-libs/gst/audio/gstaudioringbuffer.c
+2
-2
gst-libs/gst/audio/gstaudioringbuffer.h
gst-libs/gst/audio/gstaudioringbuffer.h
+2
-2
gst-libs/gst/audio/gstaudiosink.c
gst-libs/gst/audio/gstaudiosink.c
+4
-4
gst-libs/gst/audio/gstaudiosrc.c
gst-libs/gst/audio/gstaudiosrc.c
+4
-7
No files found.
gst-libs/gst/audio/gstaudioringbuffer.c
View file @
dc5bb008
...
...
@@ -83,7 +83,7 @@ gst_audio_ring_buffer_init (GstAudioRingBuffer * ringbuffer)
ringbuffer
->
open
=
FALSE
;
ringbuffer
->
acquired
=
FALSE
;
ringbuffer
->
state
=
GST_AUDIO_RING_BUFFER_STATE_STOPPED
;
ringbuffer
->
cond
=
g_cond_new
(
);
g_cond_init
(
&
ringbuffer
->
cond
);
ringbuffer
->
waiting
=
0
;
ringbuffer
->
empty_seg
=
NULL
;
ringbuffer
->
flushing
=
TRUE
;
...
...
@@ -105,7 +105,7 @@ gst_audio_ring_buffer_finalize (GObject * object)
{
GstAudioRingBuffer
*
ringbuffer
=
GST_AUDIO_RING_BUFFER
(
object
);
g_cond_
free
(
ringbuffer
->
cond
);
g_cond_
clear
(
&
ringbuffer
->
cond
);
g_free
(
ringbuffer
->
empty_seg
);
G_OBJECT_CLASS
(
gst_audio_ring_buffer_parent_class
)
->
finalize
(
G_OBJECT
...
...
gst-libs/gst/audio/gstaudioringbuffer.h
View file @
dc5bb008
...
...
@@ -145,7 +145,7 @@ struct _GstAudioRingBufferSpec
gpointer
_gst_reserved
[
GST_PADDING
];
};
#define GST_AUDIO_RING_BUFFER_GET_COND(buf) (((GstAudioRingBuffer *)buf)->cond)
#define GST_AUDIO_RING_BUFFER_GET_COND(buf)
(&
(((GstAudioRingBuffer *)buf)->cond)
)
#define GST_AUDIO_RING_BUFFER_WAIT(buf) (g_cond_wait (GST_AUDIO_RING_BUFFER_GET_COND (buf), GST_OBJECT_GET_LOCK (buf)))
#define GST_AUDIO_RING_BUFFER_SIGNAL(buf) (g_cond_signal (GST_AUDIO_RING_BUFFER_GET_COND (buf)))
#define GST_AUDIO_RING_BUFFER_BROADCAST(buf)(g_cond_broadcast (GST_AUDIO_RING_BUFFER_GET_COND (buf)))
...
...
@@ -171,7 +171,7 @@ struct _GstAudioRingBuffer {
GstObject
object
;
/*< public >*/
/* with LOCK */
GCond
*
cond
;
GCond
cond
;
gboolean
open
;
gboolean
acquired
;
guint8
*
memory
;
...
...
gst-libs/gst/audio/gstaudiosink.c
View file @
dc5bb008
...
...
@@ -92,7 +92,7 @@ GST_DEBUG_CATEGORY_STATIC (gst_audio_sink_debug);
typedef
struct
_GstAudioSinkRingBuffer
GstAudioSinkRingBuffer
;
typedef
struct
_GstAudioSinkRingBufferClass
GstAudioSinkRingBufferClass
;
#define GST_AUDIO_SINK_RING_BUFFER_GET_COND(buf) (((GstAudioSinkRingBuffer *)buf)->cond)
#define GST_AUDIO_SINK_RING_BUFFER_GET_COND(buf)
(&
(((GstAudioSinkRingBuffer *)buf)->cond)
)
#define GST_AUDIO_SINK_RING_BUFFER_WAIT(buf) (g_cond_wait (GST_AUDIO_SINK_RING_BUFFER_GET_COND (buf), GST_OBJECT_GET_LOCK (buf)))
#define GST_AUDIO_SINK_RING_BUFFER_SIGNAL(buf) (g_cond_signal (GST_AUDIO_SINK_RING_BUFFER_GET_COND (buf)))
#define GST_AUDIO_SINK_RING_BUFFER_BROADCAST(buf)(g_cond_broadcast (GST_AUDIO_SINK_RING_BUFFER_GET_COND (buf)))
...
...
@@ -104,7 +104,7 @@ struct _GstAudioSinkRingBuffer
gboolean
running
;
gint
queuedseg
;
GCond
*
cond
;
GCond
cond
;
};
struct
_GstAudioSinkRingBufferClass
...
...
@@ -320,7 +320,7 @@ gst_audio_sink_ring_buffer_init (GstAudioSinkRingBuffer * ringbuffer,
ringbuffer
->
running
=
FALSE
;
ringbuffer
->
queuedseg
=
0
;
ringbuffer
->
cond
=
g_cond_new
(
);
g_cond_init
(
&
ringbuffer
->
cond
);
}
static
void
...
...
@@ -334,7 +334,7 @@ gst_audio_sink_ring_buffer_finalize (GObject * object)
{
GstAudioSinkRingBuffer
*
ringbuffer
=
GST_AUDIO_SINK_RING_BUFFER_CAST
(
object
);
g_cond_
free
(
ringbuffer
->
cond
);
g_cond_
clear
(
&
ringbuffer
->
cond
);
G_OBJECT_CLASS
(
ring_parent_class
)
->
finalize
(
object
);
}
...
...
gst-libs/gst/audio/gstaudiosrc.c
View file @
dc5bb008
...
...
@@ -90,7 +90,7 @@ GST_DEBUG_CATEGORY_STATIC (gst_audio_src_debug);
typedef
struct
_GstAudioSrcRingBuffer
GstAudioSrcRingBuffer
;
typedef
struct
_GstAudioSrcRingBufferClass
GstAudioSrcRingBufferClass
;
#define GST_AUDIO_SRC_RING_BUFFER_GET_COND(buf) (((GstAudioSrcRingBuffer *)buf)->cond)
#define GST_AUDIO_SRC_RING_BUFFER_GET_COND(buf)
(&
(((GstAudioSrcRingBuffer *)buf)->cond)
)
#define GST_AUDIO_SRC_RING_BUFFER_WAIT(buf) (g_cond_wait (GST_AUDIO_SRC_RING_BUFFER_GET_COND (buf), GST_OBJECT_GET_LOCK (buf)))
#define GST_AUDIO_SRC_RING_BUFFER_SIGNAL(buf) (g_cond_signal (GST_AUDIO_SRC_RING_BUFFER_GET_COND (buf)))
#define GST_AUDIO_SRC_RING_BUFFER_BROADCAST(buf)(g_cond_broadcast (GST_AUDIO_SRC_RING_BUFFER_GET_COND (buf)))
...
...
@@ -102,7 +102,7 @@ struct _GstAudioSrcRingBuffer
gboolean
running
;
gint
queuedseg
;
GCond
*
cond
;
GCond
cond
;
};
struct
_GstAudioSrcRingBufferClass
...
...
@@ -301,7 +301,7 @@ gst_audio_src_ring_buffer_init (GstAudioSrcRingBuffer * ringbuffer,
ringbuffer
->
running
=
FALSE
;
ringbuffer
->
queuedseg
=
0
;
ringbuffer
->
cond
=
g_cond_new
(
);
g_cond_init
(
&
ringbuffer
->
cond
);
}
static
void
...
...
@@ -309,10 +309,7 @@ gst_audio_src_ring_buffer_dispose (GObject * object)
{
GstAudioSrcRingBuffer
*
ringbuffer
=
GST_AUDIO_SRC_RING_BUFFER
(
object
);
if
(
ringbuffer
->
cond
)
{
g_cond_free
(
ringbuffer
->
cond
);
ringbuffer
->
cond
=
NULL
;
}
g_cond_clear
(
&
ringbuffer
->
cond
);
G_OBJECT_CLASS
(
ring_parent_class
)
->
dispose
(
object
);
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment