From c02fd3d2e886bcdc82ad52972376310156040c38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin@martin.st>
Date: Fri, 19 Feb 2010 16:26:21 +0000
Subject: Rename RTSP_STATE_PLAYING to _STREAMING, since that better covers the
future use of the rtsp* codebase for RTSP muxing.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Patch by Martin Storsjö <$firstname $firstname st>.
Originally committed as revision 21896 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
libavformat/rtsp.c | 12 ++++++------
libavformat/rtsp.h | 2 +-
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c
index a6584d33fb..c02bdbb4b1 100644
--- a/libavformat/rtsp.c
+++ b/libavformat/rtsp.c
@@ -1249,7 +1249,7 @@ static int rtsp_read_play(AVFormatContext *s)
return -1;
}
}
- rt->state = RTSP_STATE_PLAYING;
+ rt->state = RTSP_STATE_STREAMING;
return 0;
}
@@ -1488,7 +1488,7 @@ static int udp_read_packet(AVFormatContext *s, RTSPStream **prtsp_st,
rtsp_read_reply(s, &reply, NULL, 0);
/* XXX: parse message */
- if (rt->state != RTSP_STATE_PLAYING)
+ if (rt->state != RTSP_STATE_STREAMING)
return 0;
}
#endif
@@ -1516,7 +1516,7 @@ redo:
if (ret == 1) /* received '$' */
break;
/* XXX: parse message */
- if (rt->state != RTSP_STATE_PLAYING)
+ if (rt->state != RTSP_STATE_STREAMING)
return 0;
}
ret = url_read_complete(rt->rtsp_hd, buf, 3);
@@ -1667,7 +1667,7 @@ static int rtsp_read_packet(AVFormatContext *s, AVPacket *pkt)
return AVERROR_INVALIDDATA;
rt->need_subscription = 0;
- if (rt->state == RTSP_STATE_PLAYING)
+ if (rt->state == RTSP_STATE_STREAMING)
rtsp_read_play (s);
}
}
@@ -1702,7 +1702,7 @@ static int rtsp_read_pause(AVFormatContext *s)
rt = s->priv_data;
- if (rt->state != RTSP_STATE_PLAYING)
+ if (rt->state != RTSP_STATE_STREAMING)
return 0;
else if (!(rt->server_type == RTSP_SERVER_REAL && rt->need_subscription)) {
snprintf(cmd, sizeof(cmd),
@@ -1729,7 +1729,7 @@ static int rtsp_read_seek(AVFormatContext *s, int stream_index,
default:
case RTSP_STATE_IDLE:
break;
- case RTSP_STATE_PLAYING:
+ case RTSP_STATE_STREAMING:
if (rtsp_read_pause(s) != 0)
return -1;
rt->state = RTSP_STATE_SEEKING;
diff --git a/libavformat/rtsp.h b/libavformat/rtsp.h
index dbd444b983..a0aac17028 100644
--- a/libavformat/rtsp.h
+++ b/libavformat/rtsp.h
@@ -158,7 +158,7 @@ typedef struct RTSPMessageHeader {
*/
enum RTSPClientState {
RTSP_STATE_IDLE, /**< not initialized */
- RTSP_STATE_PLAYING, /**< initialized and receiving data */
+ RTSP_STATE_STREAMING, /**< initialized and sending/receiving data */
RTSP_STATE_PAUSED, /**< initialized, but not receiving data */
RTSP_STATE_SEEKING, /**< initialized, requesting a seek */
};
--
cgit v1.2.3