On Sun, Aug 19, 2012 at 2:14 AM, Luca Barbato <[email protected]> wrote: > On 8/17/12 3:51 PM, Martin Storsjö wrote: >> >> On Fri, 17 Aug 2012, Samuel Pitoiset wrote: >> >>> --- >>> libavformat/rtmpproto.c | 11 +++++++---- >>> 1 file changed, 7 insertions(+), 4 deletions(-) >>> >>> diff --git a/libavformat/rtmpproto.c b/libavformat/rtmpproto.c >>> index 6205cd2..ad94e85 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"))) { >>> + /* Ignore Adobe-specific, artifact errors. */ >>> level = AV_LOG_WARNING; >>> ret = 0; >>> } else >>> -- >>> 1.7.11.3 >> >> >> I wouldn't say the newly added ones are Adobe specific historical >> artefacts at all, I think Luca can explain better what to call them. >> >> The patch itself (except for the commit message and comment in the code) >> looks good though, but I'll let Luca handle it. > > > FC according to the discussions on irc are clustering-related functions, > totally optional but useful. > > So the commit message would be: > > rtmp: support strict rtmp servers > > In order to send or receive a stream FCPublish, FCSubscribe and _checkwb are > completely optional and often not implemented. > > releaseStream over a non-existen stream might report an error instead of > being silent.
OK. Thanks. -- Best regards, Samuel Pitoiset. _______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
