Commit Graph

478 Commits

Author SHA1 Message Date
saxon e861420e69 Merge branch 'master' into rtmp-unsafe-cleanup 2018-09-02 00:04:32 +09:30
saxon b3c25d3bc7 rtmp: initial commit 2018-09-02 00:03:30 +09:30
Dan Kortschak 4fa4dce908 rtmp: remove redundant reconversions 2018-09-01 23:35:28 +09:30
Dan Kortschak 05bed207b3 rtmp: remove unnecessary int conversions 2018-09-01 23:31:20 +09:30
Dan Kortschak 74e468dfb3 rtmp: remove unnecessary type conversions with unconvert 2018-09-01 23:31:08 +09:30
saxon 287c3d32ac rtmp: tried removing some unsafe pointers in C_RTMP_Write - ended up breaking it. Youtube tells me it's starting but it now goes live 2018-09-01 23:23:07 +09:30
Dan Kortschak 40785e7454 rtmp: make tests pass 2018-09-01 23:20:32 +09:30
Dan Kortschak c494da9a1d rtmp: remove indxBytePtr
Manual clean up.
2018-08-31 12:01:34 +09:30
Dan Kortschak e235da36a1 rtmp: simplify slice conversion
Second pass:

gofmt -w -r 'ptrToSlice(p,i)->(*[_Gi]byte)(p)[:i]' {rtmp,parseurl,amf}.go
2018-08-31 11:43:49 +09:30
Dan Kortschak 52c6b1f60a rtmp: simplify unsafe slice conversion
Mechanical:

gofmt -w -r 'ptrToSlice(unsafe.Pointer(p),i)->(*[_Gi]byte)(unsafe.Pointer(p))[:i]' {rtmp,parseurl,amf}.go
2018-08-31 11:42:22 +09:30
Dan Kortschak 0053034e94 rtmp: simplify indexing
This is a mechanical change in line with the previous:

gofmt -w -r '*indxBytePtr(p,i)->(*[_Gi]byte)(p)[i]' {rtmp,parseurl,amf}.go
2018-08-31 11:29:41 +09:30
Dan Kortschak 18e1e7fc45 rtmp: simplify indexing
This is a mechanical change with the addition of a constant:

