diff options
| author | Samuel Pitoiset <samuel.pitoiset@gmail.com> | 2012-08-19 13:02:23 +0200 |
|---|---|---|
| committer | Luca Barbato <lu_zero@gentoo.org> | 2012-08-22 17:55:17 +0200 |
| commit | 7011a42b1abbf39ee02d50f5e4b2a10552d92ae2 (patch) | |
| tree | 083b9bafe8fc003c95703cfc9eb9c7671501124b /libavformat | |
| parent | ac330161584b69c766d955d6ee3ee045cca31030 (diff) | |
| download | ffmpeg-7011a42b1abbf39ee02d50f5e4b2a10552d92ae2.tar.gz | |
rtmp: support strict rtmp servers
In order to send or receive a stream FCPublish, FCSubscribe and _checkbw
are completely optional and often not implemented. releaseStream over a
non-existen stream might report an error instead of being silent.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/rtmpproto.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/libavformat/rtmpproto.c b/libavformat/rtmpproto.c index 6205cd2cb2..f3ba1e3697 100644 --- a/libavformat/rtmpproto.c +++ b/libavformat/rtmpproto.c @@ -549,7 +549,7 @@ static int gen_release_stream(URLContext *s, RTMPContext *rt) ff_amf_write_null(&p); ff_amf_write_string(&p, rt->playpath); - return rtmp_send_packet(rt, &pkt, 0); + return rtmp_send_packet(rt, &pkt, 1); } /** @@ -573,7 +573,7 @@ static int gen_fcpublish_stream(URLContext *s, RTMPContext *rt) ff_amf_write_null(&p); ff_amf_write_string(&p, rt->playpath); - return rtmp_send_packet(rt, &pkt, 0); + return rtmp_send_packet(rt, &pkt, 1); } /** @@ -1525,8 +1525,11 @@ static int handle_invoke_error(URLContext *s, RTMPPacket *pkt) if (!ff_amf_get_field_value(pkt->data + 9, data_end, "description", tmpstr, sizeof(tmpstr))) { - if (tracked_method && !strcmp(tracked_method, "_checkbw")) { - /* Ignore _checkbw errors. */ + if (tracked_method && (!strcmp(tracked_method, "_checkbw") || + !strcmp(tracked_method, "releaseStream") || + !strcmp(tracked_method, "FCSubscribe") || + !strcmp(tracked_method, "FCPublish"))) { + /* Gracefully ignore Adobe-specific historical artifact errors. */ level = AV_LOG_WARNING; ret = 0; } else |