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
Toggle navigation
Open sidebar
George Kiagiadakis
gst-plugins-good
Commits
81fc7841
Commit
81fc7841
authored
Aug 21, 2011
by
Mark Nauwelaerts
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
rtspsrc: do not set elements to PLAYING when doing seek in PAUSED
parent
915db260
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
5 deletions
+8
-5
gst/rtsp/gstrtspsrc.c
gst/rtsp/gstrtspsrc.c
+8
-5
No files found.
gst/rtsp/gstrtspsrc.c
View file @
81fc7841
...
...
@@ -1680,7 +1680,7 @@ cleanup:
}
static
void
gst_rtspsrc_flush
(
GstRTSPSrc
*
src
,
gboolean
flush
)
gst_rtspsrc_flush
(
GstRTSPSrc
*
src
,
gboolean
flush
,
gboolean
playing
)
{
GstEvent
*
event
;
gint
cmd
,
i
;
...
...
@@ -1696,9 +1696,12 @@ gst_rtspsrc_flush (GstRTSPSrc * src, gboolean flush)
state
=
GST_STATE_PAUSED
;
}
else
{
event
=
gst_event_new_flush_stop
();
GST_DEBUG_OBJECT
(
src
,
"stop flush
"
);
GST_DEBUG_OBJECT
(
src
,
"stop flush
; playing %d"
,
playing
);
cmd
=
CMD_LOOP
;
state
=
GST_STATE_PLAYING
;
if
(
playing
)
state
=
GST_STATE_PLAYING
;
else
state
=
GST_STATE_PAUSED
;
clock
=
gst_element_get_clock
(
GST_ELEMENT_CAST
(
src
));
if
(
clock
)
{
base_time
=
gst_clock_get_time
(
clock
);
...
...
@@ -1847,7 +1850,7 @@ gst_rtspsrc_perform_seek (GstRTSPSrc * src, GstEvent * event)
* blocking in preroll). */
if
(
flush
)
{
GST_DEBUG_OBJECT
(
src
,
"starting flush"
);
gst_rtspsrc_flush
(
src
,
TRUE
);
gst_rtspsrc_flush
(
src
,
TRUE
,
FALSE
);
}
else
{
if
(
src
->
task
)
{
gst_task_pause
(
src
->
task
);
...
...
@@ -1896,7 +1899,7 @@ gst_rtspsrc_perform_seek (GstRTSPSrc * src, GstEvent * event)
if
(
flush
)
{
/* if we started flush, we stop now */
GST_DEBUG_OBJECT
(
src
,
"stopping flush"
);
gst_rtspsrc_flush
(
src
,
FALSE
);
gst_rtspsrc_flush
(
src
,
FALSE
,
playing
);
}
else
if
(
src
->
running
)
{
/* re-engage loop */
gst_rtspsrc_loop_send_cmd
(
src
,
CMD_LOOP
,
FALSE
);
...
...
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