Working on rtmp wrapper for the C stuff

generator/FLVGenerator.go

@@ -1,3 +1,30 @@
+/*
+NAME
+  RtpToTsConverter.go - provides utilities for the conversion of Rtp packets
+  to equivalent MpegTs packets.
+
+DESCRIPTION
+  See Readme.md
+
+AUTHOR
+  Saxon Nelson-Milton <saxon.milton@gmail.com>
+
+LICENSE
+  RtpToTsConverter.go is Copyright (C) 2017 the Australian Ocean Lab (AusOcean)
+
+  It is free software: you can redistribute it and/or modify them
+  under the terms of the GNU General Public License as published by the
+  Free Software Foundation, either version 3 of the License, or (at your
+  option) any later version.
+
+  It is distributed in the hope that it will be useful, but WITHOUT
+  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+  FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with revid in gpl.txt.  If not, see [GNU licenses](http://www.gnu.org/licenses).
+*/
 package generator
 
 import (

generator/MPEGTSGenerator.go

@@ -1,3 +1,30 @@
+/*
+NAME
+  RtpToTsConverter.go - provides utilities for the conversion of Rtp packets
+  to equivalent MpegTs packets.
+
+DESCRIPTION
+  See Readme.md
+
+AUTHOR
+  Saxon Nelson-Milton <saxon.milton@gmail.com>
+
+LICENSE
+  RtpToTsConverter.go is Copyright (C) 2017 the Australian Ocean Lab (AusOcean)
+
+  It is free software: you can redistribute it and/or modify them
+  under the terms of the GNU General Public License as published by the
+  Free Software Foundation, either version 3 of the License, or (at your
+  option) any later version.
+
+  It is distributed in the hope that it will be useful, but WITHOUT
+  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+  FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with revid in gpl.txt.  If not, see [GNU licenses](http://www.gnu.org/licenses).
+*/
 package generator
 
 import (

rtmp/RTMP.go

@@ -1,16 +1,75 @@
+/*
+NAME
+  RtpToTsConverter.go - provides utilities for the conversion of Rtp packets
+  to equivalent MpegTs packets.
+
+DESCRIPTION
+  See Readme.md
+
+AUTHOR
+  Saxon Nelson-Milton <saxon.milton@gmail.com>
+
+LICENSE
+  RtpToTsConverter.go is Copyright (C) 2017 the Australian Ocean Lab (AusOcean)
+
+  It is free software: you can redistribute it and/or modify them
+  under the terms of the GNU General Public License as published by the
+  Free Software Foundation, either version 3 of the License, or (at your
+  option) any later version.
+
+  It is distributed in the hope that it will be useful, but WITHOUT
+  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+  FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with revid in gpl.txt.  If not, see [GNU licenses](http://www.gnu.org/licenses).
+*/
 package rtmp
 
-// #include "libRTMPWrapper.h"
+// #include "RTMPWrapper.h"
 import "C"
 
-type rtmpSession struct {
+import (
-
+  "errors"
-}
+)
 
 type RTMPSession interface {
-
+  StartSession()
+  WriteFrame(data []byte, dataLength uint)
+  EndSession()
 }
 
-func NewRTMPSession() (session *rtmpSession){
+type rtmpSession struct {
-
+  rtmp *C.RTMP
+  url string
+  timeout uint
+}
+
+func NewRTMPSession(url string, connectTimeout uint) (session *rtmpSession){
+  session = new(rtmpSession)
+  session.url = url
+  session.timeout = connectTimeout
+  return
+}
+
+func (s *rtmpSession) StartSession() error {
+  if !bool(C.RTMP_start_session(s.rtmp, C.(const char*)(s.url), C.uint(connect_timeout))) {
+    return errors.New("RTMP start error! Check rtmp log for details!")
+  }
+  return nil
+}
+
+func (s *rtmpSession) WriteFrame(data []byte, dataLength uint) error {
+  if !bool(C.RTMP_write_frame(RTMP* rtmp, char* data, C.uint(data_length))) {
+    return errors.New("RTMP write error! Check rtmp log for details!")
+  }
+  return nil
+}
+
+func (s *rtmpSession) EndSession() error {
+  if !bool(RTMP_end_session(RTMP* rtmp)) {
+    return errors.New("RTMP end session error! Check rtmp log for details!")
+  }
+  return nil
 }

rtmp/RTMPWrapper.c

@@ -1,211 +1,85 @@
+/*
+NAME
+  RtpToTsConverter.go - provides utilities for the conversion of Rtp packets
+  to equivalent MpegTs packets.
+
+DESCRIPTION
+  See Readme.md
+
+AUTHOR
+  Saxon Nelson-Milton <saxon.milton@gmail.com>
+
+LICENSE
+  RtpToTsConverter.go is Copyright (C) 2017 the Australian Ocean Lab (AusOcean)
+
+  It is free software: you can redistribute it and/or modify them
+  under the terms of the GNU General Public License as published by the
+  Free Software Foundation, either version 3 of the License, or (at your
+  option) any later version.
+
+  It is distributed in the hope that it will be useful, but WITHOUT
+  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+  FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with revid in gpl.txt.  If not, see [GNU licenses](http://www.gnu.org/licenses).
+*/
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-
 #include "rtmp_c/librtmp/rtmp_sys.h"
 #include "rtmp_c/librtmp/log.h"
 #include "lwlog/lwlog.h"
 
-#define HTON16(x)  ((x>>8&0xff)|(x<<8&0xff00))
+int RTMP_start_session(RTMP* rtmp, const char* url, uint connect_timeout){
-#define HTON24(x)  ((x>>16&0xff)|(x<<16&0xff0000)|(x&0xff00))
-#define HTON32(x)  ((x>>24&0xff)|(x>>8&0xff00)|\
-    (x<<8&0xff0000)|(x<<24&0xff000000))
-#define HTONTIME(x) ((x>>16&0xff)|(x<<16&0xff0000)|(x&0xff00)|(x&0xff000000))
-
-/*read 1 byte*/
-int ReadU8(uint32_t *u8, FILE *fp) {
-    if (fread(u8, 1, 1, fp) != 1) {
-        return 0;
-    }
-    return 1;
-}
-
-/*read 2 byte*/
-int ReadU16(uint32_t *u16, FILE *fp) {
-    if (fread(u16, 2, 1, fp) != 1) {
-        return 0;
-    }
-    *u16 = HTON16(*u16);
-    return 1;
-}
-
-/*read 3 byte*/
-int ReadU24(uint32_t *u24, FILE *fp) {
-    if (fread(u24, 3, 1, fp) != 1) {
-        return 0;
-    }
-    *u24 = HTON24(*u24);
-    return 1;
-}
-
-/*read 4 byte*/
-int ReadU32(uint32_t *u32, FILE *fp) {
-    if (fread(u32, 4, 1, fp) != 1) {
-        return 0;
-    }
-    *u32 = HTON32(*u32);
-    return 1;
-}
-
-/*read 1 byte,and loopback 1 byte at once*/
-int PeekU8(uint32_t *u8, FILE *fp) {
-    if (fread(u8, 1, 1, fp) != 1) {
-        return 0;
-    }
-    fseek(fp, -1, SEEK_CUR);
-    return 1;
-}
-
-/*read 4 byte and convert to time format*/
-int ReadTime(uint32_t *utime, FILE *fp) {
-    if (fread(utime, 4, 1, fp) != 1) {
-        return 0;
-    }
-    *utime = HTONTIME(*utime);
-    return 1;
-}
-
-//Publish using RTMP_Write()
-int publish_using_write() {
-    uint32_t start_time = 0;
-    uint32_t now_time = 0;
-    uint32_t pre_frame_time = 0;
-    uint32_t lasttime = 0;
-    int b_next_is_key = 0;
-    char *p_file_buf = NULL;
-
-    //read from tag header
-    uint32_t type = 0;
-    uint32_t datalength = 0;
-    uint32_t timestamp = 0;
-
-    RTMP *rtmp = NULL;
-
-    FILE *fp = NULL;
-    fp = fopen("../cuc_ieschool.flv", "rb");
-    if (NULL == fp) {
-        RTMP_LogPrintf("Open File Error.\n");
-        return -1;
-    }
-
-    /* set log level */
-    //RTMP_LogLevel loglvl=RTMP_LOGDEBUG;
-    //RTMP_LogSetLevel(loglvl);
-
   rtmp = RTMP_Alloc();
   RTMP_Init(rtmp);
-    //set connection timeout,default 30s
+  rtmp->Link.timeout = connect_timeout;
-    rtmp->Link.timeout = 5;
+  if (!RTMP_SetupURL(rtmp, url)) {
-    if (!RTMP_SetupURL(rtmp, "rtmp://localhost/live/inrtmp")) {
       RTMP_Log(RTMP_LOGERROR, "SetupURL Err\n");
       RTMP_Free(rtmp);
-        return -1;
+      return 0;
   }
 
   RTMP_EnableWrite(rtmp);
-    //1hour
   RTMP_SetBufferMS(rtmp, 3600 * 1000);
   if (!RTMP_Connect(rtmp, NULL)) {
       RTMP_Log(RTMP_LOGERROR, "Connect Err\n");
       RTMP_Free(rtmp);
-        return -1;
+      return 0;
   }
 
   if (!RTMP_ConnectStream(rtmp, 0)) {
       RTMP_Log(RTMP_LOGERROR, "ConnectStream Err\n");
       RTMP_Close(rtmp);
       RTMP_Free(rtmp);
-        return -1;
+      return 0;
+  }
+  return 1
 }
 
-    lwlog_info("Start to send data ...");
+int RTMP_write_frame(RTMP* rtmp, char* data, uint data_length){
-
-    //jump over FLV Header
-    fseek(fp, 9, SEEK_SET);
-    //jump over previousTagSizen
-    fseek(fp, 4, SEEK_CUR);
-    start_time = RTMP_GetTime();
-    while (1) {
-        if ((((now_time = RTMP_GetTime()) - start_time)
-                < (pre_frame_time)) && b_next_is_key) {
-            //wait for 1 sec if the send process is too fast
-            //this mechanism is not very good,need some improvement
-            if (pre_frame_time > lasttime) {
-                RTMP_LogPrintf("TimeStamp:%8u ms\n", pre_frame_time);
-                lasttime = pre_frame_time;
-            }
-            sleep(1);
-            continue;
-        }
-
-        //jump over type
-        fseek(fp, 1, SEEK_CUR);
-        if (!ReadU24(&datalength, fp)) {
-            break;
-        }
-        if (!ReadTime(&timestamp, fp)) {
-            break;
-        }
-        //jump back
-        fseek(fp, -8, SEEK_CUR);
-
-        p_file_buf = (char *) malloc(11 + datalength + 4);
-        memset(p_file_buf, 0, 11 + datalength + 4);
-        if (fread(p_file_buf, 1, 11 + datalength + 4, fp) != (11 + datalength + 4)) {
-            break;
-        }
-
-        pre_frame_time = timestamp;
-
   if (!RTMP_IsConnected(rtmp)) {
-            RTMP_Log(RTMP_LOGERROR, "rtmp is not connect\n");
+      RTMP_Log(RTMP_LOGERROR, "RTMP is not connected!\n");
-            break;
+      return 0;
   }
-        if (!RTMP_Write(rtmp, p_file_buf, 11 + datalength + 4)) {
+  if (!RTMP_Write(rtmp, data, data_length)) {
-            RTMP_Log(RTMP_LOGERROR, "Rtmp Write Error\n");
+      RTMP_Log(RTMP_LOGERROR, "RTMP write error!\n");
-            break;
+      return 0;
-        }
+  }
-
+  return 1;
-        free(p_file_buf);
-        p_file_buf = NULL;
-
-        if (!PeekU8(&type, fp)) {
-            break;
-        }
-        if (0x09 == type) {
-            if (fseek(fp, 11, SEEK_CUR) != 0) {
-                break;
-            }
-            if (!PeekU8(&type, fp)) {
-                break;
-            }
-            if (type == 0x17) {
-                b_next_is_key = 1;
-            } else {
-                b_next_is_key = 0;
-            }
-            fseek(fp, -11, SEEK_CUR);
-        }
-    }
-
-    RTMP_LogPrintf("\nSend Data Over\n");
-
-    if (fp != NULL) {
-        fclose(fp);
-        fp = NULL;
 }
 
+int RTMP_end_session(RTMP* rtmp){
   if (rtmp != NULL) {
       RTMP_Close(rtmp);
       RTMP_Free(rtmp);
       rtmp = NULL;
-    }
+      return 1;
-
+  } else {
-    if (p_file_buf != NULL) {
+    RTMP_Log(RTMP_LOGERROR, "Tried to end RTMP session, but not allocated yet!\n");
-        free(p_file_buf);
-        p_file_buf = NULL;
-    }
-
     return 0;
   }
+}

rtmp/RTMPWrapper.h

@@ -0,0 +1,38 @@
+/*
+NAME
+  RtpToTsConverter.go - provides utilities for the conversion of Rtp packets
+  to equivalent MpegTs packets.
+
+DESCRIPTION
+  See Readme.md
+
+AUTHOR
+  Saxon Nelson-Milton <saxon.milton@gmail.com>
+
+LICENSE
+  RtpToTsConverter.go is Copyright (C) 2017 the Australian Ocean Lab (AusOcean)
+
+  It is free software: you can redistribute it and/or modify them
+  under the terms of the GNU General Public License as published by the
+  Free Software Foundation, either version 3 of the License, or (at your
+  option) any later version.
+
+  It is distributed in the hope that it will be useful, but WITHOUT
+  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+  FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with revid in gpl.txt.  If not, see [GNU licenses](http://www.gnu.org/licenses).
+*/
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include "rtmp_c/librtmp/rtmp_sys.h"
+#include "rtmp_c/librtmp/log.h"
+#include "lwlog/lwlog.h"
+
+int RTMP_start_session(RTMP* rtmp, const char* url, uint connect_timeout);
+int RTMP_write_frame(RTMP* rtmp, char* data, uint data_length);
+int RTMP_end_session(RTMP* rtmp);