mirror
/
av
mirror of https://bitbucket.org/ausocean/av.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Changed name of rtmpSendPacket to C_RTMP_SendPacket

This commit is contained in:
saxon 2018-08-07 12:33:40 +09:30
parent 342a575587
commit d2fa240c1c
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
rtmp/rtmp.go
View File

@ -934,7 +934,7 @@ func C_SendBytesReceived(r *C.RTMP) int {
r.m_nBytesInSent = r.m_nBytesIn r.m_nBytesInSent = r.m_nBytesIn
//return int(C.RTMP_SendPacket(r, &packet, 0)) //return int(C.RTMP_SendPacket(r, &packet, 0))
return rtmpSendPacket(r, &packet, 0) return C_RTMP_SendPacket(r, &packet, 0)
} }
func C_SendConnectPacket(r *C.RTMP, cp *C.RTMPPacket) int { func C_SendConnectPacket(r *C.RTMP, cp *C.RTMPPacket) int {
@ -945,7 +945,7 @@ func C_SendConnectPacket(r *C.RTMP, cp *C.RTMPPacket) int {
var enc *byte var enc *byte
if cp != nil { if cp != nil {
return rtmpSendPacket(r, cp, 1) return C_RTMP_SendPacket(r, cp, 1)
//return int(C.RTMP_SendPacket(r, cp, 1)) //return int(C.RTMP_SendPacket(r, cp, 1))
} }
@ -1112,7 +1112,7 @@ func C_SendConnectPacket(r *C.RTMP, cp *C.RTMPPacket) int {
int(uintptr(unsafe.Pointer(packet.m_body))))))) int(uintptr(unsafe.Pointer(packet.m_body)))))))
//return int(C.RTMP_SendPacket(r, &packet, 1)) //return int(C.RTMP_SendPacket(r, &packet, 1))
return rtmpSendPacket(r, &packet, 1) return C_RTMP_SendPacket(r, &packet, 1)
} }
func C_AMFPropEncode(p *C.AMFObjectProperty, pBuffer *byte, pBufEnd *byte) *byte { func C_AMFPropEncode(p *C.AMFObjectProperty, pBuffer *byte, pBufEnd *byte) *byte {
@ -1591,7 +1591,7 @@ func C_RTMP_Write(r *C.RTMP, data []byte) int {
buf = incBytePtr(buf, num) buf = incBytePtr(buf, num)
if pkt.m_nBytesRead == pkt.m_nBodySize { if pkt.m_nBytesRead == pkt.m_nBodySize {
// TODO: Port this // TODO: Port this
ret = rtmpSendPacket(r, pkt, 0) ret = C_RTMP_SendPacket(r, pkt, 0)
// TODO: Port this // TODO: Port this
C.RTMPPacket_Free(pkt) C.RTMPPacket_Free(pkt)
pkt.m_nBytesRead = 0 pkt.m_nBytesRead = 0
@ -1609,7 +1609,7 @@ func C_RTMP_Write(r *C.RTMP, data []byte) int {
} }
// send packet version 1 - less C stuff // send packet version 1 - less C stuff
func rtmpSendPacket(r *C.RTMP, packet *C.RTMPPacket, queue int) int { func C_RTMP_SendPacket(r *C.RTMP, packet *C.RTMPPacket, queue int) int {
var prevPacket *C.RTMPPacket var prevPacket *C.RTMPPacket
last := 0 last := 0
var nSize, hSize, cSize, nChunkSize int var nSize, hSize, cSize, nChunkSize int
@ -1756,7 +1756,7 @@ func rtmpSendPacket(r *C.RTMP, packet *C.RTMPPacket, queue int) int {
nChunkSize = int(r.m_outChunkSize) nChunkSize = int(r.m_outChunkSize)
if debugMode { if debugMode {
log.Printf("rtmpSendPacket: fd=%v, size=%v", r.m_sb.sb_socket, nSize) log.Printf("C_RTMP_SendPacket: fd=%v, size=%v", r.m_sb.sb_socket, nSize)
} }
for (nSize + hSize) != 0 { for (nSize + hSize) != 0 {