From: Wim Taymans Date: Tue, 4 Nov 2008 11:55:08 +0000 (+0000) Subject: docs/manual/: Some Application Development Manual fixes thanks to X-Git-Tag: GIT_CONVERSION~91 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c6cc3bbca820384e9a438eef37b8f33283fc5748;p=platform%2Fupstream%2Fgstreamer.git docs/manual/: Some Application Development Manual fixes thanks to Original commit message from CVS: * docs/manual/advanced-position.xml: * docs/manual/basics-bins.xml: * docs/manual/basics-bus.xml: * docs/manual/basics-pads.xml: * docs/manual/intro-gstreamer.xml: * docs/manual/intro-preface.xml: Some Application Development Manual fixes thanks to Andrew Feren. Fixes #558459. --- diff --git a/ChangeLog b/ChangeLog index 447e814..ea45d87 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2008-11-04 Wim Taymans + + * docs/manual/advanced-position.xml: + * docs/manual/basics-bins.xml: + * docs/manual/basics-bus.xml: + * docs/manual/basics-pads.xml: + * docs/manual/intro-gstreamer.xml: + * docs/manual/intro-preface.xml: + Some Application Development Manual fixes thanks to + Andrew Feren. Fixes #558459. + 2008-11-03 Stefan Kost * gst/gstregistrybinary.c: diff --git a/docs/manual/advanced-position.xml b/docs/manual/advanced-position.xml index e794ecd..01c57a8 100644 --- a/docs/manual/advanced-position.xml +++ b/docs/manual/advanced-position.xml @@ -192,10 +192,21 @@ seek_to_time (GstElement *pipeline, } - Seeks should usually be done when the pipeline is in PAUSED or PLAYING - state (when it is in PLAYING state the pipeline will pause itself, issue - the seek, and then set itself back to PLAYING again itself). - returns. + Seeks with the GST_SEEK_FLAG_FLUSH should be done when the pipeline is + in PAUSED or PLAYING state. The pipeline will automatically go to preroll + state until the new data after the seek will cause the pipeline to preroll + again. After the pipeline is prerolled, it will go back to the state + (PAUSED or PLAYING) it was in when the seek was executed. You can wait + (blocking) for the seek to complete with + gst_element_get_state() or by waiting for the + ASYNC_DONE message to appear on the bus. + + + + Seeks without the GST_SEEK_FLAG_FLUSH should only be done when the + pipeline is in the PLAYING state. Executing a non-flushing seek in the + PAUSED state might deadlock because the pipeline streaming threads might + be blocked in the sinks. diff --git a/docs/manual/basics-bins.xml b/docs/manual/basics-bins.xml index 98b6d5e..733c466 100644 --- a/docs/manual/basics-bins.xml +++ b/docs/manual/basics-bins.xml @@ -79,13 +79,16 @@ main (int argc, /* create */ pipeline = gst_pipeline_new ("my_pipeline"); - bin = gst_pipeline_new ("my_bin"); + bin = gst_bin_new ("my_bin"); source = gst_element_factory_make ("fakesrc", "source"); sink = gst_element_factory_make ("fakesink", "sink"); - /* set up pipeline */ + /* First add the elements to the bin */ gst_bin_add_many (GST_BIN (bin), source, sink, NULL); + /* add the bin to the pipeline */ gst_bin_add (GST_BIN (pipeline), bin); + + /* link the elements */ gst_element_link (source, sink); [..]