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

changed name of writeN to C_WriteN

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

14
rtmp/rtmp.go
View File

@ -52,7 +52,7 @@ RTMP* start_session(RTMP* rtmp, char* url, uint connect_timeout);
int write_frame(RTMP* rtmp, char* data, uint data_length); int write_frame(RTMP* rtmp, char* data, uint data_length);
int end_session(RTMP* rtmp); int end_session(RTMP* rtmp);
void AV_queue(RTMP_METHOD **vals, int *num, AVal *av, int txn); void AV_queue(RTMP_METHOD **vals, int *num, AVal *av, int txn);
int writeN(RTMP *r, const char *buffer, int n); int C_WriteN(RTMP *r, const char *buffer, int n);
int EncodeInt32LE(char *output, int nVal); int EncodeInt32LE(char *output, int nVal);
int HTTP_Post(RTMP *r, RTMPTCmd cmd, const char *buf, int len); int HTTP_Post(RTMP *r, RTMPTCmd cmd, const char *buf, int len);
*/ */
@ -779,7 +779,7 @@ func C_HandShake(r *C.RTMP, FP9HandShake int32) int {
*indxBytePtr(unsafe.Pointer(clientsig), i) = byte(rand.Intn(256)) *indxBytePtr(unsafe.Pointer(clientsig), i) = byte(rand.Intn(256))
} }
if writeN(r, unsafe.Pointer(&clientbuf[0]), RTMP_SIG_SIZE+1) == 0 { if C_WriteN(r, unsafe.Pointer(&clientbuf[0]), RTMP_SIG_SIZE+1) == 0 {
return 0 return 0
} }
@ -805,7 +805,7 @@ func C_HandShake(r *C.RTMP, FP9HandShake int32) int {
suptime = inet.Ntohl(suptime) suptime = inet.Ntohl(suptime)
// 2nd part of handshake // 2nd part of handshake
if writeN(r, unsafe.Pointer(&serversig[0]), RTMP_SIG_SIZE) == 0 { if C_WriteN(r, unsafe.Pointer(&serversig[0]), RTMP_SIG_SIZE) == 0 {
return 0 return 0
} }
@ -1773,7 +1773,7 @@ func C_RTMP_SendPacket(r *C.RTMP, packet *C.RTMPPacket, queue int) int {
toff = incBytePtr(toff, nChunkSize+hSize) toff = incBytePtr(toff, nChunkSize+hSize)
} else { } else {
// TODO: port this // TODO: port this
wrote = int(writeN(r, header, nChunkSize+hSize)) wrote = int(C_WriteN(r, header, nChunkSize+hSize))
if wrote == 0 { if wrote == 0 {
return 0 return 0
@ -1817,7 +1817,7 @@ func C_RTMP_SendPacket(r *C.RTMP, packet *C.RTMPPacket, queue int) int {
} }
if tbuf != nil { if tbuf != nil {
wrote := int(writeN(r, tbuf, int(uintptr(decBytePtr(toff, wrote := int(C_WriteN(r, tbuf, int(uintptr(decBytePtr(toff,
int(uintptr(unsafe.Pointer(tbuf)))))))) int(uintptr(unsafe.Pointer(tbuf))))))))
//C.free(tbuf) //C.free(tbuf)
tbuf = nil tbuf = nil
@ -1867,7 +1867,7 @@ func C_RTMP_SendPacket(r *C.RTMP, packet *C.RTMPPacket, queue int) int {
return 1 return 1
} }
func writeN(r *C.RTMP, buffer unsafe.Pointer, n int) int { func C_WriteN(r *C.RTMP, buffer unsafe.Pointer, n int) int {
ptr := buffer ptr := buffer
for n > 0 { for n > 0 {
var nBytes int var nBytes int
@ -1877,7 +1877,7 @@ func writeN(r *C.RTMP, buffer unsafe.Pointer, n int) int {
if nBytes < 0 { if nBytes < 0 {
if debugMode { if debugMode {
log.Println("writeN, RTMP send error") log.Println("C_WriteN, RTMP send error")
} }
// TODO: port this // TODO: port this