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

Creating wrapper for unsafe.Pointer conversion

This commit is contained in:
saxon 2018-07-20 14:10:08 +09:30
parent de4e673e94
commit a0fa9106d6
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
rtmp/rtmp.go
View File

@ -428,10 +428,10 @@ func rtmpSetupUrl(r *C.RTMP, u string) int32 {
r.Link.playpath = r.Link.playpath0 r.Link.playpath = r.Link.playpath0
if r.Link.tcUrl.av_len == 0 { if r.Link.tcUrl.av_len == 0 {
r.Link.tcUrl.av_val = url r.Link.tcUrl.av_val = (*C.char)(unsafe.Pointer(url))
if r.Link.app.av_len != 0 { if r.Link.app.av_len != 0 {
if int(uintptr(unsafe.Pointer(r.Link.app.av_val))) < if int(uintptr(unsafe.Pointer(r.Link.app.av_val))) <
int(uintptr(incBytePtr(url, len))) { int(uintptr(incBytePtr(unsafe.Pointer(url), len))) {
r.Link.tcUrl.av_len = r.Link.app.av_len + r.Link.tcUrl.av_len = r.Link.app.av_len +
int(uintptr(decBytePtr(r.Link.app.av_val, int(uintptr(unsafe.Pointer(url)))))) int(uintptr(decBytePtr(r.Link.app.av_val, int(uintptr(unsafe.Pointer(url))))))
@ -478,7 +478,8 @@ func rtmpSetupUrl(r *C.RTMP, u string) int32 {
func socksSetup(r *RTMP, sockshost *AVal) { func socksSetup(r *RTMP, sockshost *AVal) {
if sockshost.av_len != 0 { if sockshost.av_len != 0 {
socksport := strchr((*byte)(sockshost.av_val), ':') socksport := strchr((*byte)(unsafe.Pointer(sockshost.av_val)), ':')
hostname := strdup((*byte)(sockshost.av_val))
} }
} }
@ -1057,6 +1058,16 @@ func avQueue(vals **C.RTMP_METHOD, num *int, av *C.AVal, txn int) {
int(unsafe.Sizeof(rtmpMethodPtr))))).name.av_val = (*C.char)(tmp) int(unsafe.Sizeof(rtmpMethodPtr))))).name.av_val = (*C.char)(tmp)
} }
// wrapper for converting byte pointer to unsafe.Pointer
func uBP(b *byte) unsafe.Pointer {
return unsafe.Pointer(b)
}
// wrapper for converting slice to unsafe.pointer
func uBSP(b []byte) unsafe.Pointer {
return unsafe.Pointer(&b[0])
}
func goStrToCStr(str string) *byte { func goStrToCStr(str string) *byte {
l := len(str) l := len(str)
slice := make([]byte, l+1) slice := make([]byte, l+1)