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

Implemented rtmp close func, but need to do more testing - also changed rtmp.c and rtmp.h to remove static funcs

This commit is contained in:
saxon 2018-07-20 21:25:02 +09:30
parent 09a1470df7
commit c01ea8323c
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
rtmp/rtmp_c/librtmp/rtmp.c
View File

@ -115,7 +115,7 @@ static int SocksNegotiate(RTMP *r);
static int SendConnectPacket(RTMP *r, RTMPPacket *cp); static int SendConnectPacket(RTMP *r, RTMPPacket *cp);
static int SendCheckBW(RTMP *r); static int SendCheckBW(RTMP *r);
static int SendCheckBWResult(RTMP *r, double txn); static int SendCheckBWResult(RTMP *r, double txn);
static int SendDeleteStream(RTMP *r, double dStreamId); int SendDeleteStream(RTMP *r, double dStreamId);
static int SendFCSubscribe(RTMP *r, AVal *subscribepath); static int SendFCSubscribe(RTMP *r, AVal *subscribepath);
static int SendPlay(RTMP *r); static int SendPlay(RTMP *r);
static int SendBytesReceived(RTMP *r); static int SendBytesReceived(RTMP *r);
@ -406,7 +406,7 @@ static const char DEFAULT_FLASH_VER[] = DEF_VERSTR;
const AVal RTMP_DefaultFlashVer = const AVal RTMP_DefaultFlashVer =
{ (char *)DEFAULT_FLASH_VER, sizeof(DEFAULT_FLASH_VER) - 1 }; { (char *)DEFAULT_FLASH_VER, sizeof(DEFAULT_FLASH_VER) - 1 };
static void void
SocksSetup(RTMP *r, AVal *sockshost) SocksSetup(RTMP *r, AVal *sockshost)
{ {
if (sockshost->av_len) if (sockshost->av_len)
@ -1872,7 +1872,7 @@ SendFCPublish(RTMP *r)
SAVC(FCUnpublish); SAVC(FCUnpublish);
static int int
SendFCUnpublish(RTMP *r) SendFCUnpublish(RTMP *r)
{ {
RTMPPacket packet; RTMPPacket packet;
@ -1939,7 +1939,7 @@ SendPublish(RTMP *r)
SAVC(deleteStream); SAVC(deleteStream);
static int int
SendDeleteStream(RTMP *r, double dStreamId) SendDeleteStream(RTMP *r, double dStreamId)
{ {
RTMPPacket packet; RTMPPacket packet;
@ -2424,7 +2424,7 @@ AV_queue(RTMP_METHOD **vals, int *num, AVal *av, int txn)
(*vals)[(*num)++].name.av_val = tmp; (*vals)[(*num)++].name.av_val = tmp;
} }
static void void
AV_clear(RTMP_METHOD *vals, int num) AV_clear(RTMP_METHOD *vals, int num)
{ {
int i; int i;

8
rtmp/rtmp_c/librtmp/rtmp.h
View File

@ -289,6 +289,14 @@ extern "C"
void RTMP_SetBufferMS(RTMP *r, int size); void RTMP_SetBufferMS(RTMP *r, int size);
void RTMP_UpdateBufferMS(RTMP *r); void RTMP_UpdateBufferMS(RTMP *r);
void AV_clear(RTMP_METHOD *vals, int num);
void SocksSetup(RTMP *r, AVal *sockshost);
int SendFCUnpublish(RTMP *r);
int SendDeleteStream(RTMP *r, double dStreamId);
int RTMP_SetOpt(RTMP *r, const AVal *opt, AVal *arg); int RTMP_SetOpt(RTMP *r, const AVal *opt, AVal *arg);
int RTMP_SetupURL(RTMP *r, char *url); int RTMP_SetupURL(RTMP *r, char *url);
void RTMP_SetupStream(RTMP *r, int protocol, void RTMP_SetupStream(RTMP *r, int protocol,