From: Luca Barbato <lu_zero@gentoo.org>
Date: Wed, 8 Aug 2012 09:49:02 +0000 (+0200)
Subject: rtmp: send check_bw as notification
X-Git-Tag: android-x86-4.4-r1~8529^2~1007
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=82613564cfae459796642b22fc0163927d7f49e0;p=android-x86%2Fexternal-ffmpeg.git

rtmp: send check_bw as notification

Set the transactionId to 0 to signal the server a return _result/_error
is not expected.

Solves the problems experienced with strict rtmp servers.
---

diff --git a/libavformat/rtmp.h b/libavformat/rtmp.h
index b9c5f1e430..c9aa67e056 100644
--- a/libavformat/rtmp.h
+++ b/libavformat/rtmp.h
@@ -33,6 +33,15 @@
 #define HMAC_OPAD_VAL 0x5C
 
 /**
+ * A non-zero transaction id requires the server to send back
+ * a _result or _error response.
+ * Setting it to 0 marks the message as a notification not
+ * requiring feedback.
+ */
+
+#define RTMP_NOTIFICATION 0
+
+/**
  * emulated Flash client version - 9.0.124.2 on Linux
  * @{
  */
diff --git a/libavformat/rtmpproto.c b/libavformat/rtmpproto.c
index 19b6874791..f6607774c2 100644
--- a/libavformat/rtmpproto.c
+++ b/libavformat/rtmpproto.c
@@ -573,7 +573,7 @@ static int gen_check_bw(URLContext *s, RTMPContext *rt)
 
     p = pkt.data;
     ff_amf_write_string(&p, "_checkbw");
-    ff_amf_write_number(&p, ++rt->nb_invokes);
+    ff_amf_write_number(&p, RTMP_NOTIFICATION);
     ff_amf_write_null(&p);
 
     ret = ff_rtmp_packet_write(rt->stream, &pkt, rt->chunk_size,