mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-13 20:06:35 +00:00
A commit of pending (small) changes...
Original commit message from CVS: A commit of pending (small) changes...
This commit is contained in:
parent
f7784bdb6f
commit
f4e002ad63
13 changed files with 89 additions and 87 deletions
|
@ -9,7 +9,6 @@ GtkObject
|
||||||
GstFakeSrc
|
GstFakeSrc
|
||||||
GstFakeSink
|
GstFakeSink
|
||||||
GstDiskSrc
|
GstDiskSrc
|
||||||
GstDiskSink
|
|
||||||
GstHttpSrc
|
GstHttpSrc
|
||||||
GstFdSrc
|
GstFdSrc
|
||||||
GstSineSrc
|
GstSineSrc
|
||||||
|
|
|
@ -61,9 +61,9 @@ The maximum number of cothreads we are going to support.
|
||||||
@argv:
|
@argv:
|
||||||
@flags:
|
@flags:
|
||||||
@sp:
|
@sp:
|
||||||
|
@jmp:
|
||||||
@top_sp:
|
@top_sp:
|
||||||
@pc:
|
@pc:
|
||||||
@jmp:
|
|
||||||
|
|
||||||
<!-- ##### STRUCT cothread_context ##### -->
|
<!-- ##### STRUCT cothread_context ##### -->
|
||||||
<para>
|
<para>
|
||||||
|
|
|
@ -221,10 +221,10 @@ used when data in a stream has been skipped
|
||||||
@offset:
|
@offset:
|
||||||
@timestamp:
|
@timestamp:
|
||||||
@maxage:
|
@maxage:
|
||||||
@metas:
|
|
||||||
@parent:
|
@parent:
|
||||||
@pool:
|
@pool:
|
||||||
@pool_private:
|
@pool_private:
|
||||||
|
@free:
|
||||||
|
|
||||||
<!-- ##### FUNCTION gst_buffer_new ##### -->
|
<!-- ##### FUNCTION gst_buffer_new ##### -->
|
||||||
<para>
|
<para>
|
||||||
|
@ -306,39 +306,3 @@ used when data in a stream has been skipped
|
||||||
@buffer:
|
@buffer:
|
||||||
|
|
||||||
|
|
||||||
<!-- ##### FUNCTION gst_buffer_add_meta ##### -->
|
|
||||||
<para>
|
|
||||||
|
|
||||||
</para>
|
|
||||||
|
|
||||||
@buffer:
|
|
||||||
@meta:
|
|
||||||
|
|
||||||
|
|
||||||
<!-- ##### FUNCTION gst_buffer_get_first_meta ##### -->
|
|
||||||
<para>
|
|
||||||
|
|
||||||
</para>
|
|
||||||
|
|
||||||
@buffer:
|
|
||||||
@Returns:
|
|
||||||
|
|
||||||
|
|
||||||
<!-- ##### FUNCTION gst_buffer_get_metas ##### -->
|
|
||||||
<para>
|
|
||||||
|
|
||||||
</para>
|
|
||||||
|
|
||||||
@buffer:
|
|
||||||
@Returns:
|
|
||||||
|
|
||||||
|
|
||||||
<!-- ##### FUNCTION gst_buffer_remove_meta ##### -->
|
|
||||||
<para>
|
|
||||||
|
|
||||||
</para>
|
|
||||||
|
|
||||||
@buffer:
|
|
||||||
@meta:
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -22,15 +22,3 @@ The disksink write to a file. The filename can be given as an argument.
|
||||||
@GST_DISKSINK_OPEN:
|
@GST_DISKSINK_OPEN:
|
||||||
@GST_DISKSINK_FLAG_LAST:
|
@GST_DISKSINK_FLAG_LAST:
|
||||||
|
|
||||||
<!-- ##### SIGNAL GstDiskSink::handoff ##### -->
|
|
||||||
<para>
|
|
||||||
Is emited after the buffer has been written to the disk.
|
|
||||||
</para>
|
|
||||||
|
|
||||||
@gstdisksink: the object which received the signal.
|
|
||||||
|
|
||||||
<!-- ##### ARG GstDiskSink:location ##### -->
|
|
||||||
<para>
|
|
||||||
The filename to write to.
|
|
||||||
</para>
|
|
||||||
|
|
||||||
|
|
|
@ -267,24 +267,6 @@ circumstances.
|
||||||
@Returns:
|
@Returns:
|
||||||
|
|
||||||
|
|
||||||
<!-- ##### FUNCTION gst_element_set_manager ##### -->
|
|
||||||
<para>
|
|
||||||
|
|
||||||
</para>
|
|
||||||
|
|
||||||
@element:
|
|
||||||
@manager:
|
|
||||||
|
|
||||||
|
|
||||||
<!-- ##### FUNCTION gst_element_get_manager ##### -->
|
|
||||||
<para>
|
|
||||||
|
|
||||||
</para>
|
|
||||||
|
|
||||||
@element:
|
|
||||||
@Returns:
|
|
||||||
|
|
||||||
|
|
||||||
<!-- ##### FUNCTION gst_element_set_parent ##### -->
|
<!-- ##### FUNCTION gst_element_set_parent ##### -->
|
||||||
<para>
|
<para>
|
||||||
|
|
||||||
|
|
|
@ -46,3 +46,8 @@ The <classname>GstFakeSrc</classname> generates empty buffers. (fakesrc)
|
||||||
|
|
||||||
</para>
|
</para>
|
||||||
|
|
||||||
|
<!-- ##### ARG GstFakeSrc:eos ##### -->
|
||||||
|
<para>
|
||||||
|
|
||||||
|
</para>
|
||||||
|
|
||||||
|
|
|
@ -726,6 +726,7 @@ Get the type of the region that is being pulled.
|
||||||
@regiontype:
|
@regiontype:
|
||||||
@offset:
|
@offset:
|
||||||
@len:
|
@len:
|
||||||
|
@sched:
|
||||||
@chainfunc:
|
@chainfunc:
|
||||||
@getfunc:
|
@getfunc:
|
||||||
@getregionfunc:
|
@getregionfunc:
|
||||||
|
|
|
@ -313,6 +313,12 @@ the stream.
|
||||||
</para>
|
</para>
|
||||||
|
|
||||||
|
|
||||||
|
<!-- ##### ARG GstDiskSink:location ##### -->
|
||||||
|
<para>
|
||||||
|
The filename to write to.
|
||||||
|
</para>
|
||||||
|
|
||||||
|
|
||||||
<!-- ##### MACRO GST_IS_SRC_CLASS ##### -->
|
<!-- ##### MACRO GST_IS_SRC_CLASS ##### -->
|
||||||
<para>
|
<para>
|
||||||
|
|
||||||
|
@ -645,6 +651,14 @@ Specify the current offset in the file.
|
||||||
</para>
|
</para>
|
||||||
|
|
||||||
|
|
||||||
|
<!-- ##### FUNCTION gst_element_get_manager ##### -->
|
||||||
|
<para>
|
||||||
|
|
||||||
|
</para>
|
||||||
|
|
||||||
|
@element:
|
||||||
|
@Returns:
|
||||||
|
|
||||||
<!-- ##### STRUCT MetaDGA ##### -->
|
<!-- ##### STRUCT MetaDGA ##### -->
|
||||||
<para>
|
<para>
|
||||||
|
|
||||||
|
@ -966,6 +980,14 @@ The buffer is sent to the sound card.
|
||||||
@pad:
|
@pad:
|
||||||
@Returns:
|
@Returns:
|
||||||
|
|
||||||
|
<!-- ##### FUNCTION gst_buffer_add_meta ##### -->
|
||||||
|
<para>
|
||||||
|
|
||||||
|
</para>
|
||||||
|
|
||||||
|
@buffer:
|
||||||
|
@meta:
|
||||||
|
|
||||||
<!-- ##### FUNCTION gst_elementfactory_can_src_caps_list ##### -->
|
<!-- ##### FUNCTION gst_elementfactory_can_src_caps_list ##### -->
|
||||||
<para>
|
<para>
|
||||||
|
|
||||||
|
@ -989,6 +1011,14 @@ The buffer is sent to the sound card.
|
||||||
</para>
|
</para>
|
||||||
|
|
||||||
|
|
||||||
|
<!-- ##### FUNCTION gst_buffer_remove_meta ##### -->
|
||||||
|
<para>
|
||||||
|
|
||||||
|
</para>
|
||||||
|
|
||||||
|
@buffer:
|
||||||
|
@meta:
|
||||||
|
|
||||||
<!-- ##### FUNCTION gst_caps_register_count ##### -->
|
<!-- ##### FUNCTION gst_caps_register_count ##### -->
|
||||||
<para>
|
<para>
|
||||||
|
|
||||||
|
@ -1111,6 +1141,13 @@ The buffer is sent to the sound card.
|
||||||
@name:
|
@name:
|
||||||
@Returns:
|
@Returns:
|
||||||
|
|
||||||
|
<!-- ##### SIGNAL GstDiskSink::handoff ##### -->
|
||||||
|
<para>
|
||||||
|
Is emited after the buffer has been written to the disk.
|
||||||
|
</para>
|
||||||
|
|
||||||
|
@gstdisksink: the object which received the signal.
|
||||||
|
|
||||||
<!-- ##### MACRO GST_ESDSINK ##### -->
|
<!-- ##### MACRO GST_ESDSINK ##### -->
|
||||||
<para>
|
<para>
|
||||||
|
|
||||||
|
@ -1521,6 +1558,14 @@ Indicates a srcpad for the padfactory.
|
||||||
</para>
|
</para>
|
||||||
|
|
||||||
|
|
||||||
|
<!-- ##### FUNCTION gst_buffer_get_first_meta ##### -->
|
||||||
|
<para>
|
||||||
|
|
||||||
|
</para>
|
||||||
|
|
||||||
|
@buffer:
|
||||||
|
@Returns:
|
||||||
|
|
||||||
<!-- ##### MACRO GST_IS_SINK_CLASS ##### -->
|
<!-- ##### MACRO GST_IS_SINK_CLASS ##### -->
|
||||||
<para>
|
<para>
|
||||||
|
|
||||||
|
@ -1667,6 +1712,14 @@ GstSrc
|
||||||
@props:
|
@props:
|
||||||
@Returns:
|
@Returns:
|
||||||
|
|
||||||
|
<!-- ##### FUNCTION gst_element_set_manager ##### -->
|
||||||
|
<para>
|
||||||
|
|
||||||
|
</para>
|
||||||
|
|
||||||
|
@element:
|
||||||
|
@manager:
|
||||||
|
|
||||||
<!-- ##### MACRO GST_TYPE_AUDIOSRC ##### -->
|
<!-- ##### MACRO GST_TYPE_AUDIOSRC ##### -->
|
||||||
<para>
|
<para>
|
||||||
|
|
||||||
|
@ -1784,13 +1837,6 @@ or a video card.
|
||||||
</para>
|
</para>
|
||||||
|
|
||||||
|
|
||||||
<!-- ##### FUNCTION gst_esdsink_get_type ##### -->
|
|
||||||
<para>
|
|
||||||
|
|
||||||
</para>
|
|
||||||
|
|
||||||
@Returns:
|
|
||||||
|
|
||||||
<!-- ##### MACRO GST_IS_BIN_CLASS ##### -->
|
<!-- ##### MACRO GST_IS_BIN_CLASS ##### -->
|
||||||
<para>
|
<para>
|
||||||
|
|
||||||
|
@ -1798,6 +1844,13 @@ or a video card.
|
||||||
|
|
||||||
@obj:
|
@obj:
|
||||||
|
|
||||||
|
<!-- ##### FUNCTION gst_esdsink_get_type ##### -->
|
||||||
|
<para>
|
||||||
|
|
||||||
|
</para>
|
||||||
|
|
||||||
|
@Returns:
|
||||||
|
|
||||||
<!-- ##### SECTION ./tmpl/GstElement.sgml:See_Also ##### -->
|
<!-- ##### SECTION ./tmpl/GstElement.sgml:See_Also ##### -->
|
||||||
<para>
|
<para>
|
||||||
|
|
||||||
|
@ -1818,6 +1871,12 @@ Query whether this object has multiple input pads.
|
||||||
|
|
||||||
@obj: Element to query for multiple input pads.
|
@obj: Element to query for multiple input pads.
|
||||||
|
|
||||||
|
<!-- ##### SECTION ./tmpl/gstfilter.sgml:See_Also ##### -->
|
||||||
|
<para>
|
||||||
|
|
||||||
|
</para>
|
||||||
|
|
||||||
|
|
||||||
<!-- ##### MACRO DEBUG_NOPREFIX ##### -->
|
<!-- ##### MACRO DEBUG_NOPREFIX ##### -->
|
||||||
<para>
|
<para>
|
||||||
|
|
||||||
|
@ -1826,12 +1885,6 @@ Query whether this object has multiple input pads.
|
||||||
@format:
|
@format:
|
||||||
@args...:
|
@args...:
|
||||||
|
|
||||||
<!-- ##### SECTION ./tmpl/gstfilter.sgml:See_Also ##### -->
|
|
||||||
<para>
|
|
||||||
|
|
||||||
</para>
|
|
||||||
|
|
||||||
|
|
||||||
<!-- ##### ARG GstAudioSink:frequency ##### -->
|
<!-- ##### ARG GstAudioSink:frequency ##### -->
|
||||||
<para>
|
<para>
|
||||||
|
|
||||||
|
@ -2749,6 +2802,14 @@ the offset.
|
||||||
</para>
|
</para>
|
||||||
|
|
||||||
|
|
||||||
|
<!-- ##### FUNCTION gst_buffer_get_metas ##### -->
|
||||||
|
<para>
|
||||||
|
|
||||||
|
</para>
|
||||||
|
|
||||||
|
@buffer:
|
||||||
|
@Returns:
|
||||||
|
|
||||||
<!-- ##### MACRO GST_IS_ASYNCDISKSRC_CLASS ##### -->
|
<!-- ##### MACRO GST_IS_ASYNCDISKSRC_CLASS ##### -->
|
||||||
<para>
|
<para>
|
||||||
|
|
||||||
|
|
|
@ -24,8 +24,10 @@ Thread flags:
|
||||||
</para>
|
</para>
|
||||||
|
|
||||||
@GST_THREAD_CREATE: The thread is being created.
|
@GST_THREAD_CREATE: The thread is being created.
|
||||||
|
@GST_THREAD_STATE_STARTED:
|
||||||
@GST_THREAD_STATE_SPINNING: The thread is runnning
|
@GST_THREAD_STATE_SPINNING: The thread is runnning
|
||||||
@GST_THREAD_STATE_REAPING: The thread is ending.
|
@GST_THREAD_STATE_REAPING: The thread is ending.
|
||||||
|
@GST_THREAD_STATE_ELEMENT_CHANGED:
|
||||||
@GST_THREAD_FLAG_LAST: subclass use this to start their enumeration
|
@GST_THREAD_FLAG_LAST: subclass use this to start their enumeration
|
||||||
|
|
||||||
<!-- ##### STRUCT GstThread ##### -->
|
<!-- ##### STRUCT GstThread ##### -->
|
||||||
|
|
|
@ -41,7 +41,7 @@ gst_play_typefind (GstBin *bin, GstElement *element)
|
||||||
// push a buffer... the have_type signal handler will set the found flag
|
// push a buffer... the have_type signal handler will set the found flag
|
||||||
gst_bin_iterate (bin);
|
gst_bin_iterate (bin);
|
||||||
|
|
||||||
gst_element_set_state (GST_ELEMENT (bin), GST_STATE_NULL);
|
gst_element_set_state (GST_ELEMENT (bin), GST_STATE_PAUSED);
|
||||||
|
|
||||||
caps = gst_pad_get_caps (gst_element_get_pad (element, "src"));
|
caps = gst_pad_get_caps (gst_element_get_pad (element, "src"));
|
||||||
|
|
||||||
|
|
|
@ -124,7 +124,7 @@ gst_play_init (GstPlay *play)
|
||||||
/* create a new bin to hold the elements */
|
/* create a new bin to hold the elements */
|
||||||
priv->thread = gst_thread_new ("main_thread");
|
priv->thread = gst_thread_new ("main_thread");
|
||||||
g_assert (priv->thread != NULL);
|
g_assert (priv->thread != NULL);
|
||||||
priv->bin = gst_bin_new ("main_bin");
|
priv->bin = gst_pipeline_new ("main_bin");
|
||||||
g_assert (priv->bin != NULL);
|
g_assert (priv->bin != NULL);
|
||||||
|
|
||||||
priv->audio_element = gst_elementfactory_make ("osssink", "play_audio");
|
priv->audio_element = gst_elementfactory_make ("osssink", "play_audio");
|
||||||
|
|
|
@ -25,7 +25,7 @@ void new_pad(GstElement *parse,GstPad *pad,GstElement *pipeline) {
|
||||||
gst_element_connect(audioqueue,"src",audiodecode,"sink");
|
gst_element_connect(audioqueue,"src",audiodecode,"sink");
|
||||||
|
|
||||||
fprintf(stderr,"creating esdsink\n");
|
fprintf(stderr,"creating esdsink\n");
|
||||||
audiosink = gst_elementfactory_make("esdsink","audiosink");
|
audiosink = gst_elementfactory_make("osssink","audiosink");
|
||||||
gst_bin_add(GST_BIN(audiothread),audiosink);
|
gst_bin_add(GST_BIN(audiothread),audiosink);
|
||||||
gst_element_connect(audiodecode,"src",audiosink,"sink");
|
gst_element_connect(audiodecode,"src",audiosink,"sink");
|
||||||
|
|
||||||
|
@ -45,7 +45,7 @@ int main(int argc,char *argv[]) {
|
||||||
pipeline = gst_pipeline_new("pipeline");
|
pipeline = gst_pipeline_new("pipeline");
|
||||||
sourcethread = gst_elementfactory_make("thread","sourcethread");
|
sourcethread = gst_elementfactory_make("thread","sourcethread");
|
||||||
src = gst_elementfactory_make("disksrc","src");
|
src = gst_elementfactory_make("disksrc","src");
|
||||||
gtk_object_set(GTK_OBJECT(src),"location","/home/omega/media/AlienSong.mpg",NULL);
|
gtk_object_set(GTK_OBJECT(src),"location","/opt/data/AlienSong.mpg",NULL);
|
||||||
parse = gst_elementfactory_make("mpeg1parse","parse");
|
parse = gst_elementfactory_make("mpeg1parse","parse");
|
||||||
|
|
||||||
gtk_signal_connect(GTK_OBJECT(parse),"new_pad",
|
gtk_signal_connect(GTK_OBJECT(parse),"new_pad",
|
||||||
|
|
|
@ -41,7 +41,7 @@ gst_play_typefind (GstBin *bin, GstElement *element)
|
||||||
// push a buffer... the have_type signal handler will set the found flag
|
// push a buffer... the have_type signal handler will set the found flag
|
||||||
gst_bin_iterate (bin);
|
gst_bin_iterate (bin);
|
||||||
|
|
||||||
gst_element_set_state (GST_ELEMENT (bin), GST_STATE_NULL);
|
gst_element_set_state (GST_ELEMENT (bin), GST_STATE_PAUSED);
|
||||||
|
|
||||||
caps = gst_pad_get_caps (gst_element_get_pad (element, "src"));
|
caps = gst_pad_get_caps (gst_element_get_pad (element, "src"));
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue