feat: rtmp reconnect (enhanced rtmp v2)

Author: ireader

librtmp/include/rtmp-internal.h

@@ -143,6 +143,13 @@ struct rtmp_t
         int (*oneof)(void* param, uint32_t stream_id); // EOF event
 		int (*onping)(void* param, uint32_t stream_id); // send pong
 		int (*onbandwidth)(void* param); // send window acknowledgement size
+
+		// enhanced rtmp v2
+		// 1. rtmp://foo.mydomain.com:1935/realtimeapp
+		// 2. rtmp://127.0.0.1/realtimeapp
+		// 3. //192.0.2.0/realtimeapp
+		// 4. / realtimeapp
+		int (*onreconnect)(void* param, const char* tcurl, const char* descritpion);
 	} client;
 };
 

librtmp/include/rtmp-netstream.h

@@ -22,6 +22,7 @@ uint8_t* rtmp_netstream_fcsubscribe(uint8_t* out, size_t bytes, double transacti
 uint8_t* rtmp_netstream_fcunsubscribe(uint8_t* out, size_t bytes, double transactionId, const char* stream_name);
 
 uint8_t* rtmp_netstream_onstatus(uint8_t* out, size_t bytes, double transactionId, const char* level, const char* code, const char* description);
+uint8_t* rtmp_netstream_onreconnect(uint8_t* out, size_t bytes, double transactionId, const char* tcurl, const char* description);
 
 uint8_t* rtmp_netstream_rtmpsampleaccess(uint8_t* out, size_t bytes);
 

librtmp/include/rtmp-server.h

@@ -10,6 +10,8 @@ extern "C" {
 
 #define RTMP_SERVER_ASYNC_START 0x12345678 // magic number, user call rtmp_server_start
 
+#define RTMP_SERVER_START_RECONNECT 1 // use with RTMP_SERVER_ASYNC_START
+
 typedef struct rtmp_server_t rtmp_server_t;
 
 struct rtmp_server_handler_t
@@ -69,8 +71,8 @@ int rtmp_server_send_video(rtmp_server_t* rtmp, const void* data, size_t bytes,
 int rtmp_server_send_script(rtmp_server_t* rtmp, const void* data, size_t bytes, uint32_t timestamp);
 
 /// [OPTIONAL] must call on onplay/onpublish return RTMP_SERVER_ASYNC_START
-/// @param[in] code 0-ok, other-error
-/// @param[in] msg error message
+/// @param[in] code 0-ok, RTMP_SERVER_START_RECONNECT-reconnect, other-error
+/// @param[in] msg error message, or tcurl if code == RTMP_SERVER_START_RECONNECT
 /// @return 0-ok, other-error
 int rtmp_server_start(rtmp_server_t* rtmp, int code, const char* msg);
 

librtmp/source/rtmp-client-invoke-handler.h

@@ -25,6 +25,8 @@ struct rtmp_result_t
 //	"NetConnection.Connect.InvalidApp",
 //	"NetConnection.Connect.Rejected",
 //
+//	"NetConnection.Connect.ReconnectRequest" // enhanced rtmp v2
+// 
 //	"NetStream.Failed",
 //	"NetStream.Play.Failed",
 //	"NetStream.Play.StreamNotFound",
@@ -143,13 +145,15 @@ static int rtmp_command_onerror(struct rtmp_t* rtmp, double transaction, const u
 // s -> c
 static int rtmp_command_onstatus(struct rtmp_t* rtmp, double transaction, const uint8_t* data, uint32_t bytes)
 {
+	char tcurl[256];
 	struct rtmp_result_t result;
-	struct amf_object_item_t info[3];
+	struct amf_object_item_t info[4];
 	struct amf_object_item_t items[2];
 
 	AMF_OBJECT_ITEM_VALUE(info[0], AMF_STRING, "code", result.code, sizeof(result.code));
 	AMF_OBJECT_ITEM_VALUE(info[1], AMF_STRING, "level", result.level, sizeof(result.level));
 	AMF_OBJECT_ITEM_VALUE(info[2], AMF_STRING, "description", result.description, sizeof(result.description));
+	AMF_OBJECT_ITEM_VALUE(info[3], AMF_STRING, "tcUrl", tcurl, sizeof(tcurl));
 
 	AMF_OBJECT_ITEM_VALUE(items[0], AMF_OBJECT, "command", NULL, 0); // Command object
 	AMF_OBJECT_ITEM_VALUE(items[1], AMF_OBJECT, "information", info, sizeof(info) / sizeof(info[0])); // Information object
@@ -214,6 +218,11 @@ static int rtmp_command_onstatus(struct rtmp_t* rtmp, double transaction, const
 			//rtmp->onerror(rtmp->param, -1, result.code);
 			return -1;
 		}
+		else if (0 == strcasecmp(result.code, "NetConnection.Connect.ReconnectRequest"))
+		{
+			// enhanced rtmp v2
+			rtmp->client.onreconnect ? rtmp->client.onreconnect(rtmp->param, tcurl, result.description) : 0;
+		}
 		else
 		{
 			assert(0);

librtmp/source/rtmp-netstream.c

@@ -1,4 +1,5 @@
 #include "rtmp-netstream.h"
+#include "rtmp-internal.h"
 #include "amf0.h"
 #include <stdlib.h>
 #include <string.h>
@@ -225,6 +226,24 @@ uint8_t* rtmp_netstream_onstatus(uint8_t* out, size_t bytes, double transactionI
 	return out;
 }
 
+uint8_t* rtmp_netstream_onreconnect(uint8_t* out, size_t bytes, double transactionId, const char* tcurl, const char* description)
+{
+	uint8_t* end = out + bytes;
+	const char* command = "onStatus";
+
+	out = AMFWriteString(out, end, command, strlen(command)); // Command Name
+	out = AMFWriteDouble(out, end, transactionId); // Transaction ID
+	out = AMFWriteNull(out, end); // command object
+
+	out = AMFWriteObject(out, end);
+	out = AMFWriteNamedString(out, end, "level", 5, RTMP_LEVEL_STATUS, strlen(RTMP_LEVEL_STATUS));
+	out = AMFWriteNamedString(out, end, "code", 4, "NetConnection.Connect.ReconnectRequest", 39);
+	out = AMFWriteNamedString(out, end, "description", 11, description?description:"", strlen(description ? description : ""));
+	out = AMFWriteNamedString(out, end, "tcUrl", 5, tcurl?tcurl:"", strlen(tcurl ? tcurl : ""));
+	out = AMFWriteObjectEnd(out, end);
+	return out;
+}
+
 uint8_t* rtmp_netstream_rtmpsampleaccess(uint8_t* out, size_t bytes)
 {
 	uint8_t* end = out + bytes;

librtmp/source/rtmp-server.c

@@ -528,7 +528,12 @@ int rtmp_server_input(struct rtmp_server_t* ctx, const uint8_t* data, size_t byt
 
 int rtmp_server_start(rtmp_server_t* rtmp, int r, const char* msg)
 {
-	if (RTMP_SERVER_ONPLAY == rtmp->start.play)
+	if (RTMP_SERVER_START_RECONNECT == r)
+	{
+		r = (int)(rtmp_netstream_onreconnect(rtmp->payload, sizeof(rtmp->payload), 0, msg, "") - rtmp->payload);
+		r = rtmp_server_send_control(&rtmp->rtmp, rtmp->payload, r, rtmp->stream_id);
+	}
+	else if (RTMP_SERVER_ONPLAY == rtmp->start.play)
 	{
 		if (0 == r)
 		{