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

Changed name of amfPropEncode to C_AMFPropEncode

This commit is contained in:
saxon 2018-08-07 12:29:02 +09:30
parent 1e206875ee
commit 2c6d458372
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

@ -1098,7 +1098,7 @@ func C_SendConnectPacket(r *C.RTMP, cp *C.RTMPPacket) int {
//incPtr(unsafe.Pointer(&r.Link.extras.o_props), int(unsafe.Sizeof( //incPtr(unsafe.Pointer(&r.Link.extras.o_props), int(unsafe.Sizeof(
//r.Link.extras.o_props)), i)), (*C.char)(unsafe.Pointer(enc)), (*C.char)( //r.Link.extras.o_props)), i)), (*C.char)(unsafe.Pointer(enc)), (*C.char)(
//unsafe.Pointer(pend))))) //unsafe.Pointer(pend)))))
enc = amfPropEncode((*C.AMFObjectProperty)(incPtr(unsafe.Pointer( enc = C_AMFPropEncode((*C.AMFObjectProperty)(incPtr(unsafe.Pointer(
&r.Link.extras.o_props), int(unsafe.Sizeof(r.Link.extras.o_props)), i)), &r.Link.extras.o_props), int(unsafe.Sizeof(r.Link.extras.o_props)), i)),
enc, pend) enc, pend)
@ -1115,7 +1115,7 @@ func C_SendConnectPacket(r *C.RTMP, cp *C.RTMPPacket) int {
return rtmpSendPacket(r, &packet, 1) return rtmpSendPacket(r, &packet, 1)
} }
func amfPropEncode(p *C.AMFObjectProperty, pBuffer *byte, pBufEnd *byte) *byte { func C_AMFPropEncode(p *C.AMFObjectProperty, pBuffer *byte, pBufEnd *byte) *byte {
if p.p_type == AMF_INVALID { if p.p_type == AMF_INVALID {
return nil return nil
} }
@ -1165,7 +1165,7 @@ func amfPropEncode(p *C.AMFObjectProperty, pBuffer *byte, pBufEnd *byte) *byte {
//pBuffer = (*byte)(unsafe.Pointer(C.AMF_EncodeArray(&p.p_vu.p_object, (*C.char)(unsafe.Pointer(pBuffer)), (*C.char)(unsafe.Pointer(pBufEnd))))) //pBuffer = (*byte)(unsafe.Pointer(C.AMF_EncodeArray(&p.p_vu.p_object, (*C.char)(unsafe.Pointer(pBuffer)), (*C.char)(unsafe.Pointer(pBufEnd)))))
pBuffer = amfEncodeArray(&p.p_vu.p_object, pBuffer, pBufEnd) pBuffer = amfEncodeArray(&p.p_vu.p_object, pBuffer, pBufEnd)
default: default:
log.Println("amfPropEncode: invalid type!") log.Println("C_AMFPropEncode: invalid type!")
pBuffer = nil pBuffer = nil
} }
return pBuffer return pBuffer
@ -1180,7 +1180,7 @@ func amfEncode(obj *C.AMFObject, pBuffer *byte, pBufEnd *byte) *byte {
pBuffer = (*byte)(incBytePtr(unsafe.Pointer(pBuffer), 1)) pBuffer = (*byte)(incBytePtr(unsafe.Pointer(pBuffer), 1))
for i := 0; i < int(obj.o_num); i++ { for i := 0; i < int(obj.o_num); i++ {
res := amfPropEncode((*C.AMFObjectProperty)(incPtr(unsafe.Pointer( res := C_AMFPropEncode((*C.AMFObjectProperty)(incPtr(unsafe.Pointer(
obj.o_props), i, int(unsafe.Sizeof(*obj.o_props)))), pBuffer, pBufEnd) obj.o_props), i, int(unsafe.Sizeof(*obj.o_props)))), pBuffer, pBufEnd)
if res == nil { if res == nil {
log.Println("amfEncode: failed to encode property in index") log.Println("amfEncode: failed to encode property in index")
@ -1210,7 +1210,7 @@ func amfEncodeEcmaArray(obj *C.AMFObject, pBuffer *byte, pBufEnd *byte) *byte {
pBuffer = amfEncodeInt32(pBuffer, pBufEnd, int32(obj.o_num)) pBuffer = amfEncodeInt32(pBuffer, pBufEnd, int32(obj.o_num))
for i := 0; i < int(obj.o_num); i++ { for i := 0; i < int(obj.o_num); i++ {
res := amfPropEncode((*C.AMFObjectProperty)(incPtr(unsafe.Pointer( res := C_AMFPropEncode((*C.AMFObjectProperty)(incPtr(unsafe.Pointer(
obj.o_props), i, int(unsafe.Sizeof(*obj.o_props)))), pBuffer, pBufEnd) obj.o_props), i, int(unsafe.Sizeof(*obj.o_props)))), pBuffer, pBufEnd)
if res == nil { if res == nil {
log.Println("amfEncodeEcmaArray: failed to encode property!") log.Println("amfEncodeEcmaArray: failed to encode property!")
@ -1240,7 +1240,7 @@ func amfEncodeArray(obj *C.AMFObject, pBuffer *byte, pBufEnd *byte) *byte {
pBuffer = amfEncodeInt32(pBuffer, pBufEnd, int32(obj.o_num)) pBuffer = amfEncodeInt32(pBuffer, pBufEnd, int32(obj.o_num))
for i := 0; i < int(obj.o_num); i++ { for i := 0; i < int(obj.o_num); i++ {
res := amfPropEncode((*C.AMFObjectProperty)(incPtr(unsafe.Pointer( res := C_AMFPropEncode((*C.AMFObjectProperty)(incPtr(unsafe.Pointer(
obj.o_props), i, int(unsafe.Sizeof(*obj.o_props)))), pBuffer, pBufEnd) obj.o_props), i, int(unsafe.Sizeof(*obj.o_props)))), pBuffer, pBufEnd)
if res == nil { if res == nil {
log.Println("amfEncodeEcmaArray: failed to encode property!") log.Println("amfEncodeEcmaArray: failed to encode property!")