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-base
Commits
c1b42827
Commit
c1b42827
authored
Jun 06, 2014
by
Vincent Penquerc'h
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
oggdemux: allow unset seek stop time in push mode
parent
55b4d8f6
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
3 deletions
+12
-3
ext/ogg/gstoggdemux.c
ext/ogg/gstoggdemux.c
+12
-3
No files found.
ext/ogg/gstoggdemux.c
View file @
c1b42827
...
...
@@ -2161,11 +2161,15 @@ gst_ogg_demux_sink_event (GstPad * pad, GstObject * parent, GstEvent * event)
ogg
->
push_byte_offset
=
segment
.
start
;
ogg
->
push_last_seek_offset
=
segment
.
start
;
if
(
gst_event_get_seqnum
(
event
)
==
ogg
->
push_seek_seqnum
)
if
(
gst_event_get_seqnum
(
event
)
==
ogg
->
push_seek_seqnum
)
{
GstSeekType
stop_type
=
GST_SEEK_TYPE_NONE
;
if
(
ogg
->
push_seek_time_original_stop
!=
-
1
)
stop_type
=
GST_SEEK_TYPE_SET
;
gst_segment_do_seek
(
&
ogg
->
segment
,
ogg
->
push_seek_rate
,
GST_FORMAT_TIME
,
ogg
->
push_seek_flags
,
GST_SEEK_TYPE_SET
,
ogg
->
push_seek_time_original_target
,
GST_SEEK_TYPE_SET
,
ogg
->
push_seek_time_original_target
,
stop_type
,
ogg
->
push_seek_time_original_stop
,
&
update
);
}
GST_PUSH_UNLOCK
(
ogg
);
}
else
{
...
...
@@ -3485,11 +3489,16 @@ gst_ogg_demux_perform_seek_push (GstOggDemux * ogg, GstEvent * event)
goto
error
;
}
if
(
start_type
!=
GST_SEEK_TYPE_SET
||
stop_type
!=
GST_SEEK_TYPE_SET
)
{
if
(
start_type
!=
GST_SEEK_TYPE_SET
)
{
GST_DEBUG_OBJECT
(
ogg
,
"can only seek to a SET target"
);
goto
error
;
}
/* If stop is unset, make sure it is -1, as this value will be tested
later to check whether stop is set or not */
if
(
stop_type
==
GST_SEEK_TYPE_NONE
)
stop
=
-
1
;
if
(
!
(
flags
&
GST_SEEK_FLAG_FLUSH
))
{
GST_DEBUG_OBJECT
(
ogg
,
"can only do flushing seeks"
);
goto
error
;
...
...
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