Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
G
gst-plugins-good
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
George Kiagiadakis
gst-plugins-good
Commits
5534c7d9
Commit
5534c7d9
authored
Jun 18, 2010
by
Wim Taymans
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
rtspsrc: fix locking after moving things around
parent
0b379913
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
5 deletions
+6
-5
gst/rtsp/gstrtspsrc.c
gst/rtsp/gstrtspsrc.c
+6
-5
No files found.
gst/rtsp/gstrtspsrc.c
View file @
5534c7d9
...
...
@@ -5137,8 +5137,6 @@ gst_rtspsrc_retrieve_sdp (GstRTSPSrc * src, GstSDPMessage ** sdp)
guint
size
;
gchar
*
respcont
=
NULL
;
GST_RTSP_STATE_LOCK
(
src
);
restart:
src
->
need_redirect
=
FALSE
;
...
...
@@ -5282,7 +5280,6 @@ cleanup_error:
GST_DEBUG_OBJECT
(
src
,
"free connection"
);
gst_rtsp_conninfo_close
(
src
,
&
src
->
conninfo
,
TRUE
);
}
GST_RTSP_STATE_UNLOCK
(
src
);
gst_rtsp_message_unset
(
&
request
);
gst_rtsp_message_unset
(
&
response
);
return
FALSE
;
...
...
@@ -5297,6 +5294,8 @@ gst_rtspsrc_open (GstRTSPSrc * src)
src
->
methods
=
GST_RTSP_SETUP
|
GST_RTSP_PLAY
|
GST_RTSP_PAUSE
|
GST_RTSP_TEARDOWN
;
GST_RTSP_STATE_LOCK
(
src
);
if
(
src
->
sdp
==
NULL
)
{
if
(
!
(
res
=
gst_rtspsrc_retrieve_sdp
(
src
,
&
src
->
sdp
)))
goto
no_sdp
;
...
...
@@ -5305,17 +5304,21 @@ gst_rtspsrc_open (GstRTSPSrc * src)
if
(
!
(
res
=
gst_rtspsrc_open_from_sdp
(
src
,
src
->
sdp
)))
goto
open_failed
;
GST_RTSP_STATE_UNLOCK
(
src
);
return
res
;
/* ERRORS */
no_sdp:
{
GST_WARNING_OBJECT
(
src
,
"can't get sdp"
);
GST_RTSP_STATE_UNLOCK
(
src
);
return
FALSE
;
}
open_failed:
{
GST_WARNING_OBJECT
(
src
,
"can't setup streaming from sdp"
);
GST_RTSP_STATE_UNLOCK
(
src
);
return
FALSE
;
}
}
...
...
@@ -5452,7 +5455,6 @@ close:
/* ERRORS */
create_request_failed:
{
GST_RTSP_STATE_UNLOCK
(
src
);
GST_ELEMENT_ERROR
(
src
,
LIBRARY
,
INIT
,
(
NULL
),
(
"Could not create request."
));
ret
=
FALSE
;
...
...
@@ -5460,7 +5462,6 @@ create_request_failed:
}
send_error:
{
GST_RTSP_STATE_UNLOCK
(
src
);
gst_rtsp_message_unset
(
&
request
);
GST_ELEMENT_ERROR
(
src
,
RESOURCE
,
WRITE
,
(
NULL
),
(
"Could not send message."
));
...
...
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