gofmt -w -r '*indxBytePtr(unsafe.Pointer(p), i)->(*[_Gi]byte)(unsafe.Pointer(p))[i]' {rtmp,parseurl,amf}.go
2018-08-31 11:24:42 +09:30
Dan Kortschak 6187df1c20 rtmp: remove deadcode and make tests pass 2018-08-31 11:13:59 +09:30
Dan Kortschak 4aad7bac04 rtmp: remove rtmp.c 2018-08-30 20:34:09 +09:30
Dan Kortschak 7da8c11c58 rtmp: port add_addr_info and remove unused includes 2018-08-30 20:31:19 +09:30
saxon e0c3cd3b32 rtmp: added more funcs to NOT_PORTED and removed commented out sections from AMFProp_Decode in amf.go 2018-08-28 20:10:13 +09:30
saxon 01f3caa8ec rtmp: created NOT_PORTED.txt to hold names of funcs not ported and also deleted sections of code not run in our case 2018-08-28 19:18:13 +09:30
saxon 766d30e2f6 rtmp: setting r.m_nClientBW2 to 255 rather than 0 (which was incorrect in C_HandlClientBW 2018-08-28 18:50:51 +09:30
saxon 8318f34be4 rtmp: removed case braces in C_HandlInvoke and replaced code not run with panics in case we do get those cases 2018-08-28 18:40:10 +09:30
saxon bd630fd893 rtmp: added all consts/flags from C library 2018-08-26 14:35:04 +09:30
saxon b846dbf2d7 rtmp: continued to port C_SendFCUnpublish - paused - need to work out best way to get rid of unsafe pointers 2018-08-26 00:27:38 +09:30
saxon 9384927113 rtmp: start porting C_SendFCUnpublish 2018-08-26 00:18:28 +09:30
saxon 9b67dc1ef0 rtmp: added comments above C_RTMP_Close and C_CloseInternal to indicate location in C library, and reordered to better resemble C library 2018-08-26 00:13:08 +09:30
saxon 7e6b2ee0b2 rtmp: uncommented usage of C_RTMP_Close - created todos in C_CloseInternal 2018-08-25 23:49:54 +09:30
saxon ba9ce9b37f rtmp: created rtmp_sys.go file to emulate rtmp_sys.c in c librtmp library and moved SET_RCVTIMEO there 2018-08-25 23:29:40 +09:30
saxon 6c84506af2 rtmp: dealt with unsupported cases in C_RTMP_ClientPacket 2018-08-25 23:22:22 +09:30
saxon 77393a1de7 rtmp: simplified C_RTMP_Alloc and zeroed C_RTMP object in C_RTMP_Init 2018-08-25 22:32:24 +09:30
saxon 0ed5d4bc72 rtmp: put C_RTMPPacket_IsReady in rtmp_headers.go - consistent with C librtmp structure 2018-08-25 22:28:59 +09:30
saxon a08c29ce81 rtmp: moved C_AVMATCH and C_AVC into amf_headers.go - consistent with C structure 2018-08-25 22:27:20 +09:30
saxon 36dfa31c48 rtmp: fixed broken cases, removed braces from cases, added panic to unsupported types in AMFPRop_Decode 2018-08-25 17:37:36 +09:30
saxon ecb3f3f4c2 rtmp: finished reordering amf.go such that it resembles the C amf.c file more closely - also readded C_AV_Queue, which I must have deleted somehow 2018-08-24 22:30:40 +09:30
saxon d23ab3b1a0 rtmp: Finished reordering funcs in rtmp.go to better reflect order in rtmp.c in C librtmp 2018-08-24 18:50:04 +09:30
saxon 43701a252f rtmp: start reordering funcs in rtmp.go, still need to do a few more 2018-08-24 10:43:34 +09:30
saxon 1441d1d968 rtmp: reordered struct order in rtmp_headers.go such that it matches up with order in rtmp.h under C librtmp 2018-08-24 10:34:10 +09:30
saxon e22516d9cb rtmp: fixed order of struct declarations in amf_headers.go to match that of amf.h under C librtmp? 2018-08-24 10:30:24 +09:30
saxon dfa146f276 rtmp: file header comments to reflect file name and appropriate authors 2018-08-24 10:25:36 +09:30
saxon 9cb70ac06b rtmp: created session.go file and moved librtmp wrapper functions into this file, i.e. NewSession, Open, Close and Write 2018-08-24 09:52:51 +09:30
saxon 4fa0637fa1 rtmp: moved amf structs into amf_headers.go and rtmp structs into rtmp_headers.go 2018-08-24 09:47:11 +09:30
saxon dec662d19e rtmp: created rtmp_headers.go and amf_headers.go files to store stuff that was in rtmp.h and amf.h files respectively 2018-08-24 09:41:02 +09:30
saxon 0adddd1833 rtmp: started reordering funcs in rtmp.go - realised that I need a rtmp_headers.go file to store stuff that's from rtmp.h 2018-08-24 09:38:17 +09:30
saxon 898c843f18 rtmp: added appropriate imports to each file to correct build errors 2018-08-24 09:33:05 +09:30
saxon 68b9f2a5e0 rtmp: created parseurl file and moved C_RTMP_ParseURL and C_RTMP_ParsePlaypath from to rtmp.go to parseurl.go 2018-08-24 07:04:01 +09:30
saxon 8f3d4b75bf rtmp: moved all AMF funcs from rtmp.go to amf.go 2018-08-24 06:58:22 +09:30
saxon 7a9fef826c rtmp: moved amf structs from rtmp.go to amf.go 2018-08-24 06:49:47 +09:30
saxon 595fa5a469 rtmp: tracking new file amf.go 2018-08-24 06:47:13 +09:30
saxon 6019bb4559 rtmp: moved amf enum from rtmp.go to amf.go 2018-08-24 06:44:15 +09:30
saxon ce95cad9ef rtmp: addedd additional licensing information in rtmp.go header 2018-08-24 06:14:37 +09:30
saxon fbd94e659f rtmp: updated cgo LDFLAGS so that not outdated and does not cause undefined symbol runtime error on pi 2018-08-24 06:11:21 +09:30
saxon 6dd791f7e1 rtmp: changed call to allocate to call to malloc as allocate does not exist anymore 2018-08-21 18:44:26 +09:30
saxon 5f7d84a120 revid: getting rid of crt dependency and using C.realloc for the time being 2018-08-21 18:42:13 +09:30
Alan Noble ce04e5f5ce revid: convert size for realloc to int32 so that compiler doesn't complain when on go1.10 2018-08-21 17:58:04 +09:30
saxon aae9acdd64 Removed unused consts 2018-08-20 11:57:13 +09:30
saxon 1b4db5b0dc Removed session interface and mad session struct exported 2018-08-20 10:22:36 +09:30
saxon d7d2d3b9d5 Got rid of all C.realloc and replaced with my realloc func - tested and working 2018-08-18 15:48:49 +09:30
saxon 54ee353f6b Wrote calloc func and replaced C.calloc with it - tested and working 2018-08-18 14:01:38 +09:30
saxon eda42f4e10 Got rid of all C.mallocs and changed to my malloc, also removed all C.free - tested and working 2018-08-18 13:56:10 +09:30
saxon efb5b75f1a Started using my structs - tested and working 2018-08-18 13:51:07 +09:30
saxon 3da48c15d3 removed unused code 2018-08-18 12:54:40 +09:30
saxon aef3cd3001 Using AMFProp_Decode everywhere -tested and working 2018-08-15 20:46:38 +09:30
saxon 1e6bf462da Chedk that everything is working 2018-08-15 20:43:47 +09:30
Dan Kortschak 8be354a6d5 Port AMF3ReadInteger, AMF3ReadString, AMF3DC_AddProp and AMFProp_SetName 2018-08-15 19:27:14 +09:30
Dan Kortschak 346e63ca7c Finish up most of AMFProp_Decode
Punt one call, AMF3_Decode, that has AMF3ReadInteger, AMF3ReadString,
AMF3CD_AddProp, AMF3Prop_Decode and AMFProp_SetName as deps.
2018-08-15 17:29:05 +09:30
saxon 2e608aba88 In the middle of AMFProp_Decode 2018-08-15 05:28:34 +09:30
saxon 6113174e3d Ported AMF_AddProp - tested and working 2018-08-15 04:47:43 +09:30
saxon a2931934a6 Ported AMFProp_Reset - tested and working 2018-08-15 04:33:34 +09:30
saxon 62a1f6dec1 Ported AMF_Reset - tested and working 2018-08-15 04:28:34 +09:30
saxon 11bc432b54 Ported SendCheckBW - tested and working 2018-08-15 04:23:15 +09:30
saxon 6e7dbcda60 Ported SendPublish - tested and working 2018-08-15 04:19:18 +09:30
saxon a3654269e5 Ported RTMP_SendCreateStream - tested and working 2018-08-15 04:13:24 +09:30
saxon a61d4a3a60 Ported SendFCPublish - tested and working 2018-08-15 04:05:15 +09:30
saxon e02c785881 ported SendReleaseStream - tested and working 2018-08-15 04:00:49 +09:30
saxon 6cfabc671f Ported AV_erase - tested and working 2018-08-15 03:34:18 +09:30
saxon 27006d8fd3 Forgot to actually ues AMFProp_GetNumber - tested and working 2018-08-15 03:16:46 +09:30
saxon 9c460b90cf Ported AMFProp_GetNumber - tested and working 2018-08-15 03:14:35 +09:30
saxon 137c5a0c14 Ported AMF_GetProp - tested and working 2018-08-15 03:09:57 +09:30
saxon 48042f6813 Ported AMFProp_GetObject - tested and working 2018-08-15 02:54:41 +09:30
saxon 165a855d51 Ported AMFProp_GetString to C_AMFProp_GetString - tested and working 2018-08-15 02:47:40 +09:30
saxon e1079dab98 Ported C_AMF_Decode - tested and working 2018-08-15 02:36:17 +09:30
saxon 11798bb9ff Updated c stuff to be more usable while we port 2018-08-14 22:59:58 +09:30
saxon bd4131e974 Added files and line numbers to port todos 2018-08-14 22:59:10 +09:30
saxon 9266fc79d7 Simplified code (identified code that doesn't run in our use case - reducing no of funcs to port 2018-08-14 22:51:25 +09:30
saxon 4723a46c91 Fixed seg fault bug - HandlInvoke ported to C_HandleInvoke - tested and working 2018-08-14 22:30:47 +09:30
saxon da99cbe86b Ported HandleInvoke - need to test 2018-08-14 18:22:37 +09:30
saxon 73e2c9977a Identified functions that need porting using todo comments above HandleInvoke in rtmp.go at +1911 onwards 2018-08-14 16:36:42 +09:30
saxon 96290d295d Marking functions that need to be ported 2018-08-14 12:52:40 +09:30
saxon ceb954a328 Ported AVMATCH - not yet tested 2018-08-14 12:45:03 +09:30
saxon 5a3383c27d Fixing the formatting of HandleInvoke - it was real bad before - probably wrong 2018-08-14 12:33:52 +09:30
saxon 5f1879c58b In the middle of porting HandleInvoke 2018-08-13 12:15:43 +09:30
saxon 4328f1853b Started porting HandlInvoke 2018-08-12 21:04:14 +09:30
saxon 74735feb63 Ported AMF_DecodeInt32 to C_AMF_DecodeInt32 - tested and working 2018-08-12 20:45:46 +09:30
saxon 1fcb91dcef Ported AMF_DecodeInt32 to C_AMF_DecodeInt32 2018-08-12 20:45:06 +09:30
saxon 4f1b6ff56f Ported handleclientbw, handleserverbw and handle
changechunksize
2018-08-12 19:47:53 +09:30
saxon dc6e9a9a4b Removed code we currently don't need in, C_RTMP_ClientPacket - tested and working 2018-08-12 19:37:56 +09:30
saxon 1c8e7b01fc Ported RTMP_ClientPacket to C_RTMP_ClientPacket - not tested yet 2018-08-12 18:37:39 +09:30
saxon 1ed14d523d Ported and using RTMPPacket_Free - tested and working 2018-08-11 14:34:52 +09:30
saxon 9cde6f49f7 ported EncodeInt32LE and now using - tested and working 2018-08-11 13:59:55 +09:30
saxon e680fc76fa Using my C_DecodeInt32LE func - tested and working 2018-08-11 13:54:25 +09:30
saxon d480f427c1 ported DecodeInt32LE - still need to test 2018-08-11 13:52:32 +09:30
saxon 7111456991 Working again but not sure whyyy 2018-08-11 13:48:21 +09:30
saxon a20beaf75e Using my rtmp_read_packet is crashing 2018-08-11 12:30:11 +09:30
saxon 6137df30b3 Ported RTMP_GetTime - tested and working 2018-08-11 12:21:22 +09:30
saxon c8c3b4b3aa Using my C_SocksNegotiate func - tested and working 2018-08-11 11:44:55 +09:30
saxon cb2f4549ed Ported SocksNegotiate to C_SocksNEgotiate - still need to test 2018-08-11 11:40:42 +09:30
saxon 504c79ab27 Starting to port SocksNegotiate 2018-08-11 02:24:50 +09:30
saxon e6c62026d7 Using my C_RTMP_ParsePlaypath func - tested and working 2018-08-11 02:14:17 +09:30
saxon fbaafa0f8d Ported RTMP_ParsePlaypath to C_RTMP_ParsPlaypath - still need to test 2018-08-11 02:00:11 +09:30
saxon e9a196306c Now using my C_RTMP_ParseURL func - tested and working 2018-08-11 01:17:48 +09:30
saxon 2e3dfab7e2 Ported RTMP_ParseURL - still need to test 2018-08-11 01:13:25 +09:30
saxon e552384a42 Ported strstr() from c to go for use in librtmp.go 2018-08-10 23:22:53 +09:30
saxon 85de75a4c6 Cleaned up my structs - they are now all in go 2018-08-10 22:49:43 +09:30
saxon f0c5dd7bc3 Using my C_RTMP_ConnectStream func - tested and working 2018-08-10 22:30:22 +09:30
saxon 9fcdfe6367 Using my C_RTMP_Write func - tested and working 2018-08-10 22:27:51 +09:30
saxon 44187cdc22 Using my C_RTMP_IsConnected - tested and working 2018-08-10 22:20:11 +09:30
saxon ed536b2cdd Started using session interface again - tested and everything seems to be working 2018-08-10 22:17:01 +09:30
saxon 1c7fc111f0 changed int to int32 in structs 2018-08-10 16:50:53 +09:30
saxon a007bbeef1 added data length check to sliceToPtr 2018-08-10 16:46:39 +09:30
saxon db2f6a4756 Use len(... instead of sizeof in C_RTMP_SetupUrl 2018-08-10 16:43:19 +09:30
saxon 358e32d2ac Fixed alot of errors in code, now runnable 2018-08-10 16:10:08 +09:30
saxon 28ae89ac29 Use 0 in instead of 0.0 in float setting under C_RTMP_Connect0 2018-08-10 13:38:33 +09:30
saxon 7cea7c5628 Removed var tmp in C_RTMP_Connect for use in memset size determination, can just use var service created above 2018-08-10 13:37:35 +09:30
saxon e9fc1927b3 Added handling of av_len = 0 etc in C_SocksSetup 2018-08-10 13:31:17 +09:30
saxon cfe7689e31 Changed uintptr check to use nil instead of 0 2018-08-08 17:29:18 +09:30
saxon bded7b6240 Added comment regarding missing code left out with rtmp http stuff in it 2018-08-08 17:17:59 +09:30
saxon ace742d80e Got rid of *session Session check 2018-08-08 17:15:23 +09:30
saxon 87e9e383b1 Got rid of session interface and made session struct exported 2018-08-08 17:12:56 +09:30
saxon 441b97ed44 Split up consts 2018-08-08 17:06:16 +09:30
saxon 84c149f61b Added space between some consts 2018-08-08 16:59:32 +09:30
saxon 8ca1aac3db Commented all functions with name and location of C versions 2018-08-08 15:07:54 +09:30
saxon e4cd61b663 Started commenting functions to indicate name and location of C versions 2018-08-07 14:19:11 +09:30
saxon 16c769a411 changed names of my structs to have C_... 2018-08-07 13:58:00 +09:30
saxon 1841b16feb Commented my structs with locations and names in librtmp C library 2018-08-07 13:54:58 +09:30
saxon 736bbfed6d Changed name of avQueue to C_AvQueue 2018-08-07 12:42:37 +09:30
saxon f7559152d9 Changed name of sockBufSend to C_SockBufSend 2018-08-07 12:41:49 +09:30
saxon 5ffd3ddee6 changed name of writeN to C_WriteN 2018-08-07 12:40:43 +09:30
saxon d2fa240c1c Changed name of rtmpSendPacket to C_RTMP_SendPacket 2018-08-07 12:33:40 +09:30
saxon 342a575587 changed name of rtmpWrite to C_RTMP_Write 2018-08-07 12:32:23 +09:30
saxon 4a3ff1f4b9 Changed name of rtmpReadPacket to C_RTMP_ReadPacket 2018-08-07 12:31:30 +09:30
saxon 49a54bccf8 Changed name of rtmpPacketIsReady to C_RTMP_PacketIsReady 2018-08-07 12:30:59 +09:30
saxon beb59bf8e7 Changed name of all amfEncodes to C_AMFENcode... and changed name of all amfDecode... to C_AMFDecode... 2018-08-07 12:30:14 +09:30
saxon 2c6d458372 Changed name of amfPropEncode to C_AMFPropEncode 2018-08-07 12:29:02 +09:30
saxon 1e206875ee Changed name of sendConnectPacket to C_SendConnectPacket 2018-08-07 12:28:06 +09:30
saxon dd83eda2e9 Changed name of sendBytesReceived to C_SendBytesReceived 2018-08-07 12:27:28 +09:30
saxon f76b228f3e changed name of rtmpSockBufFill to C_RTMP_SockBufFill 2018-08-07 12:26:39 +09:30
saxon c8407ac2d0 Changed name of readN to C_ReadN 2018-08-07 12:25:20 +09:30
saxon a04647fb3b Changed name of handShake to C_HandShake 2018-08-07 12:24:25 +09:30
saxon 9df51d1bd1 Changed name of rtmpConnect to C_RTMP_Connect and, rtmpConnect0 to C_RTMP_Connect0 and rtmpConnect1 to C_RTMP_Connect1 2018-08-07 12:13:15 +09:30
saxon 2e6baaf732 Changed name of rtmpConnect to C_RTMP_Connect 2018-08-07 12:12:11 +09:30
saxon 2a26a0d625 Changed name of rtmpSetBufferMS to C_RTMP_SetBufferMS 2018-08-07 12:08:48 +09:30
saxon 9bd643bc89 Chaged name of rtmpEnableWrite to C_RTMP_EnableWrite 2018-08-07 12:07:42 +09:30
saxon 36cae47dc3 Changed name of socksSetup to C_SocksSetup 2018-08-07 12:05:58 +09:30