七牛模块代码增加能力协商模块 diff

Qiniu-librtmp/Pod/Classes/pili-librtmp/PushModule.c

@@ -0,0 +1,138 @@
+//
+//  PushModule.c
+//  rtmpdump_test
+//
+//  Created by 李雪岩 on 2017/4/26.
+//  Copyright © 2017年 hongduoxing. All rights reserved.
+//
+
+#include "PushModule.h"
+#include "rtmp.h"
+#include <string.h>
+
+extern panda_push_module_t xypush_module;
+extern panda_push_module_t rtmppush_module;
+
+/* 定义所有模块 */
+panda_push_module_t *global_modules[] = {
+    &rtmppush_module,
+    &xypush_module
+    /* 其他厂商的模块加在这里即可 */
+};
+
+
+
+/*导入所有模块*/
+int
+expore_all_module(char *negotiate)
+{
+    int end = sizeof(global_modules)/sizeof(global_modules[0]);
+    int i;
+    for(i = 0; i < end; i++) {
+        strcat(negotiate, global_modules[i]->module_name);
+        if(i < end-1)
+            strcat(negotiate, ",");
+        PILI_RTMP_Log(PILI_RTMP_LOGDEBUG, "export module name=[%s].\n",global_modules[i]->module_name);
+    }
+    PILI_RTMP_Log(PILI_RTMP_LOGDEBUG, "negotiate: %s\n",negotiate);
+    return 0;
+
+}
+
+
+int
+rtmp_packet_to_flv(PILI_RTMPPacket *packet, char *flv_tag, int tag_size)
+{
+    if(tag_size != (1+3+4+packet->m_nBodySize)) {
+        return -1;
+    }
+    memcpy(flv_tag, packet->m_packetType, sizeof(packet->m_packetType)); /*type*/
+    memcpy(flv_tag, packet->m_nBodySize, 3); /*datalen*/
+    memcpy(flv_tag, packet->m_nTimeStamp, 4); /*timestamp3 + extra1*/
+    memcpy(flv_tag, 0, 3); /*stream id  always 0*/
+    memcpy(flv_tag, packet->m_body, packet->m_nBodySize); /*body*/
+
+    return 0;
+}
+
+/* 根据服务器返回选择传输模块 */
+panda_push_module_t *
+select_module(PILI_AVal *negotiate)
+{
+    int i;
+
+    for (i = 0; i < sizeof(global_modules)/sizeof(global_modules[0]); ++i) {
+
+        if(strncmp(global_modules[i]->module_name, negotiate->av_val, negotiate->av_len) == 0)
+        {
+            PILI_RTMP_Log(PILI_RTMP_LOGINFO, "Get module [%s].", global_modules[i]->module_name);
+            return global_modules[i];
+        }
+
+    }
+    return &rtmppush_module;
+}
+
+/* 定义星域推流模块 */
+static int xypush_module_init(void *arg, void *err);
+static int xypush_module_release(void *arg);
+static int xypush_module_push(void*, void*, uint32_t, void*);
+
+//static struct XYPushSession *s = NULL;
+
+panda_push_module_t xypush_module =
+{
+    "XYPushModule",
+    xypush_module_init,
+    xypush_module_release,
+    xypush_module_push
+};
+
+
+int xypush_module_init(void *arg, void *err)
+{
+    return TRUE;
+}
+
+int xypush_module_release(void *arg)
+{
+    return 0;
+}
+
+int xypush_module_push(void *rtmp, void *buf, uint32_t size, void *err)
+{
+    return TRUE;
+}
+
+
+/* 定义rtmp默认推流模块 */
+static int rtmp_module_init(void *arg, void *err);
+static int rtmp_module_release(void *arg);
+static int rtmp_module_push(void*, void*, uint32_t, void*);
+
+panda_push_module_t rtmppush_module =
+{
+    "RTMPPushModule",
+    rtmp_module_init,
+    rtmp_module_release,
+    rtmp_module_push
+};
+
+
+//return TRUE for ok, FALSE or other for err;
+int rtmp_module_init(void *arg, void *err)
+{
+    return PILI_RTMP_ConnectStream_Module(arg, err);
+}
+int rtmp_module_release(void *arg)
+{
+    return 0;
+}
+
+
+int rtmp_module_push(void* rtmp, void* buf, uint32_t size, void* err)
+{
+    return PILI_RTMP_Write_Module(rtmp, buf, size, err);
+}
+
+

Qiniu-librtmp/Pod/Classes/pili-librtmp/PushModule.h

@@ -0,0 +1,47 @@
+//
+//  PushModule.h
+//  rtmpdump_test
+//
+//  Created by 李雪岩 on 2017/4/26.
+//  Copyright © 2017年 hongduoxing. All rights reserved.
+//
+
+#ifndef PushModule_h
+#define PushModule_h
+
+#include <stdio.h>
+#include "amf.h"
+#include "log.h"
+#include "rtmp.h"
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+    /* 模块定义 */
+    typedef struct panda_push_module_s {
+
+        const char *module_name;
+        /* (PILI_RTMP*, RTMP_Error*) */
+        int (*init)(void*, void*);
+
+        /* PILI_RTMP* */
+        int (*release)(void*);
+
+        /* PILI_RTMP*, const char*, int, RTMP_Error* */
+        int (*push_message_push)(void *rtmp, void *buf, uint32_t size, void *err);
+
+    }panda_push_module_t;
+
+    int
+    rtmp_packet_to_flv(struct PILI_RTMPPacket *packet, char *flv_tag, int flv_tag_size);
+
+    int expore_all_module(char *negotiate);
+    panda_push_module_t *select_module(PILI_AVal *negotiate);
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif /* PushModule_h */

Qiniu-librtmp/Pod/Classes/pili-librtmp/log.c

@@ -32,7 +32,7 @@
 
 #define MAX_PRINT_LEN 2048
 
-PILI_RTMP_LogLevel PILI_RTMP_debuglevel = PILI_RTMP_LOGERROR;
+PILI_RTMP_LogLevel PILI_RTMP_debuglevel = PILI_RTMP_LOGALL;
 
 static int neednl;