From 1441d1d968192806e25a16468653bdf8c1aee48d Mon Sep 17 00:00:00 2001 From: saxon Date: Fri, 24 Aug 2018 10:34:10 +0930 Subject: [PATCH] rtmp: reordered struct order in rtmp_headers.go such that it matches up with order in rtmp.h under C librtmp --- rtmp/rtmp_headers.go | 142 +++++++++++++++++++++---------------------- 1 file changed, 71 insertions(+), 71 deletions(-) diff --git a/rtmp/rtmp_headers.go b/rtmp/rtmp_headers.go index 3b25580a..cbd3230d 100644 --- a/rtmp/rtmp_headers.go +++ b/rtmp/rtmp_headers.go @@ -98,6 +98,15 @@ const ( RTMP_MAX_HEADER_SIZE = 18 ) +// typedef struct RTMPChunk +// rtmp.h +105 +type C_RTMPChunk struct { + c_headerSize int32 + c_chunkSize int32 + c_chunk *byte + c_header [RTMP_MAX_HEADER_SIZE]byte +} + // typedef struct RTMPPacket // rtmp.h +113 type C_RTMPPacket struct { @@ -113,6 +122,68 @@ type C_RTMPPacket struct { m_body *byte } +// typedef struct RTMPSockBuf +// rtmp.h +127 +type C_RTMPSockBuf struct { + sb_socket int32 + sb_size int32 + sb_start *byte + sb_buf [RTMP_BUFFER_CACHE_SIZE]byte // port const + sb_timedout int32 + sb_ssl uintptr +} + +// typedef struct RTMP_LNK +// rtmp.h +144 +type C_RTMP_LNK struct { + hostname C_AVal + sockshost C_AVal + playpath0 C_AVal + playpath C_AVal + tcUrl C_AVal + swfUrl C_AVal + pageUrl C_AVal + app C_AVal + auth C_AVal + flashVer C_AVal + subscribepath C_AVal + usherToken C_AVal + token C_AVal + pubUser C_AVal + pubPasswd C_AVal + extras C_AMFObject + edepth int32 + seekTime int32 + stopTime int32 + lFlags int32 + swfAge int32 + protocol int32 + timeout int32 + pFlags int32 + socksport uint16 + port uint16 +} + +// typedef struct RTMP_READ +// rtmp.h +200 +type C_RTMP_READ struct { + buf *byte + bufpos *byte + buflen uint + timestamp uint32 + dataType uint8 + flags uint8 + status int8 + initialFrameType uint8 + nResumeTS uint32 + metaHeader *byte + initialFrame *byte + nMetaHeaderSize uint32 + nInitialFrameSize uint32 + nIgnoredFrameCounter uint32 + nIgnoredFlvFrameCounter uint32 +} + // typedef struct RTMPMethod // rtmp.h +231 type C_RTMP_METHOD struct { @@ -162,74 +233,3 @@ type C_RTMP struct { m_sb C_RTMPSockBuf Link C_RTMP_LNK } - -// typedef struct RTMP_READ -// rtmp.h +200 -type C_RTMP_READ struct { - buf *byte - bufpos *byte - buflen uint - timestamp uint32 - dataType uint8 - flags uint8 - status int8 - initialFrameType uint8 - nResumeTS uint32 - metaHeader *byte - initialFrame *byte - nMetaHeaderSize uint32 - nInitialFrameSize uint32 - nIgnoredFrameCounter uint32 - nIgnoredFlvFrameCounter uint32 -} - -// typedef struct RTMP_READ -// rtmp.h +200 -type C_RTMPSockBuf struct { - sb_socket int32 - sb_size int32 - sb_start *byte - sb_buf [RTMP_BUFFER_CACHE_SIZE]byte // port const - sb_timedout int32 - sb_ssl uintptr -} - -// typedef struct RTMPChunk -// rtmp.h +105 -type C_RTMPChunk struct { - c_headerSize int32 - c_chunkSize int32 - c_chunk *byte - c_header [RTMP_MAX_HEADER_SIZE]byte -} - -// typedef struct RTMP_LNK -// rtmp.h +144 -type C_RTMP_LNK struct { - hostname C_AVal - sockshost C_AVal - playpath0 C_AVal - playpath C_AVal - tcUrl C_AVal - swfUrl C_AVal - pageUrl C_AVal - app C_AVal - auth C_AVal - flashVer C_AVal - subscribepath C_AVal - usherToken C_AVal - token C_AVal - pubUser C_AVal - pubPasswd C_AVal - extras C_AMFObject - edepth int32 - seekTime int32 - stopTime int32 - lFlags int32 - swfAge int32 - protocol int32 - timeout int32 - pFlags int32 - socksport uint16 - port uint16 -}