Fix SendRTMP, just use default chunksize on writes

git-svn-id: svn://svn.mplayerhq.hu/rtmpdump@59 400ebc74-4327-4243-bc38-086b20814532

diff --git a/rtmp.cpp b/rtmp.cpp
index 7b9170b96115db48e2791061859970d7308fb144..74fe24f914a4b125c6e8e1df185dd0cf886de071 100644 (file)
--- a/rtmp.cpp
+++ b/rtmp.cpp
@@ -1829,13 +1829,12 @@ bool CRTMP::SendRTMP(RTMPPacket &packet)
 
   nSize = packet.m_nBodySize;
   char *buffer = packet.m_body;
+  int nChunkSize = nSize > RTMP_DEFAULT_CHUNKSIZE ?
+       RTMP_DEFAULT_CHUNKSIZE : nSize;
 
   while (nSize)
   {
-    int nChunkSize = packet.m_packetType == 0x14?m_chunkSize:packet.m_nBodySize;
     int wrote;
-    if (nSize < m_chunkSize)
-      nChunkSize = nSize;
 
     if (header) {
       wrote=WriteN(header, nChunkSize+hSize);
@@ -1877,7 +1876,7 @@ void CRTMP::Close()
 
   m_stream_id = -1;
   m_socket = 0;
-  m_chunkSize = 128;
+  m_chunkSize = RTMP_DEFAULT_CHUNKSIZE;
   m_nBWCheckCounter = 0;
   m_nBytesIn = 0;
   m_nBytesInSent = 0;

diff --git a/rtmp.h b/rtmp.h
index ce8528fcc6d84fd73865d133f15faf64bbc5bce5..50893eb6279b94ae3368a47d608b191bd5f2b0cd 100644 (file)
--- a/rtmp.h
+++ b/rtmp.h
@@ -55,6 +55,8 @@
 #define RTMP_PROTOCOL_RTMPTE    4 // not yet supported
 #define RTMP_PROTOCOL_RTMFP     5 // not yet supported
 
+#define RTMP_DEFAULT_CHUNKSIZE 128
+
 extern char RTMPProtocolStringsLower[][7];
 
 int32_t GetTime();