aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-09-17 11:22:51 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-09-17 11:22:54 +0200
commit953a4191b8122d404bcd7db13e686c3caa66ab08 (patch)
treecea67847eb7fc8e3ead5607fc3c7435a4059d568
parent0483cfe8ca94601fafdb724fed2e5ec824b2a115 (diff)
parentffb7669e47343ac0caa866361965fdb2bf6ed825 (diff)
downloadffmpeg-953a4191b8122d404bcd7db13e686c3caa66ab08.tar.gz
Merge commit 'ffb7669e47343ac0caa866361965fdb2bf6ed825'
* commit 'ffb7669e47343ac0caa866361965fdb2bf6ed825': rtmp: Support play method in listen mode Merged-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavformat/rtmpproto.c11
1 files changed, 10 insertions, 1 deletions
diff --git a/libavformat/rtmpproto.c b/libavformat/rtmpproto.c
index eea85ee377..d81a6a1f65 100644
--- a/libavformat/rtmpproto.c
+++ b/libavformat/rtmpproto.c
@@ -63,6 +63,7 @@ typedef enum {
STATE_SEEKING, ///< client has started the seek operation. Back on STATE_PLAYING when the time comes
STATE_PUBLISHING, ///< client has started sending multimedia data to server (for output)
STATE_RECEIVING, ///< received a publish command (for input)
+ STATE_SENDING, ///< received a play command (for output)
STATE_STOPPED, ///< the broadcast has been stopped
} ClientState;
@@ -1898,6 +1899,13 @@ static int send_invoke_response(URLContext *s, RTMPPacket *pkt)
// Send onStatus(NetStream.Publish.Start)
return write_status(s, pkt, "NetStream.Publish.Start",
filename);
+ } else if (!strcmp(command, "play")) {
+ ret = write_begin(s);
+ if (ret < 0)
+ return ret;
+ rt->state = STATE_SENDING;
+ return write_status(s, pkt, "NetStream.Play.Start",
+ filename);
} else {
if ((ret = ff_rtmp_packet_create(&spkt, RTMP_SYSTEM_CHANNEL,
RTMP_PT_INVOKE, 0,
@@ -2044,6 +2052,7 @@ static int handle_invoke(URLContext *s, RTMPPacket *pkt)
} else if (ff_amf_match_string(pkt->data, pkt->size, "releaseStream") ||
ff_amf_match_string(pkt->data, pkt->size, "FCPublish") ||
ff_amf_match_string(pkt->data, pkt->size, "publish") ||
+ ff_amf_match_string(pkt->data, pkt->size, "play") ||
ff_amf_match_string(pkt->data, pkt->size, "_checkbw") ||
ff_amf_match_string(pkt->data, pkt->size, "createStream")) {
if ((ret = send_invoke_response(s, pkt)) < 0)
@@ -2232,6 +2241,7 @@ static int get_packet(URLContext *s, int for_header)
}
if (for_header && (rt->state == STATE_PLAYING ||
rt->state == STATE_PUBLISHING ||
+ rt->state == STATE_SENDING ||
rt->state == STATE_RECEIVING)) {
ff_rtmp_packet_destroy(&rpkt);
return 0;
@@ -2521,7 +2531,6 @@ reconnect:
} else {
if (read_connect(s, s->priv_data) < 0)
goto fail;
- rt->is_input = 1;
}
do {