jp9000/obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/jp9000/obs-studio

Browse Source
This commit is contained in:
jp9000
2014-04-10 12:03:59 -07:00
parent 519c4f4118 d0e3f0d6a3
commit f98c006711
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
plugins/obs-outputs/librtmp/rtmp.c
View File

@@ -141,7 +141,7 @@ static void DecodeTEA(AVal *key, AVal *text);
static int HTTP_Post(RTMP *r, RTMPTCmd cmd, const char *buf, int len);
static int HTTP_read(RTMP *r, int fill);
#ifndef _WIN32
#if !defined(_WIN32) && !defined(_DEBUG)
static int clk_tck;
#endif
@@ -1651,14 +1651,14 @@ RTMP_ClientPacket(RTMP *r, RTMPPacket *packet)
RTMP_Log(RTMP_LOGDEBUG, "%s, unknown packet type received: 0x%02x", __FUNCTION__,
packet->m_packetType);
#ifdef _DEBUG
RTMP_LogHex(RTMP_LOGDEBUG, packet->m_body, packet->m_nBodySize);
RTMP_LogHex(RTMP_LOGDEBUG, (uint8_t*)packet->m_body, packet->m_nBodySize);
#endif
}
return bHasMediaPacket;
}
#if defined(_DEBUG) && !defined(WIN32)
#if defined(RTMP_NETSTACK_DUMP)
extern FILE *netstackdump;
extern FILE *netstackdump_read;
#endif
@@ -1746,7 +1746,7 @@ ReadN(RTMP *r, char *buffer, int n)
return FALSE;
}
/*RTMP_Log(RTMP_LOGDEBUG, "%s: %d bytes\n", __FUNCTION__, nBytes); */
#if defined(_DEBUG) && !defined(WIN32)
#if defined(RTMP_NETSTACK_DUMP)
fwrite(ptr, 1, nBytes, netstackdump_read);
#endif
@@ -2201,7 +2201,9 @@ SendFCUnpublish(RTMP *r)
SAVC(publish);
SAVC(live);
#if 0
SAVC(record);
#endif
static int
SendPublish(RTMP *r)
@@ -3246,8 +3248,10 @@ static const AVal av_NetStream_Play_UnpublishNotify =
static const AVal av_NetStream_Publish_Start = AVC("NetStream.Publish.Start");
static const AVal av_NetStream_Publish_Rejected = AVC("NetStream.Publish.Rejected");
static const AVal av_NetStream_Publish_Denied = AVC("NetStream.Publish.Denied");
#if 0
static const AVal av_NetConnection_Connect_Rejected =
AVC("NetConnection.Connect.Rejected");
#endif
/* Returns 0 for OK/Failed/error, 1 for 'Stop or Complete' */
static int
@@ -4668,7 +4672,7 @@ RTMPSockBuf_Send(RTMPSockBuf *sb, const char *buf, int len)
{
int rc;
#if defined(_DEBUG) && !defined(WIN32)
#if defined(RTMP_NETSTACK_DUMP)
fwrite(buf, 1, len, netstackdump);
#endif
@@ -5289,7 +5293,7 @@ stopKeyframeSearch:
#ifdef _DEBUG
RTMP_Log(RTMP_LOGDEBUG,
"FLV Packet: type %02X, dataSize: %lu, tagSize: %lu, timeStamp: %lu ms",
"FLV Packet: type %02X, dataSize: %u, tagSize: %u, timeStamp: %u ms",
(unsigned char)packetBody[pos], dataSize, prevTagSize,
nTimeStamp);
#endif