highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ffserver: merge RTSP's teardown & pause routines

Browse Source 
They were basically the same.

Signed-off-by: Reynaldo H. Verdejo Pinochet <r.verdejo@sisa.samsung.com>
This commit is contained in:
Reynaldo H. Verdejo Pinochet
2014-02-13 15:03:52 -03:00
parent 720530e52a
commit 87079bd055
1 changed files with 14 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
ffserver.c
View File

@@ -287,8 +287,7 @@ static void rtsp_cmd_describe(HTTPContext *c, const char *url);
static void rtsp_cmd_options(HTTPContext *c, const char *url); static void rtsp_cmd_options(HTTPContext *c, const char *url);
static void rtsp_cmd_setup(HTTPContext *c, const char *url, RTSPMessageHeader *h); static void rtsp_cmd_setup(HTTPContext *c, const char *url, RTSPMessageHeader *h);
static void rtsp_cmd_play(HTTPContext *c, const char *url, RTSPMessageHeader *h); static void rtsp_cmd_play(HTTPContext *c, const char *url, RTSPMessageHeader *h);
static void rtsp_cmd_pause(HTTPContext *c, const char *url, RTSPMessageHeader *h); static void rtsp_cmd_interrupt(HTTPContext *c, const char *url, RTSPMessageHeader *h, int pause_only);
static void rtsp_cmd_teardown(HTTPContext *c, const char *url, RTSPMessageHeader *h);
/* SDP handling */ /* SDP handling */
static int prepare_sdp_description(FFStream *stream, uint8_t **pbuffer, static int prepare_sdp_description(FFStream *stream, uint8_t **pbuffer,
@@ -2962,9 +2961,9 @@ static int rtsp_parse_request(HTTPContext *c)
else if (!strcmp(cmd, "PLAY")) else if (!strcmp(cmd, "PLAY"))
rtsp_cmd_play(c, url, header); rtsp_cmd_play(c, url, header);
else if (!strcmp(cmd, "PAUSE")) else if (!strcmp(cmd, "PAUSE"))
rtsp_cmd_pause(c, url, header); rtsp_cmd_interrupt(c, url, header, 1);
else if (!strcmp(cmd, "TEARDOWN")) else if (!strcmp(cmd, "TEARDOWN"))
rtsp_cmd_teardown(c, url, header); rtsp_cmd_interrupt(c, url, header, 0);
else else
rtsp_reply_error(c, RTSP_STATUS_METHOD); rtsp_reply_error(c, RTSP_STATUS_METHOD);
@@ -3318,7 +3317,7 @@ static void rtsp_cmd_play(HTTPContext *c, const char *url, RTSPMessageHeader *h)
avio_printf(c->pb, "\r\n"); avio_printf(c->pb, "\r\n");
} }
static void rtsp_cmd_pause(HTTPContext *c, const char *url, RTSPMessageHeader *h) static void rtsp_cmd_interrupt(HTTPContext *c, const char *url, RTSPMessageHeader *h, int pause_only)
{ {
HTTPContext *rtp_c; HTTPContext *rtp_c;
@@ -3328,29 +3327,14 @@ static void rtsp_cmd_pause(HTTPContext *c, const char *url, RTSPMessageHeader *h
return; return;
} }
if (rtp_c->state != HTTPSTATE_SEND_DATA && if (pause_only) {
rtp_c->state != HTTPSTATE_WAIT_FEED) { if (rtp_c->state != HTTPSTATE_SEND_DATA &&
rtsp_reply_error(c, RTSP_STATUS_STATE); rtp_c->state != HTTPSTATE_WAIT_FEED) {
return; rtsp_reply_error(c, RTSP_STATUS_STATE);
} return;
}
rtp_c->state = HTTPSTATE_READY; rtp_c->state = HTTPSTATE_READY;
rtp_c->first_pts = AV_NOPTS_VALUE; rtp_c->first_pts = AV_NOPTS_VALUE;
/* now everything is OK, so we can send the connection parameters */
rtsp_reply_header(c, RTSP_STATUS_OK);
/* session ID */
avio_printf(c->pb, "Session: %s\r\n", rtp_c->session_id);
avio_printf(c->pb, "\r\n");
}
static void rtsp_cmd_teardown(HTTPContext *c, const char *url, RTSPMessageHeader *h)
{
HTTPContext *rtp_c;
rtp_c = find_rtp_session_with_url(url, h->session_id);
if (!rtp_c) {
rtsp_reply_error(c, RTSP_STATUS_SESSION);
return;
} }
/* now everything is OK, so we can send the connection parameters */ /* now everything is OK, so we can send the connection parameters */
@@ -3359,11 +3343,10 @@ static void rtsp_cmd_teardown(HTTPContext *c, const char *url, RTSPMessageHeader
avio_printf(c->pb, "Session: %s\r\n", rtp_c->session_id); avio_printf(c->pb, "Session: %s\r\n", rtp_c->session_id);
avio_printf(c->pb, "\r\n"); avio_printf(c->pb, "\r\n");
/* abort the session */ if (!pause_only)
close_connection(rtp_c); close_connection(rtp_c);
} }
/********************************************************************/ /********************************************************************/
/* RTP handling */ /* RTP handling */