mirror of https://bitbucket.org/ausocean/av.git
Wrote rtmpClose and close internal and tested - but more testing needed
This commit is contained in:
parent
d3b00475ae
commit
09a1470df7
86
rtmp/rtmp.go
86
rtmp/rtmp.go
|
@ -473,8 +473,86 @@ func rtmpSetupUrl(r *C.RTMP, u string) int32 {
|
|||
return 1
|
||||
}
|
||||
|
||||
func strLen(str string) int {
|
||||
return len(str)
|
||||
func rtmpClose(r *C.RTMP) {
|
||||
closeInternal(r, 0)
|
||||
}
|
||||
|
||||
func closeInternal(r *C.RTMP, reconnect int32) {
|
||||
var i int32
|
||||
|
||||
if C.RTMP_IsConnected(r) != 0 {
|
||||
if r.m_stream_id > 0 {
|
||||
i = int32(r.m_stream_id)
|
||||
if r.Link.protocol&RTMP_FEATURE_WRITE != 0 {
|
||||
C.SendFCUnpublish(r)
|
||||
}
|
||||
C.SendDeleteStream(r, C.double(i))
|
||||
}
|
||||
C.RTMPSockBuf_Close(&r.m_sb)
|
||||
}
|
||||
|
||||
r.m_stream_id = -1
|
||||
r.m_sb.sb_socket = -1
|
||||
r.m_nBWCheckCounter = 0
|
||||
r.m_nBytesIn = 0
|
||||
r.m_nBytesInSent = 0
|
||||
|
||||
if r.m_read.flags&RTMP_READ_HEADER != 0 {
|
||||
C.free(unsafe.Pointer(r.m_read.buf))
|
||||
r.m_read.buf = nil
|
||||
}
|
||||
|
||||
r.m_read.dataType = 0
|
||||
r.m_read.flags = 0
|
||||
r.m_read.status = 0
|
||||
r.m_read.nResumeTS = 0
|
||||
r.m_read.nIgnoredFrameCounter = 0
|
||||
r.m_read.nIgnoredFlvFrameCounter = 0
|
||||
|
||||
r.m_write.m_nBytesRead = 0
|
||||
C.RTMPPacket_Free(&r.m_write)
|
||||
|
||||
for i := 0; i < int(r.m_channelsAllocatedIn); i++ {
|
||||
if *(**C.RTMPPacket)(incPtr(unsafe.Pointer(r.m_vecChannelsIn), i,
|
||||
int(unsafe.Sizeof(&r.m_write)))) != nil {
|
||||
|
||||
C.RTMPPacket_Free(*(**C.RTMPPacket)(incPtr(unsafe.Pointer(r.m_vecChannelsIn), i,
|
||||
int(unsafe.Sizeof(&r.m_write)))))
|
||||
|
||||
C.free(unsafe.Pointer(*(**C.RTMPPacket)(incPtr(unsafe.Pointer(r.m_vecChannelsIn),
|
||||
i, int(unsafe.Sizeof(&r.m_write))))))
|
||||
|
||||
*(**C.RTMPPacket)(incPtr(unsafe.Pointer(r.m_vecChannelsIn),
|
||||
i, int(unsafe.Sizeof(&r.m_write)))) = nil
|
||||
}
|
||||
}
|
||||
|
||||
C.free(unsafe.Pointer(r.m_vecChannelsOut))
|
||||
r.m_vecChannelsOut = nil
|
||||
r.m_channelsAllocatedOut = 0
|
||||
C.AV_clear(r.m_methodCalls, r.m_numCalls)
|
||||
|
||||
r.m_methodCalls = nil
|
||||
r.m_numCalls = 0
|
||||
r.m_numInvokes = 0
|
||||
|
||||
r.m_bPlaying = C.uchar(0)
|
||||
r.m_sb.sb_size = 0
|
||||
|
||||
r.m_msgCounter = 0
|
||||
r.m_resplen = 0
|
||||
r.m_unackd = 0
|
||||
|
||||
if ((r.Link.lFlags & RTMP_LF_FTCU) != 0) && (reconnect == 0) {
|
||||
C.free(unsafe.Pointer(r.Link.app.av_val))
|
||||
r.Link.app.av_val = nil
|
||||
r.Link.lFlags ^= RTMP_LF_FAPU
|
||||
}
|
||||
|
||||
if reconnect == 0 {
|
||||
C.free(unsafe.Pointer(r.Link.playpath0.av_val))
|
||||
r.Link.playpath0.av_val = nil
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
|
@ -1051,6 +1129,10 @@ func avQueue(vals **C.RTMP_METHOD, num *int, av *C.AVal, txn int) {
|
|||
int(unsafe.Sizeof(rtmpMethodPtr))))).name.av_val = (*C.char)(tmp)
|
||||
}
|
||||
|
||||
func strLen(str string) int {
|
||||
return len(str)
|
||||
}
|
||||
|
||||
// wrapper for converting byte pointer to unsafe.Pointer
|
||||
func bToUP(b *byte) unsafe.Pointer {
|
||||
return unsafe.Pointer(b)
|
||||
|
|
Loading…
Reference in New Issue