November 2009 - rtmpdump - lists.mplayerhq.hu

r57 - parseurl.c rtmp.h
by hyc 23 Nov '09

23 Nov '09

Author: hyc Date: Tue Nov 24 00:48:22 2009 New Revision: 57 Log: remove 'not yet supported' comment for rtmpe Modified: parseurl.c rtmp.h Modified: parseurl.c ============================================================================== --- parseurl.c Sun Nov 22 23:08:35 2009 (r56) +++ parseurl.c Tue Nov 24 00:48:22 2009 (r57) @@ -32,7 +32,7 @@ #define RTMP_PROTOCOL_RTMP 0 #define RTMP_PROTOCOL_RTMPT 1 // not yet supported #define RTMP_PROTOCOL_RTMPS 2 // not yet supported -#define RTMP_PROTOCOL_RTMPE 3 // not yet supported +#define RTMP_PROTOCOL_RTMPE 3 #define RTMP_PROTOCOL_RTMPTE 4 // not yet supported #define RTMP_PROTOCOL_RTMFP 5 // not yet supported Modified: rtmp.h ============================================================================== --- rtmp.h Sun Nov 22 23:08:35 2009 (r56) +++ rtmp.h Tue Nov 24 00:48:22 2009 (r57) @@ -51,7 +51,7 @@ #define RTMP_PROTOCOL_RTMP 0 #define RTMP_PROTOCOL_RTMPT 1 // not yet supported #define RTMP_PROTOCOL_RTMPS 2 // not yet supported -#define RTMP_PROTOCOL_RTMPE 3 // not yet supported +#define RTMP_PROTOCOL_RTMPE 3 #define RTMP_PROTOCOL_RTMPTE 4 // not yet supported #define RTMP_PROTOCOL_RTMFP 5 // not yet supported

1 0

Fix to compile rtmpdump v 1.9 on Mac OSX 10.6 Snow Leopard
by Tom Selgas 22 Nov '09

22 Nov '09

To compile rtmpdump v 1.9 on Mac OSX 10.6 Snow Leopard you will need to do the following: 1) Install Xcode 3.2 from the Snow Leopard Installation DVD 2) Edit the "streams.cpp" file in the "rtmpdump-1.9" folder by replacing all (two) occurrences of "MSG_NOSIGNAL" with "SO_NOSIGPIPE". Tom Selgas Mobile: 972-333-3817 This e-mail is intended ONLY for the recipient to whom it was sent by Thomas Selgas. PLEASE DO NOT FORWARD THIS MESSAGE WITHOUT THE EXPRESS CONSENT OF THOMAS SELGAS.

2 1

r56 - streams.cpp
by hyc 22 Nov '09

22 Nov '09

Author: hyc Date: Sun Nov 22 23:08:35 2009 New Revision: 56 Log: Just ignore SIGPIPE, MSG_NOSIGNAL is Linux-specific Modified: streams.cpp Modified: streams.cpp ============================================================================== --- streams.cpp Fri Nov 20 20:03:20 2009 (r55) +++ streams.cpp Sun Nov 22 23:08:35 2009 (r56) @@ -661,7 +661,7 @@ void processTCPrequest // write FLV header first nRead = WriteHeader(&buffer, PACKET_SIZE); if(nRead > 0) { - nWritten = send(sockfd, buffer, nRead, MSG_NOSIGNAL); + nWritten = send(sockfd, buffer, nRead, 0); if(nWritten < 0) { Log(LOGERROR, "%s, sending failed, error: %d", __FUNCTION__, GetSockError()); goto cleanup; // we are in STREAMING_IN_PROGRESS, so we'll go to STREAMING_ACCEPTING @@ -680,7 +680,7 @@ void processTCPrequest if(nRead > 0) { - nWritten = send(sockfd, buffer, nRead, MSG_NOSIGNAL); + nWritten = send(sockfd, buffer, nRead, 0); //Log(LOGDEBUG, "written: %d", nWritten); if(nWritten < 0) { Log(LOGERROR, "%s, sending failed, error: %d", __FUNCTION__, GetSockError()); @@ -1025,6 +1025,7 @@ int main(int argc, char **argv) }; signal(SIGINT, sigIntHandler); + signal(SIGPIPE, SIG_IGN); while((opt = getopt_long(argc, argv, "hvqVzr:s:t:p:a:f:u:n:c:l:y:m:d:D:A:B:g:w:x:", longopts, NULL)) != -1) { switch(opt) {

1 0

rpm spec file for rtmpdump
by Itamar Reis Peixoto 22 Nov '09

22 Nov '09

Can you include this spec file in rtmpdump ? it's compatible with fedora, centos and rhel , probably others too. -- ------------ Itamar Reis Peixoto e-mail/msn/google talk/sip: itamar(a)ispbrasil.com.br skype: itamarjp icq: 81053601 +55 11 4063 5033 +55 34 3221 8599

1 0

r55 - rtmp.cpp rtmpdump.cpp
by hyc 20 Nov '09

20 Nov '09

Author: hyc Date: Fri Nov 20 20:03:20 2009 New Revision: 55 Log: flvstreamer bug#107134 stop streaming for onFCUnsubscribe Modified: rtmp.cpp rtmpdump.cpp Modified: rtmp.cpp ============================================================================== --- rtmp.cpp Fri Nov 20 19:43:45 2009 (r54) +++ rtmp.cpp Fri Nov 20 20:03:20 2009 (r55) @@ -1151,6 +1151,11 @@ int CRTMP::HandleInvoke(const char *body { // SendOnFCSubscribe(); } + else if (CSCMP(method,"onFCUnsubscribe")) + { + Close(); + return 1; + } else if (CSCMP(method,"_onbwcheck")) { SendCheckBWResult(txn); Modified: rtmpdump.cpp ============================================================================== --- rtmpdump.cpp Fri Nov 20 19:43:45 2009 (r54) +++ rtmpdump.cpp Fri Nov 20 20:03:20 2009 (r55) @@ -158,6 +158,12 @@ int WriteStream( char *packetBody = packet.m_body; unsigned int nPacketLen = packet.m_nBodySize; + // Return -3 if this was completed nicely with invoke message Play.Stop or Play.Complete + if (rtnGetNextMediaPacket == 2) { + Log(LOGDEBUG, "Got Play.Complete or Play.Stop from server. Assuming stream is complete"); + return -3; + } + // skip video info/command packets if(packet.m_packetType == 0x09 && nPacketLen == 2 && @@ -432,11 +438,6 @@ stopKeyframeSearch: if(tsm) *tsm = bLiveStream ? packet.m_nTimeStamp : nTimeStamp; - // Return -3 if this was completed nicely with invoke message Play.Stop or Play.Complete - if (rtnGetNextMediaPacket == 2) { - Log(LOGDEBUG, "Got Play.Complete or Play.Stop from server. Assuming stream is complete"); - return -3; - } return size; }

1 0

r54 - rtmpdump.cpp
by hyc 20 Nov '09

20 Nov '09

Author: hyc Date: Fri Nov 20 19:43:45 2009 New Revision: 54 Log: flvstreamer bug#107134, don't retry live streams Modified: rtmpdump.cpp Modified: rtmpdump.cpp ============================================================================== --- rtmpdump.cpp Sun Nov 15 22:56:50 2009 (r53) +++ rtmpdump.cpp Fri Nov 20 19:43:45 2009 (r54) @@ -1366,7 +1366,7 @@ int main(int argc, char **argv) /* If we succeeded, we're done. */ - if (nStatus != RD_INCOMPLETE || !rtmp->IsTimedout()) + if (nStatus != RD_INCOMPLETE || !rtmp->IsTimedout() || bLiveStream) break; }

1 0

Issue with brightcove and auth param
by Monsieur Video 16 Nov '09

16 Nov '09

Hi, There seems to be an issue with Brightcove with rtmpdump 1.9, the following fixes it: --- rtmp.cpp (revision 52) +++ rtmp.cpp (working copy) @@ -766,8 +766,8 @@ // add auth string if(Link.auth) { -// *enc = 0x01; enc++; -// *enc = 0x01; enc++; + *enc = 0x01; enc++; + *enc = 0x01; enc++; enc += EncodeString(enc, Link.auth); } Any idea why that was commented out to start with? (seems to be right back in r12)

3 2

r53 - rtmp.cpp
by hyc 15 Nov '09

15 Nov '09

Author: hyc Date: Sun Nov 15 22:56:50 2009 New Revision: 53 Log: Fix auth encoding, partial revert of r12 Modified: rtmp.cpp Modified: rtmp.cpp ============================================================================== --- rtmp.cpp Sat Nov 14 01:44:04 2009 (r52) +++ rtmp.cpp Sun Nov 15 22:56:50 2009 (r53) @@ -766,8 +766,8 @@ bool CRTMP::SendConnectPacket() // add auth string if(Link.auth) { -// *enc = 0x01; enc++; -// *enc = 0x01; enc++; + *enc = 0x01; enc++; + *enc = 0x01; enc++; enc += EncodeString(enc, Link.auth); }

1 0

bug: RTMPDump v1.9 (as of 15/11/2009) connection timeout param ignored
by Tom Shaw 15 Nov '09

15 Nov '09

Hey, It seems that the connection timeout is ignored. In fact even 120secs the default is not honoured. It takes 3 minutes and 10secs for the connection to time out regardless of the setting I use in my command line. This is the error message when it finally does. Connecting ... ERROR: Connect, failed to connect socket. 110 (Connection timed out) DEBUG: Closing connection. Cheers, Tom

2 2

/etc/hosts ignored by rtmp dump
by Tom Shaw 15 Nov '09

15 Nov '09

It seems that rtmpdump v1.9 ignores my /etc/hosts file. When I use ping (for example) my hostnames are correctly resolved. Any ideas on why this should happen, and how to fix it? Cheers, Tom

1 0

r52 - ChangeLog
by hyc 14 Nov '09

14 Nov '09

Author: hyc Date: Sat Nov 14 01:44:04 2009 New Revision: 52 Log: Update date, release 1.9 Modified: ChangeLog Modified: ChangeLog ============================================================================== --- ChangeLog Thu Nov 12 16:01:26 2009 (r51) +++ ChangeLog Sat Nov 14 01:44:04 2009 (r52) @@ -3,12 +3,12 @@ Copyright 2008-2009 Andrej Stepanchuk; D Copyright 2009 Howard Chu Copyright 2009 The Flvstreamer Team -10 November 2009, v1.9 +13 November 2009, v1.9 - Handle more signals to reduce risk of unresumable/corrupted partially streamed files - Fixed >2GB file handling - Added --hashes option for a hash progress bar instead of byte counter - Fix to allow win32 to use binary mode on stdout. -- Added auto-unpause for buffer-limited streams (FMS 3.5?) +- Added auto-unpause for buffer-limited streams 1 November 2009, v1.7

1 0

r50 - rtmp.cpp rtmp.h rtmpdump.cpp
by hyc 12 Nov '09

12 Nov '09

Author: hyc Date: Thu Nov 12 15:58:52 2009 New Revision: 50 Log: Use pause/unpause for FMS 3.0 as well Modified: rtmp.cpp rtmp.h rtmpdump.cpp Modified: rtmp.cpp ============================================================================== --- rtmp.cpp Thu Nov 12 14:01:40 2009 (r49) +++ rtmp.cpp Thu Nov 12 15:58:52 2009 (r50) @@ -122,12 +122,6 @@ double CRTMP::GetDuration() { return m_f bool CRTMP::IsConnected() { return m_socket != 0; } bool CRTMP::IsTimedout() { return m_bTimedout; } -void CRTMP::GetPauseStamps(uint32_t *pause, uint32_t *resume) -{ - *pause = m_pauseStamp; - *resume = m_mediaStamp; -} - void CRTMP::SetBufferMS(int size) { m_nBufferMS = size; @@ -403,6 +397,20 @@ bool CRTMP::ReconnectStream(int bufferTi return ConnectStream(seekTime, dLength); } +bool CRTMP::ToggleStream() +{ + bool res; + + res = SendPause(true, m_pauseStamp); + if (!res) return res; + + m_bPausing = 1; + sleep(1); + res = SendPause(false, m_pauseStamp); + m_bPausing = 3; + return res; +} + void CRTMP::DeleteStream() { if (m_stream_id < 0) return; @@ -446,10 +454,8 @@ int CRTMP::GetNextMediaPacket(RTMPPacket if (bHasMediaPacket) m_bPlaying = true; - else if (m_bTimedout) { + else if (m_bTimedout) m_pauseStamp = m_channelTimestamp[m_mediaChannel]; - m_bPausing = 3; - } return bHasMediaPacket; } Modified: rtmp.h ============================================================================== --- rtmp.h Thu Nov 12 14:01:40 2009 (r49) +++ rtmp.h Thu Nov 12 15:58:52 2009 (r50) @@ -141,7 +141,7 @@ class CRTMP bool IsConnected(); bool IsTimedout(); double GetDuration(); - void GetPauseStamps(uint32_t *pause, uint32_t *resume); + bool ToggleStream(); bool ConnectStream(double seekTime=-10.0, uint32_t dLength=0); bool ReconnectStream(int bufferTime, double seekTime=-10.0, uint32_t dLength=0); Modified: rtmpdump.cpp ============================================================================== --- rtmpdump.cpp Thu Nov 12 14:01:40 2009 (r49) +++ rtmpdump.cpp Thu Nov 12 15:58:52 2009 (r50) @@ -1345,22 +1345,8 @@ int main(int argc, char **argv) nInitialFrameSize = 0; uint32_t lastOff; - Log(LOGINFO, "Connection timed out, trying to reconnect.\n\n"); - rtmp->GetPauseStamps(&lastOff, &dSeek); - - // Calculate the length of the stream to still play - if (dStopOffset > 0) { - dLength = dStopOffset - lastOff; - - // Quit if start seek is past required stop offset - if(dLength <= 0) { - LogPrintf("Already Completed\n"); - nStatus = RD_SUCCESS; - break; - } - } - - if (!rtmp->ReconnectStream(bufferTime, lastOff, dLength)) { + Log(LOGINFO, "Connection timed out, trying to resume.\n\n"); + if (!rtmp->ToggleStream()) { Log(LOGERROR, "Failed to resume the stream\n\n"); if (!rtmp->IsTimedout()) nStatus = RD_FAILED;

1 0

r49 - Makefile rtmpdump.cpp
by hyc 12 Nov '09

12 Nov '09

Author: hyc Date: Thu Nov 12 14:01:40 2009 New Revision: 49 Log: Remove _DEBUG define, delete exe's on make clean Modified: Makefile rtmpdump.cpp Modified: Makefile ============================================================================== --- Makefile Thu Nov 12 13:37:37 2009 (r48) +++ Makefile Thu Nov 12 14:01:40 2009 (r49) @@ -37,7 +37,7 @@ arm: @$(MAKE) CROSS_COMPILE=armv7a-angstrom-linux-gnueabi- INC=-I/OE/tmp/staging/armv7a-angstrom-linux-gnueabi/usr/include $(MAKEFLAGS) progs clean: - rm -f *.o + rm -f *.o rtmpdump$(EXT) streams$(EXT) streams: bytes.o log.o rtmp.o AMFObject.o rtmppacket.o streams.o parseurl.o dh.o handshake.o $(CXX) $(LDFLAGS) $^ -o $@$(EXT) $(SLIBS) Modified: rtmpdump.cpp ============================================================================== --- rtmpdump.cpp Thu Nov 12 13:37:37 2009 (r48) +++ rtmpdump.cpp Thu Nov 12 14:01:40 2009 (r49) @@ -40,8 +40,6 @@ #define SET_BINMODE(f) #endif -#define _DEBUG 1 - #include "rtmp.h" #include "log.h" #include "AMFObject.h"

1 0

r48 - rtmp.cpp rtmp.h rtmpdump.cpp
by hyc 12 Nov '09

12 Nov '09

Author: hyc Date: Thu Nov 12 13:37:37 2009 New Revision: 48 Log: Minor cleanup, experimental Reconnect approach. Seems to only be relevant for FMS 3.0; pause/resume works for FMS 3.5 Modified: rtmp.cpp rtmp.h rtmpdump.cpp Modified: rtmp.cpp ============================================================================== --- rtmp.cpp Thu Nov 12 12:45:40 2009 (r47) +++ rtmp.cpp Thu Nov 12 13:37:37 2009 (r48) @@ -122,6 +122,12 @@ double CRTMP::GetDuration() { return m_f bool CRTMP::IsConnected() { return m_socket != 0; } bool CRTMP::IsTimedout() { return m_bTimedout; } +void CRTMP::GetPauseStamps(uint32_t *pause, uint32_t *resume) +{ + *pause = m_pauseStamp; + *resume = m_mediaStamp; +} + void CRTMP::SetBufferMS(int size) { m_nBufferMS = size; @@ -440,6 +446,10 @@ int CRTMP::GetNextMediaPacket(RTMPPacket if (bHasMediaPacket) m_bPlaying = true; + else if (m_bTimedout) { + m_pauseStamp = m_channelTimestamp[m_mediaChannel]; + m_bPausing = 3; + } return bHasMediaPacket; } Modified: rtmp.h ============================================================================== --- rtmp.h Thu Nov 12 12:45:40 2009 (r47) +++ rtmp.h Thu Nov 12 13:37:37 2009 (r48) @@ -141,6 +141,7 @@ class CRTMP bool IsConnected(); bool IsTimedout(); double GetDuration(); + void GetPauseStamps(uint32_t *pause, uint32_t *resume); bool ConnectStream(double seekTime=-10.0, uint32_t dLength=0); bool ReconnectStream(int bufferTime, double seekTime=-10.0, uint32_t dLength=0); Modified: rtmpdump.cpp ============================================================================== --- rtmpdump.cpp Thu Nov 12 12:45:40 2009 (r47) +++ rtmpdump.cpp Thu Nov 12 13:37:37 2009 (r48) @@ -40,6 +40,7 @@ #define SET_BINMODE(f) #endif +#define _DEBUG 1 #include "rtmp.h" #include "log.h" @@ -750,7 +751,7 @@ int Download(CRTMP *rtmp, // Workaround to exit with 0 if the file is fully (> 99.9%) downloaded if( duration > 0 ) { if ((double)timestamp >= (double)duration*999.0 ) { - LogPrintf("Already Completed at: %.3f sec Duration=%.3f sec\n", (double)timestamp/1000.0, (double)timestamp/1000.0); + LogPrintf("Already Completed at: %.3f sec Duration=%.3f sec\n", (double)timestamp/1000.0, (double)duration/1000.0); return RD_SUCCESS; } else { *percent = ((double)timestamp) / (duration*1000.0)*100.0; @@ -788,7 +789,7 @@ int Download(CRTMP *rtmp, lastUpdate = now-1000; do { - nRead = WriteStream(rtmp, &buffer, bufferSize, &timestamp, bResume, bLiveStream, dSeek, metaHeader, nMetaHeaderSize, initialFrame, initialFrameType, nInitialFrameSize, &dataType); + nRead = WriteStream(rtmp, &buffer, bufferSize, &timestamp, bResume && nInitialFrameSize > 0, bLiveStream, dSeek, metaHeader, nMetaHeaderSize, initialFrame, initialFrameType, nInitialFrameSize, &dataType); //LogPrintf("nRead: %d\n", nRead); if(nRead > 0) { @@ -1254,7 +1255,6 @@ int main(int argc, char **argv) dSeek, 0, bLiveStream, timeout); off_t size = 0; - uint32_t timestamp = 0; // ok, we have to get the timestamp of the last keyframe (only keyframes are seekable) / last audio frame (audio only streams) if(bResume) { @@ -1316,11 +1316,6 @@ int main(int argc, char **argv) Log(LOGINFO, "Connected..."); - timestamp = dSeek; - if(dSeek != 0) { - Log(LOGDEBUG, "Continuing at TS: %d ms\n", timestamp); - } - // User defined seek offset if (dStartOffset > 0) { // Don't need the start offset if resuming an existing file @@ -1328,8 +1323,7 @@ int main(int argc, char **argv) Log(LOGWARNING, "Can't seek a resumed stream, ignoring --start option"); dStartOffset = 0; } else { - // ??? we want to add not equals ??? - dSeek += dStartOffset; + dSeek = dStartOffset; } } @@ -1351,21 +1345,14 @@ int main(int argc, char **argv) } } else { nInitialFrameSize = 0; + uint32_t lastOff; Log(LOGINFO, "Connection timed out, trying to reconnect.\n\n"); - - nStatus = GetLastKeyframe(file, nSkipKeyFrames, - &dSeek, &initialFrame, - &initialFrameType, - &nInitialFrameSize); - if (nStatus != RD_SUCCESS) { - Log(LOGDEBUG, "Failed to get last keyframe."); - break; - } + rtmp->GetPauseStamps(&lastOff, &dSeek); // Calculate the length of the stream to still play if (dStopOffset > 0) { - dLength = dStopOffset - dSeek; + dLength = dStopOffset - lastOff; // Quit if start seek is past required stop offset if(dLength <= 0) { @@ -1375,7 +1362,7 @@ int main(int argc, char **argv) } } - if (!rtmp->ReconnectStream(bufferTime, dSeek, dLength)) { + if (!rtmp->ReconnectStream(bufferTime, lastOff, dLength)) { Log(LOGERROR, "Failed to resume the stream\n\n"); if (!rtmp->IsTimedout()) nStatus = RD_FAILED; @@ -1394,10 +1381,9 @@ int main(int argc, char **argv) free(initialFrame); initialFrame = NULL; - /* If we succeeded, we're done. If writing to stdout - * we can't seek and retry. + /* If we succeeded, we're done. */ - if (nStatus != RD_INCOMPLETE || bStdoutMode || !rtmp->IsTimedout()) + if (nStatus != RD_INCOMPLETE || !rtmp->IsTimedout()) break; }

1 0

r47 - rtmp.cpp rtmp.h
by hyc 12 Nov '09

12 Nov '09

Author: hyc Date: Thu Nov 12 12:45:40 2009 New Revision: 47 Log: Fixed pause/resume synch Modified: rtmp.cpp rtmp.h Modified: rtmp.cpp ============================================================================== --- rtmp.cpp Wed Nov 11 11:24:55 2009 (r46) +++ rtmp.cpp Thu Nov 12 12:45:40 2009 (r47) @@ -426,10 +426,12 @@ int CRTMP::GetNextMediaPacket(RTMPPacket if (!bHasMediaPacket) { packet.FreePacket(); - } - if (m_bPausing == 3) { - if (packet.m_nTimeStamp <= m_pauseStamp) { - bHasMediaPacket = false; + } else if (m_bPausing == 3) { + if (packet.m_nTimeStamp <= m_mediaStamp) { + bHasMediaPacket = 0; +#ifdef _DEBUG + Log(LOGDEBUG, "Skipped type: %02X, size: %d, TS: %d ms, abs TS: %d, pause: %d ms", packet.m_packetType, packet.m_nBodySize, packet.m_nTimeStamp, packet.m_hasAbsTimestamp, m_mediaStamp); +#endif continue; } m_bPausing = 0; @@ -438,11 +440,6 @@ int CRTMP::GetNextMediaPacket(RTMPPacket if (bHasMediaPacket) m_bPlaying = true; -/* - else if (m_bTimedout) { - m_pauseStamp = m_channelTimestamp[m_mediaChannel]; - m_bPausing = 3; - } */ return bHasMediaPacket; } @@ -483,6 +480,8 @@ int CRTMP::HandlePacket(RTMPPacket &pack bHasMediaPacket = 1; if (!m_mediaChannel) m_mediaChannel = packet.m_nChannel; + if (!m_bPausing) + m_mediaStamp = packet.m_nTimeStamp; break; case 0x09: @@ -492,6 +491,8 @@ int CRTMP::HandlePacket(RTMPPacket &pack bHasMediaPacket = 1; if (!m_mediaChannel) m_mediaChannel = packet.m_nChannel; + if (!m_bPausing) + m_mediaStamp = packet.m_nTimeStamp; break; case 0x0F: // flex stream send @@ -545,6 +546,7 @@ int CRTMP::HandlePacket(RTMPPacket &pack { // go through FLV packets and handle metadata packets unsigned int pos=0; + uint32_t nTimeStamp = packet.m_nTimeStamp; while(pos+11 < packet.m_nBodySize) { uint32_t dataSize = CRTMP::ReadInt24(packet.m_body+pos+1); // size without header (11) and prevTagSize (4) @@ -555,10 +557,15 @@ int CRTMP::HandlePacket(RTMPPacket &pack } if(packet.m_body[pos] == 0x12) { HandleMetadata(packet.m_body+pos+11, dataSize); + } else if (packet.m_body[pos] == 8 || packet.m_body[pos] == 9) { + nTimeStamp = CRTMP::ReadInt24(packet.m_body+pos+4); + nTimeStamp |= (packet.m_body[pos+7]<<24); } pos += (11+dataSize+4); } - + if (!m_bPausing) + m_mediaStamp = nTimeStamp; + // FLV tag(s) //Log(LOGDEBUG, "%s, received: FLV tag(s) %lu bytes", __FUNCTION__, packet.m_nBodySize); bHasMediaPacket = 1; Modified: rtmp.h ============================================================================== --- rtmp.h Wed Nov 11 11:24:55 2009 (r46) +++ rtmp.h Thu Nov 12 12:45:40 2009 (r47) @@ -213,16 +213,17 @@ class CRTMP int m_nBWCheckCounter; int m_nBytesIn; int m_nBytesInSent; - bool m_bPlaying; int m_nBufferMS; int m_stream_id; // returned in _result from invoking createStream int m_mediaChannel; + uint32_t m_mediaStamp; uint32_t m_pauseStamp; - bool m_bTimedout; int m_bPausing; + int m_nServerBW; int m_nClientBW; uint8_t m_nClientBW2; - int m_nServerBW; + bool m_bPlaying; + bool m_bTimedout; //std::string m_strPlayer; //std::string m_strPageUrl;

1 0

r46 - rtmp.h
by hyc 11 Nov '09

11 Nov '09

Author: hyc Date: Wed Nov 11 11:24:55 2009 New Revision: 46 Log: Fix _checkbw processing Modified: rtmp.h Modified: rtmp.h ============================================================================== --- rtmp.h Wed Nov 11 11:23:49 2009 (r45) +++ rtmp.h Wed Nov 11 11:24:55 2009 (r46) @@ -175,7 +175,7 @@ class CRTMP bool SendConnectPacket(); bool SendServerBW(); bool SendCheckBW(); - bool SendCheckBWResult(int txn); + bool SendCheckBWResult(double txn); bool SendCtrl(short nType, unsigned int nObject, unsigned int nTime = 0); bool SendBGHasStream(double dId, char *playpath); bool SendCreateStream(double dStreamId);

1 0

r45 - rtmp.cpp
by hyc 11 Nov '09

11 Nov '09

Author: hyc Date: Wed Nov 11 11:23:49 2009 New Revision: 45 Log: Fix _checkbw processing Modified: rtmp.cpp Modified: rtmp.cpp ============================================================================== --- rtmp.cpp Tue Nov 10 22:14:25 2009 (r44) +++ rtmp.cpp Wed Nov 11 11:23:49 2009 (r45) @@ -364,6 +364,7 @@ bool CRTMP::ConnectStream(double seekTim if (dLength >= 0) Link.length = dLength; + m_mediaChannel = 0; RTMPPacket packet; while (!m_bPlaying && IsConnected() && ReadPacket(packet)) { if (!packet.IsReady()) @@ -437,6 +438,11 @@ int CRTMP::GetNextMediaPacket(RTMPPacket if (bHasMediaPacket) m_bPlaying = true; +/* + else if (m_bTimedout) { + m_pauseStamp = m_channelTimestamp[m_mediaChannel]; + m_bPausing = 3; + } */ return bHasMediaPacket; } @@ -798,7 +804,7 @@ bool CRTMP::SendFCSubscribe(const char * Log(LOGDEBUG, "FCSubscribe: %s", subscribepath); char *enc = packet.m_body; enc += EncodeString(enc, "FCSubscribe"); - enc += EncodeNumber(enc, 4); + enc += EncodeNumber(enc, 4.0); *enc = 0x05; // NULL enc++; enc += EncodeString(enc, subscribepath); @@ -912,16 +918,17 @@ bool CRTMP::SendCheckBW() packet.AllocPacket(256); // should be enough char *enc = packet.m_body; enc += EncodeString(enc, "_checkbw"); - enc += EncodeNumber(enc, 5); + enc += EncodeNumber(enc, 0); *enc = 0x05; // NULL enc++; packet.m_nBodySize = enc - packet.m_body; + // triggers _onbwcheck and eventually results in _onbwdone return SendRTMP(packet); } -bool CRTMP::SendCheckBWResult(int txn) +bool CRTMP::SendCheckBWResult(double txn) { RTMPPacket packet; bool res; @@ -1063,7 +1070,7 @@ int CRTMP::HandleInvoke(const char *body obj.Dump(); std::string method = obj.GetProperty(0).GetString(); - int txn = obj.GetProperty(1).GetNumber(); + double txn = obj.GetProperty(1).GetNumber(); Log(LOGDEBUG, "%s, server invoking <%s>", __FUNCTION__, method.c_str()); #define CSCMP(a,b) (a.size() == (sizeof(b)-1)) && !strcmp(a.c_str(),b) @@ -1125,6 +1132,15 @@ int CRTMP::HandleInvoke(const char *body { SendCheckBWResult(txn); } + else if (CSCMP(method,"_onbwdone")) + { + std::vector<std::string>::iterator i; //remote method calls queue + for (i=m_methodCalls.begin(); i<m_methodCalls.end(); i++) + if (i[0] == "_checkbw") { + m_methodCalls.erase(i); + break; + } + } else if (CSCMP(method,"_error")) { Log(LOGERROR, "rtmp server sent error");

1 0

r44 - ChangeLog README
by hyc 10 Nov '09

10 Nov '09

Author: hyc Date: Tue Nov 10 22:14:25 2009 New Revision: 44 Log: Remove obsolete get_iplayer reference, mention auto-unpause feature Modified: ChangeLog README Modified: ChangeLog ============================================================================== --- ChangeLog Tue Nov 10 12:56:19 2009 (r43) +++ ChangeLog Tue Nov 10 22:14:25 2009 (r44) @@ -3,13 +3,12 @@ Copyright 2008-2009 Andrej Stepanchuk; D Copyright 2009 Howard Chu Copyright 2009 The Flvstreamer Team -5 November 2009, v1.9 +10 November 2009, v1.9 - Handle more signals to reduce risk of unresumable/corrupted partially streamed files - Fixed >2GB file handling - Added --hashes option for a hash progress bar instead of byte counter - Fix to allow win32 to use binary mode on stdout. -- New MakefileOSX which will create universal binaries for Mac (intel and PPC) -- Added Win32 and cygwin Makefiles +- Added auto-unpause for buffer-limited streams (FMS 3.5?) 1 November 2009, v1.7 Modified: README ============================================================================== --- README Tue Nov 10 12:56:19 2009 (r43) +++ README Tue Nov 10 22:14:25 2009 (r44) @@ -20,12 +20,6 @@ but you may need to override the CROSS_C Please read the Makefile to see what other make variables are used. -To download an rtmp stream use - - $ ./get_iplayer --raw --force --get 1 --vmode flashhigh --rtmp --rtmpdump "./rtmpdump" - -rtmpdump still supports hulu if you can invoke it with a correct rtmp url. - SWF Verification ----------------

1 0

r43 - rtmpdump.cpp
by hyc 10 Nov '09

10 Nov '09

Author: hyc Date: Tue Nov 10 12:56:19 2009 New Revision: 43 Log: More cleanup Modified: rtmpdump.cpp Modified: rtmpdump.cpp ============================================================================== --- rtmpdump.cpp Tue Nov 10 12:19:47 2009 (r42) +++ rtmpdump.cpp Tue Nov 10 12:56:19 2009 (r43) @@ -1423,6 +1423,7 @@ clean: if(netstackdump_read != 0) fclose(netstackdump_read); #endif + delete rtmp; return nStatus; }

1 0

r42 - rtmp.cpp rtmpdump.cpp
by hyc 10 Nov '09

10 Nov '09

Author: hyc Date: Tue Nov 10 12:19:47 2009 New Revision: 42 Log: More memory cleanup Modified: rtmp.cpp rtmpdump.cpp Modified: rtmp.cpp ============================================================================== --- rtmp.cpp Tue Nov 10 12:00:55 2009 (r41) +++ rtmp.cpp Tue Nov 10 12:19:47 2009 (r42) @@ -1472,10 +1472,14 @@ bool CRTMP::ReadPacket(RTMPPacket &packe if (nSize == 11) packet.m_nInfoField2 = ReadInt32LE(header+7); - if (packet.m_nBodySize > 0 && packet.m_body == NULL && !packet.AllocPacket(packet.m_nBodySize)) + bool didAlloc = false; + if (packet.m_nBodySize > 0 && packet.m_body == NULL) { - Log(LOGDEBUG, "%s, failed to allocate packet", __FUNCTION__); - return false; + if (!packet.AllocPacket(packet.m_nBodySize)) { + Log(LOGDEBUG, "%s, failed to allocate packet", __FUNCTION__); + return false; + } + didAlloc = true; } int nToRead = packet.m_nBodySize - packet.m_nBytesRead; @@ -1486,8 +1490,10 @@ bool CRTMP::ReadPacket(RTMPPacket &packe if (ReadN(packet.m_body + packet.m_nBytesRead, nChunk) != nChunk) { Log(LOGERROR, "%s, failed to read RTMP packet body. len: %lu", __FUNCTION__, packet.m_nBodySize); - packet.m_body = NULL; // we dont want it deleted since its pointed to from the stored packets (m_vecChannelsIn) - packet.m_buffer = NULL; + if (!didAlloc) { + packet.m_body = NULL; // we dont want it deleted since its pointed to from the stored packets (m_vecChannelsIn) + packet.m_buffer = NULL; + } return false; } Modified: rtmpdump.cpp ============================================================================== --- rtmpdump.cpp Tue Nov 10 12:00:55 2009 (r41) +++ rtmpdump.cpp Tue Nov 10 12:19:47 2009 (r42) @@ -1237,12 +1237,8 @@ int main(int argc, char **argv) strcpy(tcUrl, str); } - int bufferSize = 1024*1024; - char *buffer = (char *)malloc(bufferSize); int first = 1; - memset(buffer, 0, bufferSize); - // User defined seek offset if (dStartOffset > 0) { // Live stream

1 0

r41 - rtmp.cpp
by hyc 10 Nov '09

10 Nov '09

Author: hyc Date: Tue Nov 10 12:00:55 2009 New Revision: 41 Log: Fix double-free, uninit'd vars Modified: rtmp.cpp Modified: rtmp.cpp ============================================================================== --- rtmp.cpp Tue Nov 10 11:11:55 2009 (r40) +++ rtmp.cpp Tue Nov 10 12:00:55 2009 (r41) @@ -94,6 +94,11 @@ char RTMPProtocolStringsLower[][7] = CRTMP::CRTMP() : m_socket(0) { + for (int i=0; i<65600; i++) + { + m_vecChannelsIn[i] = NULL; + m_vecChannelsOut[i] = NULL; + } Close(); m_pBuffer = new char[RTMP_BUFFER_CACHE_SIZE]; m_nBufferMS = 300; @@ -104,6 +109,7 @@ CRTMP::CRTMP() : m_socket(0) m_fVideoCodecs = 252.0; m_bTimedout = false; m_bPausing = 0; + m_mediaChannel = 0; } CRTMP::~CRTMP() @@ -1481,6 +1487,7 @@ bool CRTMP::ReadPacket(RTMPPacket &packe { Log(LOGERROR, "%s, failed to read RTMP packet body. len: %lu", __FUNCTION__, packet.m_nBodySize); packet.m_body = NULL; // we dont want it deleted since its pointed to from the stored packets (m_vecChannelsIn) + packet.m_buffer = NULL; return false; }

1 0

r40 - rtmpdump.cpp
by hyc 10 Nov '09

10 Nov '09

Author: hyc Date: Tue Nov 10 11:11:55 2009 New Revision: 40 Log: Add '#' option Modified: rtmpdump.cpp Modified: rtmpdump.cpp ============================================================================== --- rtmpdump.cpp Tue Nov 10 11:10:41 2009 (r39) +++ rtmpdump.cpp Tue Nov 10 11:11:55 2009 (r40) @@ -983,7 +983,7 @@ int main(int argc, char **argv) {0,0,0,0} }; - while((opt = getopt_long(argc, argv, "hVveqzr:s:t:p:a:b:f:o:u:n:c:l:y:m:k:d:A:B:w:x:S:", longopts, NULL)) != -1) { + while((opt = getopt_long(argc, argv, "hVveqzr:s:t:p:a:b:f:o:u:n:c:l:y:m:k:d:A:B:w:x:S:#", longopts, NULL)) != -1) { switch(opt) { case 'h': LogPrintf("\nThis program dumps the media content streamed over rtmp.\n\n");

1 0

r39 - rtmp.cpp rtmp.h
by hyc 10 Nov '09

10 Nov '09

Author: hyc Date: Tue Nov 10 11:10:41 2009 New Revision: 39 Log: Discard old frames when doing pause/resume Modified: rtmp.cpp rtmp.h Modified: rtmp.cpp ============================================================================== --- rtmp.cpp Tue Nov 10 03:37:24 2009 (r38) +++ rtmp.cpp Tue Nov 10 11:10:41 2009 (r39) @@ -420,6 +420,13 @@ int CRTMP::GetNextMediaPacket(RTMPPacket if (!bHasMediaPacket) { packet.FreePacket(); } + if (m_bPausing == 3) { + if (packet.m_nTimeStamp <= m_pauseStamp) { + bHasMediaPacket = false; + continue; + } + m_bPausing = 0; + } } if (bHasMediaPacket) @@ -1309,7 +1316,6 @@ void CRTMP::HandleCtrl(const RTMPPacket case 0: tmp = ReadInt32(packet.m_body + 2); Log(LOGDEBUG, "%s, Stream Begin %d", __FUNCTION__, tmp); - m_bPausing = 0; break; case 1: @@ -1339,10 +1345,11 @@ void CRTMP::HandleCtrl(const RTMPPacket tmp = ReadInt32(packet.m_body + 2); Log(LOGDEBUG, "%s, Stream BufferEmpty %d", __FUNCTION__, tmp); if (!m_bPausing) { - SendPause(true, m_channelTimestamp[m_mediaChannel]); + m_pauseStamp = m_channelTimestamp[m_mediaChannel]; + SendPause(true, m_pauseStamp); m_bPausing = 1; } else if (m_bPausing == 2) { - SendPause(false, m_channelTimestamp[m_mediaChannel]); + SendPause(false, m_pauseStamp); m_bPausing = 3; } break; Modified: rtmp.h ============================================================================== --- rtmp.h Tue Nov 10 03:37:24 2009 (r38) +++ rtmp.h Tue Nov 10 11:10:41 2009 (r39) @@ -217,6 +217,7 @@ class CRTMP int m_nBufferMS; int m_stream_id; // returned in _result from invoking createStream int m_mediaChannel; + uint32_t m_pauseStamp; bool m_bTimedout; int m_bPausing; int m_nClientBW;

1 0

r38 - rtmp.cpp rtmp.h
by hyc 10 Nov '09

10 Nov '09

Author: hyc Date: Tue Nov 10 03:37:24 2009 New Revision: 38 Log: Experimental retry: use pause/unpause when buffer is empty Modified: rtmp.cpp rtmp.h Modified: rtmp.cpp ============================================================================== --- rtmp.cpp Tue Nov 10 03:36:55 2009 (r37) +++ rtmp.cpp Tue Nov 10 03:37:24 2009 (r38) @@ -103,6 +103,7 @@ CRTMP::CRTMP() : m_socket(0) m_fAudioCodecs = 3191.0; m_fVideoCodecs = 252.0; m_bTimedout = false; + m_bPausing = 0; } CRTMP::~CRTMP() @@ -250,6 +251,7 @@ bool CRTMP::Connect() { Close(); m_bTimedout = false; + m_bPausing = 0; m_fDuration = 0.0; sockaddr_in service; @@ -460,6 +462,8 @@ int CRTMP::HandlePacket(RTMPPacket &pack //Log(LOGDEBUG, "%s, received: audio %lu bytes", __FUNCTION__, packet.m_nBodySize); HandleAudio(packet); bHasMediaPacket = 1; + if (!m_mediaChannel) + m_mediaChannel = packet.m_nChannel; break; case 0x09: @@ -467,6 +471,8 @@ int CRTMP::HandlePacket(RTMPPacket &pack //Log(LOGDEBUG, "%s, received: video %lu bytes", __FUNCTION__, packet.m_nBodySize); HandleVideo(packet); bHasMediaPacket = 1; + if (!m_mediaChannel) + m_mediaChannel = packet.m_nChannel; break; case 0x0F: // flex stream send @@ -823,7 +829,7 @@ bool CRTMP::SendPause(bool DoPause, doub *enc = 0x05; // NULL enc++; enc += EncodeBoolean(enc, DoPause); - enc += EncodeNumber(enc, (double)dTime/1000); + enc += EncodeNumber(enc, (double)dTime); packet.m_nBodySize = enc - packet.m_body; @@ -1303,11 +1309,14 @@ void CRTMP::HandleCtrl(const RTMPPacket case 0: tmp = ReadInt32(packet.m_body + 2); Log(LOGDEBUG, "%s, Stream Begin %d", __FUNCTION__, tmp); + m_bPausing = 0; break; case 1: tmp = ReadInt32(packet.m_body + 2); Log(LOGDEBUG, "%s, Stream EOF %d", __FUNCTION__, tmp); + if (m_bPausing == 1) + m_bPausing = 2; break; case 2: @@ -1329,6 +1338,13 @@ void CRTMP::HandleCtrl(const RTMPPacket case 31: tmp = ReadInt32(packet.m_body + 2); Log(LOGDEBUG, "%s, Stream BufferEmpty %d", __FUNCTION__, tmp); + if (!m_bPausing) { + SendPause(true, m_channelTimestamp[m_mediaChannel]); + m_bPausing = 1; + } else if (m_bPausing == 2) { + SendPause(false, m_channelTimestamp[m_mediaChannel]); + m_bPausing = 3; + } break; case 32: Modified: rtmp.h ============================================================================== --- rtmp.h Tue Nov 10 03:36:55 2009 (r37) +++ rtmp.h Tue Nov 10 03:37:24 2009 (r38) @@ -216,7 +216,9 @@ class CRTMP bool m_bPlaying; int m_nBufferMS; int m_stream_id; // returned in _result from invoking createStream + int m_mediaChannel; bool m_bTimedout; + int m_bPausing; int m_nClientBW; uint8_t m_nClientBW2; int m_nServerBW;

2 1

r37 - Makefile rtmpdump.cpp
by hyc 10 Nov '09

10 Nov '09

Author: hyc Date: Tue Nov 10 03:36:55 2009 New Revision: 37 Log: Cleanup Modified: Makefile rtmpdump.cpp Modified: Makefile ============================================================================== --- Makefile Tue Nov 10 02:21:15 2009 (r36) +++ Makefile Tue Nov 10 03:36:55 2009 (r37) @@ -52,7 +52,7 @@ AMFObject.o: AMFObject.cpp AMFObject.h l rtmppacket.o: rtmppacket.cpp rtmppacket.h log.h Makefile rtmpdump.o: rtmpdump.cpp rtmp.h log.h AMFObject.h Makefile parseurl.o: parseurl.c parseurl.h log.h Makefile -streams.o: streams.cpp log.h Makefile +streams.o: streams.cpp rtmp.h log.h Makefile dh.o: dh.c dh.h log.h Makefile -handshake.o: handshake.cpp log.h Makefile +handshake.o: handshake.cpp rtmp.h log.h Makefile Modified: rtmpdump.cpp ============================================================================== --- rtmpdump.cpp Tue Nov 10 02:21:15 2009 (r36) +++ rtmpdump.cpp Tue Nov 10 03:36:55 2009 (r37) @@ -983,7 +983,7 @@ int main(int argc, char **argv) {0,0,0,0} }; - while((opt = getopt_long(argc, argv, "hVveqzr:s:t:p:a:f:o:u:n:c:l:y:m:k:d:A:B:w:x:S:", longopts, NULL)) != -1) { + while((opt = getopt_long(argc, argv, "hVveqzr:s:t:p:a:b:f:o:u:n:c:l:y:m:k:d:A:B:w:x:S:", longopts, NULL)) != -1) { switch(opt) { case 'h': LogPrintf("\nThis program dumps the media content streamed over rtmp.\n\n");

1 0

r36 - rtmp.cpp rtmp.h
by hyc 10 Nov '09

10 Nov '09

Author: hyc Date: Tue Nov 10 02:21:15 2009 New Revision: 36 Log: Revert -r33, try to match transaction IDs Modified: rtmp.cpp rtmp.h Modified: rtmp.cpp ============================================================================== --- rtmp.cpp Mon Nov 9 23:52:57 2009 (r35) +++ rtmp.cpp Tue Nov 10 02:21:15 2009 (r36) @@ -779,7 +779,7 @@ bool CRTMP::SendFCSubscribe(const char * Log(LOGDEBUG, "FCSubscribe: %s", subscribepath); char *enc = packet.m_body; enc += EncodeString(enc, "FCSubscribe"); - enc += EncodeNumber(enc, 0); + enc += EncodeNumber(enc, 4); *enc = 0x05; // NULL enc++; enc += EncodeString(enc, subscribepath); @@ -884,7 +884,6 @@ bool CRTMP::SendBytesReceived() bool CRTMP::SendCheckBW() { RTMPPacket packet; - bool res; packet.m_nChannel = 0x03; // control channel (invoke) packet.m_headerType = RTMP_PACKET_SIZE_LARGE; @@ -894,19 +893,16 @@ bool CRTMP::SendCheckBW() packet.AllocPacket(256); // should be enough char *enc = packet.m_body; enc += EncodeString(enc, "_checkbw"); - enc += EncodeNumber(enc, 0x00); + enc += EncodeNumber(enc, 5); *enc = 0x05; // NULL enc++; packet.m_nBodySize = enc - packet.m_body; - res = SendRTMP(packet); - /* The result of this message is _onbwcheck, not _result */ - m_methodCalls.erase(m_methodCalls.end()); - return res; + return SendRTMP(packet); } -bool CRTMP::SendCheckBWResult() +bool CRTMP::SendCheckBWResult(int txn) { RTMPPacket packet; bool res; @@ -919,7 +915,7 @@ bool CRTMP::SendCheckBWResult() packet.AllocPacket(256); // should be enough char *enc = packet.m_body; enc += EncodeString(enc, "_result"); - enc += EncodeNumber(enc, (double)GetTime()); // temp + enc += EncodeNumber(enc, txn); *enc = 0x05; // NULL enc++; enc += EncodeNumber(enc, (double)m_nBWCheckCounter++); @@ -1048,6 +1044,7 @@ int CRTMP::HandleInvoke(const char *body obj.Dump(); std::string method = obj.GetProperty(0).GetString(); + int txn = obj.GetProperty(1).GetNumber(); Log(LOGDEBUG, "%s, server invoking <%s>", __FUNCTION__, method.c_str()); #define CSCMP(a,b) (a.size() == (sizeof(b)-1)) && !strcmp(a.c_str(),b) @@ -1107,7 +1104,7 @@ int CRTMP::HandleInvoke(const char *body } else if (CSCMP(method,"_onbwcheck")) { - SendCheckBWResult(); + SendCheckBWResult(txn); } else if (CSCMP(method,"_error")) { Modified: rtmp.h ============================================================================== --- rtmp.h Mon Nov 9 23:52:57 2009 (r35) +++ rtmp.h Tue Nov 10 02:21:15 2009 (r36) @@ -175,7 +175,7 @@ class CRTMP bool SendConnectPacket(); bool SendServerBW(); bool SendCheckBW(); - bool SendCheckBWResult(); + bool SendCheckBWResult(int txn); bool SendCtrl(short nType, unsigned int nObject, unsigned int nTime = 0); bool SendBGHasStream(double dId, char *playpath); bool SendCreateStream(double dStreamId);

1 0

rtmpdump broken with bbc since r33
by murble-rtmpdump＠yuri.org.uk 10 Nov '09

10 Nov '09

Hi, I have found that with the current version I am unable to use get_iplayer. Built with: gcc -v Using built-in specs. Target: i486-linux-gnu Configured with: ../src/configure -v --with-pkgversion='Ubuntu 4.4.1-4ubuntu8' --with-bugurl=file:///usr/share/doc/gcc-4.4/README.Bugs --enable-languages=c,c++,fortran,objc,obj-c++ --prefix=/usr --enable-shared --enable-multiarch --enable-linker-build-id --with-system-zlib --libexecdir=/usr/lib --without-included-gettext --enable-threads=posix --with-gxx-include-dir=/usr/include/c++/4.4 --program-suffix=-4.4 --enable-nls --enable-clocale=gnu --enable-libstdcxx-debug --enable-objc-gc --enable-targets=all --disable-werror --with-arch-32=i486 --with-tune=generic --enable-checking=release --build=i486-linux-gnu --host=i486-linux-gnu --target=i486-linux-gnu Thread model: posix gcc version 4.4.1 (Ubuntu 4.4.1-4ubuntu8) The most recent working version of rtmpdump is r32 # works ../rtmpdump-r32/rtmpdump --port 1935 --protocol 0 --playpath "mp4:iplayerstream/secure_auth/b000nx0x4H264135169549?s=1257769214&e=1257855614&h=dd90581db5e7dd114d17e2002cf44d9a" --host bbcmedia.fcod.llnwd.net --swfUrl http://www.bbc.co.uk/emp/10player.swf?revision=14200_14320 --tcUrl rtmp://bbcmedia.fcod.llnwd.net:1935/a1414/e3 --app a1414/e3 --resume -o /home/murble/svn/rtmpdump/The_Secret_Life_of_the_Berlin_Wall_-_The_Secret_Life_of_the_Berlin_Wall_b00nx0y6_default.partial.mp4.flv --timeout 10 --verbose # fails ../rtmpdump-r32/rtmpdump --port 1935 --protocol 0 --playpath mp4:iplayerstream/secure_auth/b000nx0x4H264135169549?s=1257769214&e=1257855614&h=dd90581db5e7dd114d17e2002cf44d9a --host bbcmedia.fcod.llnwd.net --swfUrl http://www.bbc.co.uk/emp/10player.swf?revision=14200_14320 --tcUrl rtmp://bbcmedia.fcod.llnwd.net:1935/a1414/e3 --app a1414/e3 --resume -o /home/murble/svn/rtmpdump/The_Secret_Life_of_the_Berlin_Wall_-_The_Secret_Life_of_the_Berlin_Wall_b00nx0y6_default.partial.mp4.flv --timeout 10 --verbose and sometimes segfaults: Core was generated by `./rtmpdump --port 1935 --protocol 0 --playpath mp4:iplayerstream/secure_auth/b0'. Program terminated with signal 11, Segmentation fault. #0 __exchange_and_add_single (this=0xb75a303c, __position=...) at /usr/include/c++/4.4/ext/atomicity.h:64 64 _Atomic_word __result = *__mem; (gdb) bt #0 __exchange_and_add_single (this=0xb75a303c, __position=...) at /usr/include/c++/4.4/ext/atomicity.h:64 #1 __exchange_and_add_dispatch (this=0xb75a303c, __position=...) at /usr/include/c++/4.4/ext/atomicity.h:81 #2 std::string::_Rep::_M_dispose (this=0xb75a303c, __position=...) at /usr/include/c++/4.4/bits/basic_string.h:229 #3 ~basic_string (this=0xb75a303c, __position=...) at /usr/include/c++/4.4/bits/basic_string.h:498 #4 __gnu_cxx::new_allocator<std::string>::destroy (this=0xb75a303c, __position=...) at /usr/include/c++/4.4/ext/new_allocator.h:115 #5 std::vector<std::string, std::allocator<std::string> >::erase ( this=0xb75a303c, __position=...) at /usr/include/c++/4.4/bits/vector.tcc:139 #6 0x0804e0fb in RTMP_LIB::CRTMP::HandleInvoke (this=0xb75a3008, body=0x88eaa06 "\002", nBodySize=20) at rtmp.cpp:1058 #7 0x0804f6c2 in RTMP_LIB::CRTMP::HandlePacket (this=0xb75a3008, packet=...) at rtmp.cpp:515 #8 0x0804f894 in RTMP_LIB::CRTMP::GetNextMediaPacket (this=0xb75a3008, packet=...) at rtmp.cpp:416 #9 0x08055451 in WriteStream (rtmp=0xb75a3008, buf=0xbfcd4964, len=1048576, tsm=0xbfcd4968, bResume=false, bLiveStream=false, nResumeTS=0, metaHeader=0x0, nMetaHeaderSize=0, initialFrame=0x0, initialFrameType=0 '\000', nInitialFrameSize=0, dataType=0xbfcd496f "\005") at rtmpdump.cpp:156 #10 0x08055e85 in Download (rtmp=0xb75a3008, file=0x88e9010, dSeek=0, dLength=0, duration=0, bResume=false, metaHeader=0x0, nMetaHeaderSize=0, initialFrame=0x0, initialFrameType=<value optimised out>, nInitialFrameSize=0, nSkipKeyFrames=0, bStdoutMode=false, bLiveStream=false, bHashes=false, bOverrideBufferTime=false, bufferTime=36000000, percent=0xbfcd4c40) at rtmpdump.cpp:791 #11 0x08057093 in main (argc=21, argv=0xbfcd4f54) at rtmpdump.cpp:1397 and always fails. Apparently the r35 version works with other people so maybe it is just something weird with my setup here. std-error from the above available at http://www.yuri.org.uk/~murble/rtmpdump/ regards murble

1 0

r35 - rtmp.cpp rtmp.h rtmppacket.cpp rtmppacket.h
by hyc 09 Nov '09

09 Nov '09

Author: hyc Date: Mon Nov 9 23:52:57 2009 New Revision: 35 Log: Minor cleanup, s/Ping/Ctrl, only Ctrl type 6 is an actual Ping. Send RTMP header and data in single write call. Modified: rtmp.cpp rtmp.h rtmppacket.cpp rtmppacket.h Modified: rtmp.cpp ============================================================================== --- rtmp.cpp Mon Nov 9 03:07:12 2009 (r34) +++ rtmp.cpp Mon Nov 9 23:52:57 2009 (r35) @@ -122,7 +122,7 @@ void CRTMP::SetBufferMS(int size) void CRTMP::UpdateBufferMS() { - SendPing(3, m_stream_id, m_nBufferMS); + SendCtrl(3, m_stream_id, m_nBufferMS); } void CRTMP::SetupStream( @@ -441,8 +441,8 @@ int CRTMP::HandlePacket(RTMPPacket &pack break; case 0x04: - // ping - HandlePing(packet); + // ctrl + HandleCtrl(packet); break; case 0x05: @@ -992,14 +992,14 @@ The type of Ping packet is 0x4 and conta * type 26: SWFVerification request * type 27: SWFVerification response */ -bool CRTMP::SendPing(short nType, unsigned int nObject, unsigned int nTime) +bool CRTMP::SendCtrl(short nType, unsigned int nObject, unsigned int nTime) { - Log(LOGDEBUG, "sending ping. type: 0x%04x", (unsigned short)nType); + Log(LOGDEBUG, "sending ctrl. type: 0x%04x", (unsigned short)nType); RTMPPacket packet; packet.m_nChannel = 0x02; // control channel (ping) packet.m_headerType = RTMP_PACKET_SIZE_MEDIUM; - packet.m_packetType = 0x04; // ping + packet.m_packetType = 0x04; // ctrl packet.m_nInfoField1 = GetTime(); int nSize = (nType==0x03?10:6); // type 3 is the buffer time and requires all 3 parameters. all in all 10 bytes. @@ -1062,7 +1062,7 @@ int CRTMP::HandleInvoke(const char *body if (CSCMP(methodInvoked,"connect")) { SendServerBW(); - SendPing(3, 0, 300); + SendCtrl(3, 0, 300); SendCreateStream(2.0); @@ -1083,7 +1083,7 @@ int CRTMP::HandleInvoke(const char *body SendSeek(Link.seekTime); }*/ - SendPing(3, m_stream_id, m_nBufferMS); + SendCtrl(3, m_stream_id, m_nBufferMS); } else if (CSCMP(methodInvoked,"play")) { @@ -1292,13 +1292,13 @@ void CRTMP::HandleVideo(const RTMPPacket { } -void CRTMP::HandlePing(const RTMPPacket &packet) +void CRTMP::HandleCtrl(const RTMPPacket &packet) { short nType = -1; unsigned int tmp; if (packet.m_body && packet.m_nBodySize >= 2) nType = ReadInt16(packet.m_body); - Log(LOGDEBUG, "%s, received ping. type: %d, len: %d", __FUNCTION__, nType, packet.m_nBodySize); + Log(LOGDEBUG, "%s, received ctrl. type: %d, len: %d", __FUNCTION__, nType, packet.m_nBodySize); //LogHex(packet.m_body, packet.m_nBodySize); if (packet.m_nBodySize >= 6) { @@ -1323,14 +1323,25 @@ void CRTMP::HandlePing(const RTMPPacket Log(LOGDEBUG, "%s, Stream IsRecorded %d", __FUNCTION__, tmp); break; - default: + case 6: // server ping. reply with pong. tmp = ReadInt32(packet.m_body + 2); - Log(LOGDEBUG, "%s, Stream xx %d", __FUNCTION__, tmp); + Log(LOGDEBUG, "%s, Ping %d", __FUNCTION__, tmp); + SendCtrl(0x07, tmp); break; - case 6: // server ping. reply with pong. - unsigned int nTime = ReadInt32(packet.m_body + 2); - SendPing(0x07, nTime); + case 31: + tmp = ReadInt32(packet.m_body + 2); + Log(LOGDEBUG, "%s, Stream BufferEmpty %d", __FUNCTION__, tmp); + break; + + case 32: + tmp = ReadInt32(packet.m_body + 2); + Log(LOGDEBUG, "%s, Stream BufferReady %d", __FUNCTION__, tmp); + break; + + default: + tmp = ReadInt32(packet.m_body + 2); + Log(LOGDEBUG, "%s, Stream xx %d", __FUNCTION__, tmp); break; } @@ -1342,7 +1353,7 @@ void CRTMP::HandlePing(const RTMPPacket // respond with HMAC SHA256 of decompressed SWF, key is the 30byte player key, also the last 30 bytes of the server handshake are applied if(Link.SWFHash) { - SendPing(0x1B, 0, 0); + SendCtrl(0x1B, 0, 0); } else { Log(LOGWARNING, "%s: Ignoring SWFVerification request, use --swfhash and --swfsize!", __FUNCTION__); } @@ -1473,11 +1484,14 @@ bool CRTMP::ReadPacket(RTMPPacket &packe // reset the data from the stored packet. we keep the header since we may use it later if a new packet for this channel // arrives and requests to re-use some info (small packet header) m_vecChannelsIn[packet.m_nChannel]->m_body = NULL; + m_vecChannelsIn[packet.m_nChannel]->m_buffer = NULL; m_vecChannelsIn[packet.m_nChannel]->m_nBytesRead = 0; m_vecChannelsIn[packet.m_nChannel]->m_hasAbsTimestamp = false; // can only be false if we reuse header } - else + else { packet.m_body = NULL; // so it wont be erased on "free" + packet.m_buffer = NULL; // so it wont be erased on "free" + } return true; } @@ -1721,7 +1735,8 @@ bool CRTMP::SendRTMP(RTMPPacket &packet) } int nSize = packetSize[packet.m_headerType]; - char header[RTMP_LARGE_HEADER_SIZE] = { 0 }; + int hSize = nSize; + char *header = packet.m_body - nSize; header[0] = (char)((packet.m_headerType << 6) | packet.m_nChannel); if (nSize > 1) EncodeInt24(header+1, packet.m_nInfoField1); @@ -1735,26 +1750,23 @@ bool CRTMP::SendRTMP(RTMPPacket &packet) if (nSize > 8) EncodeInt32LE(header+8, packet.m_nInfoField2); -#if 0 - int on=1; - setsockopt(m_socket, IPPROTO_TCP, TCP_CORK, &on, sizeof(on)); -#endif - if (!WriteN(header, nSize)) - { - Log(LOGWARNING, "%s: couldn't send rtmp header", __FUNCTION__); - return false; - } - nSize = packet.m_nBodySize; char *buffer = packet.m_body; while (nSize) { int nChunkSize = packet.m_packetType == 0x14?m_chunkSize:packet.m_nBodySize; + int wrote; if (nSize < m_chunkSize) nChunkSize = nSize; - if (!WriteN(buffer, nChunkSize)) + if (header) { + wrote=WriteN(header, nChunkSize+hSize); + header = NULL; + } else { + wrote=WriteN(buffer, nChunkSize); + } + if (!wrote) return false; nSize -= nChunkSize; @@ -1762,16 +1774,10 @@ bool CRTMP::SendRTMP(RTMPPacket &packet) if (nSize > 0) { - char sep = (0xc0 | packet.m_nChannel); - if (!WriteN(&sep, 1)) - return false; + header = buffer-1; + hSize = 1; + *header = (0xc0 | packet.m_nChannel); } -#if 0 - if (on) { - on = 0; - setsockopt(m_socket, IPPROTO_TCP, TCP_CORK, &on, sizeof(on)); - } -#endif } if (packet.m_packetType == 0x14) { // we invoked a remote method, keep it in call queue till result arrives @@ -1783,6 +1789,7 @@ bool CRTMP::SendRTMP(RTMPPacket &packet) m_vecChannelsOut[packet.m_nChannel] = new RTMPPacket; *m_vecChannelsOut[packet.m_nChannel] = packet; m_vecChannelsOut[packet.m_nChannel]->m_body = NULL; + m_vecChannelsOut[packet.m_nChannel]->m_buffer = NULL; return true; } Modified: rtmp.h ============================================================================== --- rtmp.h Mon Nov 9 03:07:12 2009 (r34) +++ rtmp.h Mon Nov 9 23:52:57 2009 (r35) @@ -176,7 +176,7 @@ class CRTMP bool SendServerBW(); bool SendCheckBW(); bool SendCheckBWResult(); - bool SendPing(short nType, unsigned int nObject, unsigned int nTime = 0); + bool SendCtrl(short nType, unsigned int nObject, unsigned int nTime = 0); bool SendBGHasStream(double dId, char *playpath); bool SendCreateStream(double dStreamId); bool SendDeleteStream(double dStreamId); @@ -191,7 +191,7 @@ class CRTMP void HandleChangeChunkSize(const RTMPPacket &packet); void HandleAudio(const RTMPPacket &packet); void HandleVideo(const RTMPPacket &packet); - void HandlePing(const RTMPPacket &packet); + void HandleCtrl(const RTMPPacket &packet); void HandleServerBW(const RTMPPacket &packet); void HandleClientBW(const RTMPPacket &packet); Modified: rtmppacket.cpp ============================================================================== --- rtmppacket.cpp Mon Nov 9 03:07:12 2009 (r34) +++ rtmppacket.cpp Mon Nov 9 23:52:57 2009 (r35) @@ -50,13 +50,15 @@ void RTMPPacket::Reset() m_nBodySize = 0; m_nBytesRead = 0; m_body = NULL; + m_buffer = NULL; } bool RTMPPacket::AllocPacket(int nSize) { - m_body = (char *)calloc(1, nSize); - if (!m_body) + m_buffer = (char *)calloc(1, nSize+RTMP_MAX_HEADER_SIZE); + if (!m_buffer) return false; + m_body = m_buffer+RTMP_MAX_HEADER_SIZE; m_nBytesRead = 0; return true; } @@ -69,8 +71,9 @@ void RTMPPacket::FreePacket() void RTMPPacket::FreePacketHeader() { - if (m_body) - free(m_body); + if (m_buffer) + free(m_buffer); + m_buffer = NULL; m_body = NULL; } Modified: rtmppacket.h ============================================================================== --- rtmppacket.h Mon Nov 9 03:07:12 2009 (r34) +++ rtmppacket.h Mon Nov 9 23:52:57 2009 (r35) @@ -30,7 +30,7 @@ #define RTMP_PACKET_TYPE_VIDEO 0x09 #define RTMP_PACKET_TYPE_INFO 0x12 -#define RTMP_MAX_HEADER_SIZE 12 +#define RTMP_MAX_HEADER_SIZE 14 typedef unsigned char BYTE; @@ -66,6 +66,7 @@ namespace RTMP_LIB uint32_t m_nBodySize; uint32_t m_nBytesRead; char *m_body; + char *m_buffer; }; };

1 0

r34 - rtmpdump.cpp
by hyc 09 Nov '09

09 Nov '09

Author: hyc Date: Mon Nov 9 03:07:12 2009 New Revision: 34 Log: Hashes should use LogStatus() too Modified: rtmpdump.cpp Modified: rtmpdump.cpp ============================================================================== --- rtmpdump.cpp Mon Nov 9 02:48:30 2009 (r33) +++ rtmpdump.cpp Mon Nov 9 03:07:12 2009 (r34) @@ -816,7 +816,7 @@ int Download(CRTMP *rtmp, *percent = round(*percent*10.0)/10.0; if (bHashes) { if ( lastPercent + 1 <= *percent ) { - LogPrintf("#"); + LogStatus("#"); lastPercent = (unsigned long)*percent; } } else { @@ -830,7 +830,7 @@ int Download(CRTMP *rtmp, now = GetTime(); if (abs(now - lastUpdate) > 200) { if (bHashes) - LogPrintf("#"); + LogStatus("#"); else LogStatus("\r%.3f kB / %.2f sec", (double)size/1024.0, (double)(timestamp)/1000.0); lastUpdate = now;

1 0

r33 - rtmp.cpp rtmpdump.cpp
by hyc 09 Nov '09

09 Nov '09

Author: hyc Date: Mon Nov 9 02:48:30 2009 New Revision: 33 Log: More fixes for auto-retry Modified: rtmp.cpp rtmpdump.cpp Modified: rtmp.cpp ============================================================================== --- rtmp.cpp Sat Nov 7 09:31:39 2009 (r32) +++ rtmp.cpp Mon Nov 9 02:48:30 2009 (r33) @@ -884,6 +884,8 @@ bool CRTMP::SendBytesReceived() bool CRTMP::SendCheckBW() { RTMPPacket packet; + bool res; + packet.m_nChannel = 0x03; // control channel (invoke) packet.m_headerType = RTMP_PACKET_SIZE_LARGE; packet.m_packetType = 0x14; // INVOKE @@ -898,7 +900,10 @@ bool CRTMP::SendCheckBW() packet.m_nBodySize = enc - packet.m_body; - return SendRTMP(packet); + res = SendRTMP(packet); + /* The result of this message is _onbwcheck, not _result */ + m_methodCalls.erase(m_methodCalls.end()); + return res; } bool CRTMP::SendCheckBWResult() Modified: rtmpdump.cpp ============================================================================== --- rtmpdump.cpp Sat Nov 7 09:31:39 2009 (r32) +++ rtmpdump.cpp Mon Nov 9 02:48:30 2009 (r33) @@ -1259,7 +1259,6 @@ int main(int argc, char **argv) off_t size = 0; uint32_t timestamp = 0; - int tries = 2; /* 1 retry */ // ok, we have to get the timestamp of the last keyframe (only keyframes are seekable) / last audio frame (audio only streams) if(bResume) { @@ -1306,9 +1305,7 @@ int main(int argc, char **argv) netstackdump_read = fopen("netstackdump_read", "wb"); #endif - while (tries > 0 && !bCtrlC) { - tries--; - + while (!bCtrlC) { Log(LOGDEBUG, "Setting buffer time to: %dms", bufferTime); rtmp->SetBufferMS(bufferTime); @@ -1356,6 +1353,41 @@ int main(int argc, char **argv) nStatus = RD_FAILED; break; } + } else { + nInitialFrameSize = 0; + + Log(LOGINFO, "Connection timed out, trying to reconnect.\n\n"); + + nStatus = GetLastKeyframe(file, nSkipKeyFrames, + &dSeek, &initialFrame, + &initialFrameType, + &nInitialFrameSize); + if (nStatus != RD_SUCCESS) { + Log(LOGDEBUG, "Failed to get last keyframe."); + break; + } + + // Calculate the length of the stream to still play + if (dStopOffset > 0) { + dLength = dStopOffset - dSeek; + + // Quit if start seek is past required stop offset + if(dLength <= 0) { + LogPrintf("Already Completed\n"); + nStatus = RD_SUCCESS; + break; + } + } + + if (!rtmp->ReconnectStream(bufferTime, dSeek, dLength)) { + Log(LOGERROR, "Failed to resume the stream\n\n"); + if (!rtmp->IsTimedout()) + nStatus = RD_FAILED; + else + nStatus = RD_INCOMPLETE; + break; + } + bResume = true; } nStatus = Download(rtmp, file, dSeek, dLength, duration, bResume, @@ -1371,40 +1403,6 @@ int main(int argc, char **argv) */ if (nStatus != RD_INCOMPLETE || bStdoutMode || !rtmp->IsTimedout()) break; - - nInitialFrameSize = 0; - - Log(LOGINFO, "Connection timed out, trying to reconnect.\n\n"); - - nStatus = GetLastKeyframe(file, nSkipKeyFrames, - &dSeek, &initialFrame, - &initialFrameType, - &nInitialFrameSize); - if (nStatus != RD_SUCCESS) { - Log(LOGDEBUG, "Failed to get last keyframe."); - break; - } - - // Calculate the length of the stream to still play - if (dStopOffset > 0) { - dLength = dStopOffset - dSeek; - - // Quit if start seek is past required stop offset - if(dLength <= 0) { - LogPrintf("Already Completed\n"); - nStatus = RD_SUCCESS; - break; - } - } - - if (!rtmp->ReconnectStream(bufferTime, dSeek, dLength)) { - Log(LOGERROR, "Failed to resume the stream\n\n"); - if (!rtmp->IsTimedout()) { - nStatus = RD_FAILED; - break; - } - } - bResume = true; } if (nStatus == RD_SUCCESS) {

1 0

feature request
by compn 08 Nov '09

08 Nov '09

it would be nice if , given a player url, rtmpdump could decompress and checksum the hash and use those values with --swfhash and --swfsize automatically. -compn

2 1

divxden.com
by Howard Chu 08 Nov '09

08 Nov '09

These guys make you jump thru a 2nd page before getting the video. http://www.divxden.com/0bs1pudkca7s/qfn-mrln207.flv.html You have to POST a response to this page first, then you'll get the player in the response (with the same URL). This looks like POST /0bs1pudkca7s/qfn-mrln207.flv.html HTTP/1.1 Host: www.divxden.com User-Agent: Mozilla/5.0 (X11; U; Linux i686; rv:1.9.1.5pre) Gecko/20091025 Lightning/1.0pre SeaMonkey/2.0a1pre Firefox/3.0.3 Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8 Accept-Language: en-us,en;q=0.5 Accept-Encoding: gzip,deflate Accept-Charset: ISO-8859-1,utf-8;q=0.7,*;q=0.7 Keep-Alive: 300 Connection: keep-alive Referer: http://www.divxden.com/0bs1pudkca7s/qfn-mrln207.flv.html Cookie: __utma=100597515.1861062738.1254614231.1257632568.1257636581.4; __utmz=100597515.1257632569.3.3.utmcsr=cinema4web.com|utmccn=(referral)|utmcmd=referral|utmcct=/merlin/season/2/episode/7/episode-7-the-witchfinder/; __qca=P0-1558544162-1254614230936; fid=5375; __utmc=100597515; ao_s=3; __utmb=100597515.11.9.1257638385020 Content-Type: application/x-www-form-urlencoded Content-Length: 94 op=download2&id=0bs1pudkca7s&rand=g9jwl38p&referer=&method_free=&method_premium=&down_direct=1 In the response you'll get the player here: <script type="text/javascript"> function createPlayer() { .var flashvars = { ..file:"qfn-mrln207?2124b05b0b912cc733af9b9065169548981746d859ea187cfbb921894f40a5e388add09c5906f99d4f364e19a45d7f8da63ae91b06bcdf20a520da9d", ..skin:"/nacht.swf", ..stretching: "exactfit", ..autostart: "false", ..abouttext: "DivXDen", ..streamer: "rtmp://fms.1498.edgecastcdn.net/801498/srv13.divxden.com/files/", ..type: "rtmp", ..aboutlink: "http://divxden.com", ..id: "9v53le6p9j" .} .var params = { ..allowfullscreen:"true", ..allowscriptaccess:"always", ..wmode: "transparent" .} .var attributes = { ..id:"9v53le6p9j", ..name:"9v53le6p9j" .} .swfobject.embedSWF("/player.swf", "mediaspace", "480", "272", "9.0.115", false, flashvars, params, attributes); } createPlayer(); </script> And then invoke it like so rtmpdump -r rtmp://fms.1498.edgecastcdn.net/801498/srv13.divxden.com/files/ -s http://www.divxden.com/player.swf -y "qfn-mrln207?2124b05b0b912cc733af9b9065169548981746d859ea187cfbb921894f40a5e388add09c5906f99d4f364e19a45d7f8da63ae91b06bcdf20a520da9d" -t rtmp://fms.1498.edgecastcdn.net/801498/srv13.divxden.com/files/ -a 801498/srv13.divxden.com/files/

1 0

wisevid.com
by Howard Chu 07 Nov '09

07 Nov '09

For anyone curious, I found that wisevid is using plain RTMP with SWF verification. This invocation works for me: rtmpdump -r rtmp://stream1.wisevid.com/flvs -s http://wisevid.com/player.swf -y 82330 -a flvs -z -o xxx -w e09b300f1f1e2cc75878ab11258ba4c17f28a315ea9df26f67b37c7f59332737 -x 110543 Starting from this web page http://www.wisevid.com/view_video.php?viewkey=0052slrjt6n74lz84848 The relevant information from that page is in this bit of javascript <script type="text/javascript"> var player = null; function playerReady(thePlayer) { player = window.document[thePlayer.id]; } var so = new SWFObject('player.swf','mpl','570','340','9'); so.addParam('allowscriptaccess','always'); so.addParam('allowfullscreen','true'); so.addParam('wmode','transparent'); so.addParam('flashvars','&file=82330.flv&streamer=rtmp://stream1.wisevid.com/flvs&skin=http://wisevid.com/modieus1.swf&stretching=exactfit&autostart=true&abouttext=WiseVid.com&aboutlink=http://wisevid.com'); so.write('player'); </script> -- hyc

1 0

Parseurl stripping .flv from slist= params
by Monsieur Video 07 Nov '09

07 Nov '09

Hi, It seems like the parseurl changes in r21 changed the behavior of slist parsing slightly, previously .flv wasn't stripped from the slist= param, but was from the URL. The attached patch puts it back to how it was. (Anyone have any clue if that matches what Flash actually does? I'm only going on something that worked before breaking against SVN, but maybe it got the URL wrong.)

2 3

r32 - README
by hyc 07 Nov '09

07 Nov '09

Author: hyc Date: Sat Nov 7 09:31:39 2009 New Revision: 32 Log: Update make instructions. Update to 1.9 Modified: README Modified: README ============================================================================== --- README Sat Nov 7 09:23:23 2009 (r31) +++ README Sat Nov 7 09:31:39 2009 (r32) @@ -1,14 +1,24 @@ -RTMP Dump v1.7 +RTMP Dump v1.9 (C) 2009 Andrej Stepanchuk (C) 2009 Howard Chu License: GPLv2 -To compile just type +To compile type "make" with your platform name, e.g. - $ make rtmpdump - $ make streams + $ make linux + +or osx, mingw, or cygwin. + +You can cross-compile for ARM using + + $ make arm + +but you may need to override the CROSS_COMPILE and INC variables, e.g. + + $ make arm CROSS_COMPILE=arm-none-linux- INC=-I/my/cross/includes + +Please read the Makefile to see what other make variables are used. -To cross compile you will need to edit the Makefile first. To download an rtmp stream use

1 0

r31 - ChangeLog Makefile
by hyc 07 Nov '09

07 Nov '09

Author: hyc Date: Sat Nov 7 09:23:23 2009 New Revision: 31 Log: flvstreamer 1.9 changes, all-purpose Makefile. Please stop sending platform-specific Makefiles. Modified: ChangeLog Makefile Modified: ChangeLog ============================================================================== --- ChangeLog Sat Nov 7 08:56:32 2009 (r30) +++ ChangeLog Sat Nov 7 09:23:23 2009 (r31) @@ -1,6 +1,15 @@ RTMPDump Copyright 2008-2009 Andrej Stepanchuk; Distributed under the GPL v2 Copyright 2009 Howard Chu +Copyright 2009 The Flvstreamer Team + +5 November 2009, v1.9 +- Handle more signals to reduce risk of unresumable/corrupted partially streamed files +- Fixed >2GB file handling +- Added --hashes option for a hash progress bar instead of byte counter +- Fix to allow win32 to use binary mode on stdout. +- New MakefileOSX which will create universal binaries for Mac (intel and PPC) +- Added Win32 and cygwin Makefiles 1 November 2009, v1.7 Modified: Makefile ============================================================================== --- Makefile Sat Nov 7 08:56:32 2009 (r30) +++ Makefile Sat Nov 7 09:23:23 2009 (r31) @@ -1,24 +1,40 @@ -#CROSS_COMPILE=arm-angstrom-linux-gnueabi- -#CROSS_COMPILE=mingw32- CC=$(CROSS_COMPILE)gcc CXX=$(CROSS_COMPILE)g++ LD=$(CROSS_COMPILE)ld -#STAGING=/OE/tmp/staging/armv7a-angstrom-linux-gnueabi -#INC=-I$(STAGING)/usr/include OPT=-O2 -CFLAGS=-Wall $(INC) $(OPT) -CXXFLAGS=-Wall $(INC) $(OPT) -LDFLAGS=-Wall -#LIBS=-lws2_32 -lwinmm -lcrypto -lgdi32 +CFLAGS=-Wall $(XCFLAGS) $(INC) $(OPT) +CXXFLAGS=-Wall $(XCFLAGS) $(INC) $(OPT) +LDFLAGS=-Wall $(XLDFLAGS) LIBS=-lcrypto THREADLIB=-lpthread SLIBS=$(THREADLIB) $(LIBS) -#EXT=.exe EXT= -all: rtmpdump +all: + @echo 'use "make linux" for a native Linux build, or' + @echo ' "make osx" for a native OSX build, or' + @echo ' "make mingw" for a MinGW32 build, or' + @echo ' "make cygwin" for a CygWin build, or' + @echo ' "make arm" for a cross-compiled Linux ARM build' + +progs: rtmpdump streams + +linux: + @$(MAKE) $(MAKEFLAGS) progs + +osx: + @$(MAKE) XCFLAGS="-arch ppc -arch i386" $(MAKEFLAGS) progs + +mingw: + @$(MAKE) CROSS_COMPILE=mingw32- LIBS="-lws2_32 -lwinmm -lcrypto -lgdi32" THREADLIB= EXT=.exe $(MAKEFLAGS) progs + +cygwin: + @$(MAKE) XCFLAGS=-static XLDFLAGS="-static-libgcc -static" EXT=.exe $(MAKEFLAGS) progs + +arm: + @$(MAKE) CROSS_COMPILE=armv7a-angstrom-linux-gnueabi- INC=-I/OE/tmp/staging/armv7a-angstrom-linux-gnueabi/usr/include $(MAKEFLAGS) progs clean: rm -f *.o

1 0

r30 - rtmpdump.cpp
by hyc 07 Nov '09

07 Nov '09

Author: hyc Date: Sat Nov 7 08:56:32 2009 New Revision: 30 Log: sync with flvstreamer 1.9, with additional cleanups Modified: rtmpdump.cpp Modified: rtmpdump.cpp ============================================================================== --- rtmpdump.cpp Sat Nov 7 08:20:40 2009 (r29) +++ rtmpdump.cpp Sat Nov 7 08:56:32 2009 (r30) @@ -50,7 +50,7 @@ int debuglevel = 1; using namespace RTMP_LIB; -#define RTMPDUMP_VERSION "v1.8" +#define RTMPDUMP_VERSION "v1.9" #define RD_SUCCESS 0 #define RD_FAILED 1 @@ -128,12 +128,14 @@ int WriteHeader( return size; } +// Returns -3 if Play.Close/Stop, -2 if fatal error, -1 if no more media packets, 0 if ignorable error, >0 if there is a media packet int WriteStream( CRTMP* rtmp, char **buf, // target pointer, maybe preallocated unsigned int len, // length of buffer if preallocated uint32_t *tsm, // pointer to timestamp, will contain timestamp of last video packet returned bool bResume, // resuming mode, will not write FLV header and compare metaHeader and first kexframe + bool bLiveStream, // live mode, will not report absolute timestamps uint32_t nResumeTS, // resume keyframe timestamp char *metaHeader, // pointer to meta header (if bResume == TRUE) uint32_t nMetaHeaderSize, // length of meta header, if zero meta header check omitted (if bResume == TRUE) @@ -425,13 +427,16 @@ stopKeyframeSearch: //ptr += 4; } + // In non-live this nTimeStamp can contain an absolute TS. + // Update ext timestamp with this absolute offset in non-live mode otherwise report the relative one + // LogPrintf("\nDEBUG: type: %02X, size: %d, pktTS: %dms, TS: %dms, bLiveStream: %d", packet.m_packetType, nPacketLen, packet.m_nTimeStamp, nTimeStamp, bLiveStream); if(tsm) - *tsm = nTimeStamp; + *tsm = bLiveStream ? packet.m_nTimeStamp : nTimeStamp; - // Return 0 if this was completed nicely with invoke message Play.Stop or Play.Complete + // Return -3 if this was completed nicely with invoke message Play.Stop or Play.Complete if (rtnGetNextMediaPacket == 2) { Log(LOGDEBUG, "Got Play.Complete or Play.Stop from server. Assuming stream is complete"); - return 0; + return -3; } return size; @@ -716,6 +721,7 @@ int Download(CRTMP *rtmp, int nSkipKeyFrames, bool bStdoutMode, bool bLiveStream, + bool bHashes, bool bOverrideBufferTime, uint32_t bufferTime, double *percent) // percentage downloaded [out] @@ -727,29 +733,36 @@ int Download(CRTMP *rtmp, char *buffer = (char *)malloc(bufferSize); int nRead = 0; off_t size = ftello(file); + unsigned long lastPercent = 0; memset(buffer, 0, bufferSize); *percent = 0.0; - if(timestamp != 0) { - LogPrintf("Continuing at TS: %d ms\n", timestamp); + if(timestamp) { + Log(LOGDEBUG, "Continuing at TS: %d ms\n", timestamp); } - // print initial status - // Workaround to exit with 0 if the file is fully (> 99.9%) downloaded - if( duration > 0 ) { - if ((double)timestamp >= (double)duration*999.0 ) { - LogPrintf("Already Completed at: %.3f sec Duration=%.3f sec\n", (double)timestamp/1000.0, (double)timestamp/1000.0); - return RD_SUCCESS; + if(bLiveStream) { + LogPrintf("Starting Live Stream\n"); + } else { + // print initial status + // Workaround to exit with 0 if the file is fully (> 99.9%) downloaded + if( duration > 0 ) { + if ((double)timestamp >= (double)duration*999.0 ) { + LogPrintf("Already Completed at: %.3f sec Duration=%.3f sec\n", (double)timestamp/1000.0, (double)timestamp/1000.0); + return RD_SUCCESS; + } else { + *percent = ((double)timestamp) / (duration*1000.0)*100.0; + *percent = round(*percent*10.0)/10.0; + LogPrintf("%s download at: %.3f kB / %.3f sec (%.1f%%)\n", + bResume ? "Resuming":"Starting", + (double)size/1024.0, (double)timestamp/1000.0, *percent); + } } else { - *percent = ((double)timestamp) / (duration*1000.0)*100.0; - *percent = round(*percent*10.0)/10.0; - LogPrintf("Starting download at: %.3f kB / %.3f sec (%.1f%%)\n", (double)size/1024.0, (double)timestamp/1000.0, *percent); + LogPrintf("%s download at: %.3f kB\n", bResume ? "Resuming":"Starting",(double)size/1024.0); } - } else { - LogPrintf("Starting download at: %.3f kB\n", (double)size/1024.0); - } + } if (dLength > 0) LogPrintf("For duration: %.3f sec\n", (double)dLength/1000.0); @@ -775,7 +788,7 @@ int Download(CRTMP *rtmp, lastUpdate = now-1000; do { - nRead = WriteStream(rtmp, &buffer, bufferSize, &timestamp, bResume, dSeek, metaHeader, nMetaHeaderSize, initialFrame, initialFrameType, nInitialFrameSize, &dataType); + nRead = WriteStream(rtmp, &buffer, bufferSize, &timestamp, bResume, bLiveStream, dSeek, metaHeader, nMetaHeaderSize, initialFrame, initialFrameType, nInitialFrameSize, &dataType); //LogPrintf("nRead: %d\n", nRead); if(nRead > 0) { @@ -801,15 +814,25 @@ int Download(CRTMP *rtmp, } *percent = ((double)timestamp) / (duration*1000.0)*100.0; *percent = round(*percent*10.0)/10.0; - now = GetTime(); - if (abs(now - lastUpdate) > 200) { - LogStatus("\r%.3f kB / %.2f sec (%.1f%%)", (double)size/1024.0, (double)(timestamp)/1000.0, *percent); - lastUpdate = now; + if (bHashes) { + if ( lastPercent + 1 <= *percent ) { + LogPrintf("#"); + lastPercent = (unsigned long)*percent; + } + } else { + now = GetTime(); + if (abs(now - lastUpdate) > 200) { + LogStatus("\r%.3f kB / %.2f sec (%.1f%%)", (double)size/1024.0, (double)(timestamp)/1000.0, *percent); + lastUpdate = now; + } } } else { now = GetTime(); if (abs(now - lastUpdate) > 200) { - LogStatus("\r%.3f kB / %.2f sec", (double)size/1024.0, (double)(timestamp)/1000.0); + if (bHashes) + LogPrintf("#"); + else + LogStatus("\r%.3f kB / %.2f sec", (double)size/1024.0, (double)(timestamp)/1000.0); lastUpdate = now; } } @@ -821,6 +844,8 @@ int Download(CRTMP *rtmp, } while(!bCtrlC && nRead > -1 && rtmp->IsConnected()); free(buffer); + Log(LOGDEBUG, "WriteStream returned: %d", nRead); + if(bResume && nRead == -2) { LogPrintf("Couldn't resume FLV file, try --skip %d\n\n", nSkipKeyFrames+1); return RD_FAILED; @@ -832,6 +857,10 @@ int Download(CRTMP *rtmp, fseek(file, 4, SEEK_SET); fwrite(&dataType, sizeof(unsigned char), 1, file); } + + if(nRead == -3) + return RD_SUCCESS; + if((duration > 0 && *percent < 99.9) || bCtrlC || nRead < 0 || rtmp->IsTimedout()) { return RD_INCOMPLETE; } @@ -877,6 +906,7 @@ int main(int argc, char **argv) int port = -1; int protocol = RTMP_PROTOCOL_UNDEFINED; bool bLiveStream = false; // is it a live stream? then we can't seek/resume + bool bHashes = false; // display byte counters not hashes by default long int timeout = 120; // timeout connection after 120 seconds uint32_t dStartOffset = 0; // seek position in non-live mode @@ -932,8 +962,10 @@ int main(int argc, char **argv) {"pageUrl", 1, NULL, 'p'}, {"app", 1, NULL, 'a'}, {"auth", 1, NULL, 'u'}, +#ifdef CRYPTO {"swfhash", 1, NULL, 'w'}, {"swfsize", 1, NULL, 'x'}, +#endif {"flashVer",1, NULL, 'f'}, {"live" ,0, NULL, 'v'}, {"flv", 1, NULL, 'o'}, @@ -944,6 +976,7 @@ int main(int argc, char **argv) {"subscribe",1,NULL, 'd'}, {"start", 1, NULL, 'A'}, {"stop", 1, NULL, 'B'}, + {"hashes", 0, NULL, '#'}, {"debug", 0, NULL, 'z'}, {"quiet", 0, NULL, 'q'}, {"verbose", 0, NULL, 'V'}, @@ -965,8 +998,10 @@ int main(int argc, char **argv) LogPrintf("--tcUrl|-t url URL to played stream (default: \"rtmp://host[:port]/app\")\n"); LogPrintf("--pageUrl|-p url Web URL of played programme\n"); LogPrintf("--app|-a app Name of player used\n"); +#ifdef CRYPTO LogPrintf("--swfhash|-w hexstring SHA256 hash of the decompressed SWF file (32 bytes)\n"); LogPrintf("--swfsize|-x num Size of the decompressed SWF file, required for SWFVerification\n"); +#endif LogPrintf("--auth|-u string Authentication string to be appended to the connect string\n"); LogPrintf("--flashVer|-f string Flash version string (default: \"%s\")\n", DEFAULT_FLASH_VER); LogPrintf("--live|-v Save a live stream, no --resume (seeking) of live streams possible\n"); @@ -976,6 +1011,7 @@ int main(int argc, char **argv) LogPrintf("--timeout|-m num Timeout connection num seconds (default: %lu)\n", timeout); LogPrintf("--start|-A num Start at num seconds into stream (not valid when using --live)\n"); LogPrintf("--stop|-B num Stop at num seconds into stream\n"); + LogPrintf("--hashes|-# Display progress with hashes, not with the byte counter\n"); LogPrintf("--buffer|-b Buffer time in milliseconds (default: %lu), this option makes only sense in stdout mode (-o -)\n", bufferTime); LogPrintf("--skip|-k num Skip num keyframes when looking for last keyframe to resume from. Useful if resume fails (default: %d)\n\n", @@ -986,6 +1022,7 @@ int main(int argc, char **argv) LogPrintf("If you don't pass parameters for swfUrl, pageUrl, app or auth these propertiews will not be included in the connect "); LogPrintf("packet.\n\n"); return RD_SUCCESS; +#ifdef CRYPTO case 'w': { int res = hex2bin(optarg, &swfHash); @@ -1005,6 +1042,7 @@ int main(int argc, char **argv) } break; } +#endif case 'k': nSkipKeyFrames = atoi(optarg); if(nSkipKeyFrames < 0) { @@ -1109,6 +1147,9 @@ int main(int argc, char **argv) case 'B': dStopOffset = int(atof(optarg)*1000.0); break; + case '#': + bHashes = true; + break; case 'q': debuglevel = LOGCRIT; break; @@ -1284,7 +1325,7 @@ int main(int argc, char **argv) timestamp = dSeek; if(dSeek != 0) { - LogPrintf("Continuing at TS: %d ms\n", timestamp); + Log(LOGDEBUG, "Continuing at TS: %d ms\n", timestamp); } // User defined seek offset @@ -1320,7 +1361,7 @@ int main(int argc, char **argv) nStatus = Download(rtmp, file, dSeek, dLength, duration, bResume, metaHeader, nMetaHeaderSize, initialFrame, initialFrameType, nInitialFrameSize, - nSkipKeyFrames, bStdoutMode, bLiveStream, + nSkipKeyFrames, bStdoutMode, bLiveStream, bHashes, bOverrideBufferTime, bufferTime, &percent); free(initialFrame); initialFrame = NULL; @@ -1369,11 +1410,11 @@ int main(int argc, char **argv) if (nStatus == RD_SUCCESS) { LogPrintf("Download complete\n"); } else if (nStatus == RD_INCOMPLETE) { - LogPrintf("Download may be incomplete (downloaded about %.2f%%), try --resume\n", percent); + LogPrintf("Download may be incomplete (downloaded about %.2f%%), try resuming\n", percent); } clean: - LogPrintf("\rClosing connection.\n"); + Log(LOGDEBUG, "Closing connection.\n"); rtmp->Close(); //LogPrintf("done!\n\n");

1 0

r29 - rtmpdump.cpp
by hyc 07 Nov '09

07 Nov '09

Author: hyc Date: Sat Nov 7 08:20:40 2009 New Revision: 29 Log: Cleanup unneeded Stop checks Modified: rtmpdump.cpp Modified: rtmpdump.cpp ============================================================================== --- rtmpdump.cpp Sat Nov 7 08:19:56 2009 (r28) +++ rtmpdump.cpp Sat Nov 7 08:20:40 2009 (r29) @@ -706,7 +706,6 @@ int Download(CRTMP *rtmp, FILE *file, uint32_t dSeek, uint32_t dLength, - uint32_t dStopOffset, double duration, bool bResume, char *metaHeader, @@ -819,13 +818,6 @@ int Download(CRTMP *rtmp, else { Log(LOGDEBUG, "zero read!"); } #endif - // Force clean close if a specified stop offset is reached - if (dStopOffset && timestamp >= dStopOffset) { - LogPrintf("Stop offset has been reached at %.2f seconds (ts=%d, so=%d)\n", (double)dStopOffset/1000.0, timestamp, dStopOffset); - nRead = 0; - rtmp->Close(); - } - } while(!bCtrlC && nRead > -1 && rtmp->IsConnected()); free(buffer); @@ -840,7 +832,7 @@ int Download(CRTMP *rtmp, fseek(file, 4, SEEK_SET); fwrite(&dataType, sizeof(unsigned char), 1, file); } - if((duration > 0 && *percent < 99.9 && dStopOffset <= 0) || bCtrlC || nRead < 0 || rtmp->IsTimedout()) { + if((duration > 0 && *percent < 99.9) || bCtrlC || nRead < 0 || rtmp->IsTimedout()) { return RD_INCOMPLETE; } @@ -1284,6 +1276,7 @@ int main(int argc, char **argv) LogPrintf("Connecting ...\n"); if (!rtmp->Connect()) { + nStatus = RD_FAILED; break; } @@ -1311,23 +1304,25 @@ int main(int argc, char **argv) dLength = dStopOffset - dSeek; // Quit if start seek is past required stop offset - if(dSeek >= dStopOffset) { + if(dLength <= 0) { LogPrintf("Already Completed\n"); - return RD_SUCCESS; + nStatus = RD_SUCCESS; + break; } } if (!rtmp->ConnectStream(dSeek, dLength)) { + nStatus = RD_FAILED; break; } } - nStatus = Download(rtmp, file, dSeek, dLength, dStopOffset, duration, bResume, + nStatus = Download(rtmp, file, dSeek, dLength, duration, bResume, metaHeader, nMetaHeaderSize, initialFrame, initialFrameType, nInitialFrameSize, nSkipKeyFrames, bStdoutMode, bLiveStream, bOverrideBufferTime, bufferTime, &percent); - free(initialFrame); + free(initialFrame); initialFrame = NULL; /* If we succeeded, we're done. If writing to stdout @@ -1371,14 +1366,6 @@ int main(int argc, char **argv) bResume = true; } - // If duration is available then assume the download is complete if > 99.9% - if (bLiveStream == false && dStopOffset <= 0) { - if (duration > 0 && percent > 99.9) - nStatus = RD_SUCCESS; - else - nStatus = RD_INCOMPLETE; - } - if (nStatus == RD_SUCCESS) { LogPrintf("Download complete\n"); } else if (nStatus == RD_INCOMPLETE) {

1 0

r28 - parseurl.c
by hyc 07 Nov '09

07 Nov '09

Author: hyc Date: Sat Nov 7 08:19:56 2009 New Revision: 28 Log: Fix -r21 Modified: parseurl.c Modified: parseurl.c ============================================================================== --- parseurl.c Sat Nov 7 08:19:31 2009 (r27) +++ parseurl.c Sat Nov 7 08:19:56 2009 (r28) @@ -305,7 +305,9 @@ char *ParsePlaypath(const char *playpath if ((strcmp(ext, ".f4v") == 0) || (strcmp(ext, ".mp4") == 0)) { addMP4 = 1; - } else if (strcmp(ext, ".flv") == 0) { + // Only remove .flv from rtmp URL, not slist params + } else if ((ppstart == playpath) && + (strcmp(ext, ".flv") == 0)) { pplen -= 4; } else if (strcmp(ext, ".mp3") == 0) { addMP3 = 1;

1 0

r27 - rtmp.cpp rtmp.h
by hyc 07 Nov '09

07 Nov '09

Author: hyc Date: Sat Nov 7 08:19:31 2009 New Revision: 27 Log: FLV Ints seem to always be unsigned Modified: rtmp.cpp rtmp.h Modified: rtmp.cpp ============================================================================== --- rtmp.cpp Fri Nov 6 06:38:22 2009 (r26) +++ rtmp.cpp Sat Nov 7 08:19:31 2009 (r27) @@ -1477,27 +1477,27 @@ bool CRTMP::ReadPacket(RTMPPacket &packe return true; } -short CRTMP::ReadInt16(const char *data) +unsigned short CRTMP::ReadInt16(const char *data) { unsigned char *c = (unsigned char *)data; - short val; + unsigned short val; val = (c[0] << 8) | c[1]; return val; } -int CRTMP::ReadInt24(const char *data) +unsigned int CRTMP::ReadInt24(const char *data) { unsigned char *c = (unsigned char *)data; - int val; - val = (data[0] << 16) | (c[1] << 8) | c[2]; + unsigned int val; + val = (c[0] << 16) | (c[1] << 8) | c[2]; return val; } // big-endian 32bit integer -int CRTMP::ReadInt32(const char *data) +unsigned int CRTMP::ReadInt32(const char *data) { unsigned char *c = (unsigned char *)data; - int val; + unsigned int val; val = (c[0] << 24) | (c[1] << 16) | (c[2] << 8) | c[3]; return val; } Modified: rtmp.h ============================================================================== --- rtmp.h Fri Nov 6 06:38:22 2009 (r26) +++ rtmp.h Sat Nov 7 08:19:31 2009 (r27) @@ -156,9 +156,9 @@ class CRTMP static int EncodeInt32(char *output, int nVal); static int EncodeBoolean(char *output,bool bVal); - static short ReadInt16(const char *data); - static int ReadInt24(const char *data); - static int ReadInt32(const char *data); + static unsigned short ReadInt16(const char *data); + static unsigned int ReadInt24(const char *data); + static unsigned int ReadInt32(const char *data); static std::string ReadString(const char *data); static bool ReadBool(const char *data); static double ReadNumber(const char *data);

1 0

r26 - bytes.h rtmp.cpp rtmp.h rtmpdump.cpp streams.cpp
by hyc 06 Nov '09

06 Nov '09

Author: hyc Date: Fri Nov 6 06:38:22 2009 New Revision: 26 Log: Sync again with flvstreamer 1.8: handle files >2GB, more for start/stop conditions Modified: bytes.h rtmp.cpp rtmp.h rtmpdump.cpp streams.cpp Modified: bytes.h ============================================================================== --- bytes.h Fri Nov 6 06:36:42 2009 (r25) +++ bytes.h Fri Nov 6 06:38:22 2009 (r26) @@ -65,8 +65,8 @@ typedef unsigned long long int uint64_t; #endif // define default endianness -#ifndef __LITTLE_EDNIAN -#define __LITTLE_EDNIAN 1234 +#ifndef __LITTLE_ENDIAN +#define __LITTLE_ENDIAN 1234 #endif #ifndef __BIG_ENDIAN Modified: rtmp.cpp ============================================================================== --- rtmp.cpp Fri Nov 6 06:36:42 2009 (r25) +++ rtmp.cpp Fri Nov 6 06:38:22 2009 (r26) @@ -141,6 +141,7 @@ void CRTMP::SetupStream( const char *flashVer, const char *subscribepath, double dTime, + uint32_t dLength, bool bLiveStream, long int timeout ) @@ -167,7 +168,9 @@ void CRTMP::SetupStream( if(flashVer) Log(LOGDEBUG, "flashVer : %s", flashVer); if(dTime > 0) - Log(LOGDEBUG, "SeekTime : %lf", dTime); + Log(LOGDEBUG, "SeekTime : %.3f sec", (double)dTime/1000.0); + if(dLength > 0) + Log(LOGDEBUG, "playLength : %.3f sec", (double)dLength/1000.0); Log(LOGDEBUG, "live : %s", bLiveStream ? "yes":"no"); Log(LOGDEBUG, "timeout : %d sec", timeout); @@ -208,6 +211,7 @@ void CRTMP::SetupStream( Link.flashVer = flashVer; Link.subscribepath = subscribepath; Link.seekTime = dTime; + Link.length = dLength; Link.bLiveStream = bLiveStream; Link.timeout = timeout; @@ -345,10 +349,13 @@ bool CRTMP::SocksNegotiate() { } } -bool CRTMP::ConnectStream(double seekTime) { +bool CRTMP::ConnectStream(double seekTime, uint32_t dLength) { if (seekTime >= -2.0) Link.seekTime = seekTime; + if (dLength >= 0) + Link.length = dLength; + RTMPPacket packet; while (!m_bPlaying && IsConnected() && ReadPacket(packet)) { if (!packet.IsReady()) @@ -371,14 +378,14 @@ bool CRTMP::ConnectStream(double seekTim return m_bPlaying; } -bool CRTMP::ReconnectStream(int bufferTime, double seekTime) { +bool CRTMP::ReconnectStream(int bufferTime, double seekTime, uint32_t dLength) { DeleteStream(); SendCreateStream(2.0); SetBufferMS(bufferTime); - return ConnectStream(seekTime); + return ConnectStream(seekTime, dLength); } void CRTMP::DeleteStream() { @@ -934,7 +941,7 @@ bool CRTMP::SendPlay() *enc = 0x05; // NULL enc++; - Log(LOGDEBUG, "%s, sending play: %s", __FUNCTION__, Link.playpath); + Log(LOGDEBUG, "%s, seekTime=%.2f, dLength=%d, sending play: %s", __FUNCTION__, Link.seekTime, Link.length, Link.playpath); enc += EncodeString(enc, Link.playpath); // Optional parameters start and len. @@ -943,14 +950,22 @@ bool CRTMP::SendPlay() // -2: looks for a live stream, then a recorded stream, if not found any open a live stream // -1: plays a live stream // >=0: plays a recorded streams from 'start' milliseconds + if(Link.bLiveStream) + enc += EncodeNumber(enc, -1000.0); + else { if(Link.seekTime > 0.0) enc += EncodeNumber(enc, Link.seekTime); // resume from here + else + enc += EncodeNumber(enc, 0.0);//-2000.0); // recorded as default, -2000.0 is not reliable since that freezes the player if the stream is not found + } // len: -1, 0, positive number // -1: plays live or recorded stream to the end (default) // 0: plays a frame 'start' ms away from the beginning // >0: plays a live or recoded stream for 'len' milliseconds //enc += EncodeNumber(enc, -1.0); // len + if(Link.length) + enc += EncodeNumber(enc, Link.length); // len packet.m_nBodySize = enc - packet.m_body; @@ -1009,6 +1024,7 @@ bool CRTMP::SendPing(short nType, unsign return SendRTMP(packet); } +// Returns 0 for OK/Failed/error, 1 for 'Stop or Complete' int CRTMP::HandleInvoke(const char *body, unsigned int nBodySize) { if (body[0] != 0x02) // make sure it is a string method name we start with Modified: rtmp.h ============================================================================== --- rtmp.h Fri Nov 6 06:36:42 2009 (r25) +++ rtmp.h Fri Nov 6 06:38:22 2009 (r26) @@ -88,6 +88,7 @@ typedef struct const char *subscribepath; double seekTime; + uint32_t length; bool bLiveStream; long int timeout; // number of seconds before connection times out @@ -131,6 +132,7 @@ class CRTMP const char *flashVer, const char *subscribepath, double dTime, + uint32_t dLength, bool bLiveStream, long int timeout=300); @@ -140,8 +142,8 @@ class CRTMP bool IsTimedout(); double GetDuration(); - bool ConnectStream(double seekTime=-10.0); - bool ReconnectStream(int bufferTime, double seekTime=-10.0); + bool ConnectStream(double seekTime=-10.0, uint32_t dLength=0); + bool ReconnectStream(int bufferTime, double seekTime=-10.0, uint32_t dLength=0); void DeleteStream(); int GetNextMediaPacket(RTMPPacket &packet); Modified: rtmpdump.cpp ============================================================================== --- rtmpdump.cpp Fri Nov 6 06:36:42 2009 (r25) +++ rtmpdump.cpp Fri Nov 6 06:38:22 2009 (r26) @@ -19,6 +19,8 @@ * */ +#define _FILE_OFFSET_BITS 64 + #include <stdlib.h> #include <string.h> #include <math.h> @@ -27,8 +29,12 @@ #include <getopt.h> #ifdef WIN32 +#define fseeko fseeko64 +#define ftello ftello64 #include <winsock.h> +#include <stdio.h> #include <io.h> +#include <fcntl.h> #define SET_BINMODE(f) setmode(fileno(f), O_BINARY) #else #define SET_BINMODE(f) @@ -44,7 +50,7 @@ int debuglevel = 1; using namespace RTMP_LIB; -#define RTMPDUMP_VERSION "v1.7" +#define RTMPDUMP_VERSION "v1.8" #define RD_SUCCESS 0 #define RD_FAILED 1 @@ -90,7 +96,12 @@ bool bCtrlC = false; void sigIntHandler(int sig) { bCtrlC = true; LogPrintf("Caught signal: %d, cleaning up, just a second...\n", sig); - signal(SIGINT, SIG_DFL); + // ignore all these signals now and let the connection close + signal(SIGHUP, SIG_IGN); + signal(SIGINT, SIG_IGN); + signal(SIGPIPE, SIG_IGN); + signal(SIGTERM, SIG_IGN); + signal(SIGQUIT, SIG_IGN); } int WriteHeader( @@ -215,10 +226,10 @@ int WriteStream( ts = CRTMP::ReadInt24(packetBody+pos+4); ts |= (packetBody[pos+7]<<24); - #ifdef _DEBUG +#ifdef _DEBUG Log(LOGDEBUG, "keyframe search: FLV Packet: type %02X, dataSize: %d, timeStamp: %d ms", packetBody[pos], dataSize, ts); - #endif +#endif // ok, is it a keyframe!!!: well doesn't work for audio! if(packetBody[pos /*6928, test 0*/] == initialFrameType /* && (packetBody[11]&0xf0) == 0x10*/) { if(ts == nResumeTS) { @@ -389,15 +400,15 @@ stopKeyframeSearch: } else { prevTagSize = CRTMP::ReadInt32(packetBody+pos+11+dataSize); - #ifdef _DEBUG +#ifdef _DEBUG Log(LOGDEBUG, "FLV Packet: type %02X, dataSize: %lu, tagSize: %lu, timeStamp: %lu ms", (unsigned char)packetBody[pos], dataSize, prevTagSize, nTimeStamp); - #endif +#endif if(prevTagSize != (dataSize+11)) { - #ifdef _DEBUG +#ifdef _DEBUG Log(LOGWARNING, "Tag and data size are not consitent, writing tag size according to dataSize+11: %d", dataSize+11); - #endif +#endif prevTagSize = dataSize+11; CRTMP::EncodeInt32(ptr+pos+11+dataSize, prevTagSize); @@ -431,7 +442,7 @@ stopKeyframeSearch: int OpenResumeFile(const char *flvFile, // file name [in] FILE **file, // opened file [out] - unsigned long *size, // size of the file [out] + off_t *size, // size of the file [out] char **metaHeader, // meta data read from the file [out] uint32_t *nMetaHeaderSize, // length of metaHeader [out] double *duration) // duration of the stream in ms [out] @@ -447,7 +458,7 @@ int OpenResumeFile(const char *flvFile, return RD_SUCCESS; // RD_SUCCESS, because we go to fresh file mode instead of quiting fseek(*file, 0, SEEK_END); - *size = ftell(*file); + *size = ftello(*file); fseek(*file, 0, SEEK_SET); if(*size > 0) { @@ -482,11 +493,11 @@ int OpenResumeFile(const char *flvFile, } // go through the file to find the meta data! - uint32_t pos = dataOffset+4; + off_t pos = dataOffset+4; bool bFoundMetaHeader = false; while(pos < *size-4 && !bFoundMetaHeader) { - fseek(*file, pos, SEEK_SET); + fseeko(*file, pos, SEEK_SET); if(fread(buffer, 1, 4, *file)!=4) break; @@ -498,7 +509,7 @@ int OpenResumeFile(const char *flvFile, return RD_FAILED; } - fseek(*file, pos+11, SEEK_SET); + fseeko(*file, pos+11, SEEK_SET); if(fread(buffer, 1, dataSize, *file) != dataSize) break; @@ -553,23 +564,23 @@ int GetLastKeyframe(FILE *file, char buffer[bufferSize]; uint8_t dataType; bool bAudioOnly; - unsigned long size; + off_t size; fseek(file, 0, SEEK_END); - size = ftell(file); + size = ftello(file); fseek(file, 4, SEEK_SET); fread(&dataType, sizeof(uint8_t), 1, file); bAudioOnly = (dataType & 0x4) && !(dataType & 0x1); - Log(LOGDEBUG, "bAudioOnly: %d, size: %d", bAudioOnly, size); + Log(LOGDEBUG, "bAudioOnly: %d, size: %llu", bAudioOnly, (unsigned long long)size); // ok, we have to get the timestamp of the last keyframe (only keyframes are seekable) / last audio frame (audio only streams) //if(!bAudioOnly) // we have to handle video/video+audio different since we have non-seekable frames //{ // find the last seekable frame - uint32_t tsize = 0; + off_t tsize = 0; uint32_t prevTagSize = 0; // go through the file and find the last video keyframe @@ -580,7 +591,7 @@ skipkeyframe: Log(LOGERROR, "Unexpected start of file, error in tag sizes, couldn't arrive at prevTagSize=0"); return RD_FAILED; } - fseek(file, size-tsize-4, SEEK_SET); + fseeko(file, size-tsize-4, SEEK_SET); xread = fread(buffer, 1, 4, file); if(xread != 4) { Log(LOGERROR, "Couldn't read prevTagSize from file!"); @@ -602,17 +613,17 @@ skipkeyframe: tsize += prevTagSize+4; // read header - fseek(file, size-tsize, SEEK_SET); + fseeko(file, size-tsize, SEEK_SET); if(fread(buffer, 1, 12, file) != 12) { Log(LOGERROR, "Couldn't read header!"); return RD_FAILED; } //* - #ifdef _DEBUG +#ifdef _DEBUG uint32_t ts = RTMP_LIB::CRTMP::ReadInt24(buffer+4); ts |= (buffer[7]<<24); Log(LOGDEBUG, "%02X: TS: %d ms", buffer[0], ts); - #endif //*/ +#endif //*/ // this just continues the loop whenever the number of skipped frames is > 0, // so we look for the next keyframe to continue with @@ -638,7 +649,7 @@ skipkeyframe: *nInitialFrameSize = prevTagSize-11; *initialFrame = (char *)malloc(*nInitialFrameSize); - fseek(file, size-tsize+11, SEEK_SET); + fseeko(file, size-tsize+11, SEEK_SET); if(fread(*initialFrame, 1, *nInitialFrameSize, file) != *nInitialFrameSize) { Log(LOGERROR, "Couldn't read last keyframe, aborting!"); return RD_FAILED; @@ -659,13 +670,13 @@ skipkeyframe: /* // now read the timestamp of the frame before the seekable keyframe: - fseek(file, size-tsize-4, SEEK_SET); + fseeko(file, size-tsize-4, SEEK_SET); if(fread(buffer, 1, 4, file) != 4) { Log(LOGERROR, "Couldn't read prevTagSize from file!"); goto start; } uint32_t prevTagSize = RTMP_LIB::CRTMP::ReadInt32(buffer); - fseek(file, size-tsize-4-prevTagSize+4, SEEK_SET); + fseeko(file, size-tsize-4-prevTagSize+4, SEEK_SET); if(fread(buffer, 1, 4, file) != 4) { Log(LOGERROR, "Couldn't read previous timestamp!"); goto start; @@ -679,7 +690,7 @@ skipkeyframe: if(*dSeek != 0) { // seek to position after keyframe in our file (we will ignore the keyframes resent by the server // since they are sent a couple of times and handling this would be a mess) - fseek(file, size-tsize+prevTagSize+4, SEEK_SET); + fseeko(file, size-tsize+prevTagSize+4, SEEK_SET); // make sure the WriteStream doesn't write headers and ignores all the 0ms TS packets // (including several meta data headers and the keyframe we seeked to) @@ -694,6 +705,7 @@ skipkeyframe: int Download(CRTMP *rtmp, // connected CRTMP object FILE *file, uint32_t dSeek, + uint32_t dLength, uint32_t dStopOffset, double duration, bool bResume, @@ -715,7 +727,7 @@ int Download(CRTMP *rtmp, int bufferSize = 1024*1024; char *buffer = (char *)malloc(bufferSize); int nRead = 0; - unsigned long size = ftell(file); + off_t size = ftello(file); memset(buffer, 0, bufferSize); @@ -726,15 +738,23 @@ int Download(CRTMP *rtmp, } // print initial status - LogPrintf("Starting download at "); - if(duration > 0) { - *percent = ((double)timestamp) / (duration*1000.0)*100.0; - *percent = round(*percent*10.0)/10.0; - LogPrintf("%.3f kB (%.1f%%)\n", (double)size/1024.0, *percent); + // Workaround to exit with 0 if the file is fully (> 99.9%) downloaded + if( duration > 0 ) { + if ((double)timestamp >= (double)duration*999.0 ) { + LogPrintf("Already Completed at: %.3f sec Duration=%.3f sec\n", (double)timestamp/1000.0, (double)timestamp/1000.0); + return RD_SUCCESS; + } else { + *percent = ((double)timestamp) / (duration*1000.0)*100.0; + *percent = round(*percent*10.0)/10.0; + LogPrintf("Starting download at: %.3f kB / %.3f sec (%.1f%%)\n", (double)size/1024.0, (double)timestamp/1000.0, *percent); + } } else { - LogPrintf("%.3f kB\n", (double)size/1024.0); + LogPrintf("Starting download at: %.3f kB\n", (double)size/1024.0); } + if (dLength > 0) + LogPrintf("For duration: %.3f sec\n", (double)dLength/1000.0); + // write FLV header if not resuming if(!bResume) { nRead = WriteHeader(&buffer, bufferSize); @@ -784,24 +804,24 @@ int Download(CRTMP *rtmp, *percent = round(*percent*10.0)/10.0; now = GetTime(); if (abs(now - lastUpdate) > 200) { - LogStatus("\r%.3f kB (%.1f%%)", (double)size/1024.0, *percent); + LogStatus("\r%.3f kB / %.2f sec (%.1f%%)", (double)size/1024.0, (double)(timestamp)/1000.0, *percent); lastUpdate = now; } } else { now = GetTime(); if (abs(now - lastUpdate) > 200) { - LogStatus("\r%.3f kB", (double)size/1024.0); + LogStatus("\r%.3f kB / %.2f sec", (double)size/1024.0, (double)(timestamp)/1000.0); lastUpdate = now; } } } - #ifdef _DEBUG +#ifdef _DEBUG else { Log(LOGDEBUG, "zero read!"); } - #endif +#endif // Force clean close if a specified stop offset is reached if (dStopOffset && timestamp >= dStopOffset) { - LogPrintf("Stop offset has been reached at %.2f seconds\n", (double)dStopOffset/1000.0); + LogPrintf("Stop offset has been reached at %.2f seconds (ts=%d, so=%d)\n", (double)dStopOffset/1000.0, timestamp, dStopOffset); nRead = 0; rtmp->Close(); } @@ -820,7 +840,7 @@ int Download(CRTMP *rtmp, fseek(file, 4, SEEK_SET); fwrite(&dataType, sizeof(unsigned char), 1, file); } - if((duration > 0 && *percent < 99.9) || bCtrlC || nRead < 0 || rtmp->IsTimedout()) { + if((duration > 0 && *percent < 99.9 && dStopOffset <= 0) || bCtrlC || nRead < 0 || rtmp->IsTimedout()) { return RD_INCOMPLETE; } @@ -844,7 +864,7 @@ int main(int argc, char **argv) int nSkipKeyFrames = 0; // skip this number of keyframes when resuming bool bOverrideBufferTime = false; // if the user specifies a buffer time override this is true - bool bStdoutMode = false;// if true print the stream directly to stdout, messages go to stderr + bool bStdoutMode = true;// if true print the stream directly to stdout, messages go to stderr bool bResume = false; // true in resume mode uint32_t dSeek = 0; // seek position in resume mode, 0 otherwise uint32_t bufferTime = 10*60*60*1000; // 10 hours as default @@ -869,6 +889,7 @@ int main(int argc, char **argv) long int timeout = 120; // timeout connection after 120 seconds uint32_t dStartOffset = 0; // seek position in non-live mode uint32_t dStopOffset = 0; + uint32_t dLength = 0; // length to play from stream - calculated from seek position and dStopOffset char *rtmpurl = 0; char *swfUrl = 0; @@ -885,7 +906,11 @@ int main(int argc, char **argv) char DEFAULT_FLASH_VER[] = "LNX 10,0,22,87"; + signal(SIGHUP, sigIntHandler); signal(SIGINT, sigIntHandler); + signal(SIGPIPE, sigIntHandler); + signal(SIGTERM, sigIntHandler); + signal(SIGQUIT, sigIntHandler); /* sleep(30); */ @@ -899,7 +924,7 @@ int main(int argc, char **argv) } LogPrintf("RTMPDump %s\n", RTMPDUMP_VERSION); - LogPrintf("(c) 2009 Andrej Stepanchuk, Howard Chu; license: GPL\n\n"); + LogPrintf("(c) 2009 Andrej Stepanchuk, Howard Chu, The Flvstreamer Team; license: GPL\n"); int opt; struct option longopts[] = { @@ -1073,8 +1098,8 @@ int main(int argc, char **argv) break; case 'o': flvFile = optarg; - if(strcmp(flvFile, "-")==0) - bStdoutMode = true; + if(strcmp(flvFile, "-")) + bStdoutMode = false; break; case 'e': @@ -1088,11 +1113,9 @@ int main(int argc, char **argv) break; case 'A': dStartOffset = int(atof(optarg)*1000.0); - //printf("dStartOffset = %d\n", dStartOffset); break; case 'B': dStopOffset = int(atof(optarg)*1000.0); - //printf("dStartOffset = %d\n", dStartOffset); break; case 'q': debuglevel = LOGCRIT; @@ -1133,8 +1156,8 @@ int main(int argc, char **argv) protocol = RTMP_PROTOCOL_RTMP; } if(flvFile == 0) { - Log(LOGERROR, "You must specify an output flv file (-o filename)"); - return RD_FAILED; + Log(LOGWARNING, "You haven't specified an output file (-o filename), using stdout"); + bStdoutMode = true; } if(bStdoutMode && bResume) { @@ -1187,12 +1210,21 @@ int main(int argc, char **argv) memset(buffer, 0, bufferSize); + // User defined seek offset + if (dStartOffset > 0) { + // Live stream + if (bLiveStream) { + Log(LOGWARNING, "Can't seek in a live stream, ignoring --start option"); + dStartOffset = 0; + } + } + CRTMP *rtmp = new CRTMP(); rtmp->SetupStream(protocol, hostname, port, sockshost, playpath, tcUrl, swfUrl, pageUrl, app, auth, swfHash, swfSize, flashVer, subscribepath, - dSeek, bLiveStream, timeout); + dSeek, 0, bLiveStream, timeout); - unsigned long size = 0; + off_t size = 0; uint32_t timestamp = 0; int tries = 2; /* 1 retry */ @@ -1236,85 +1268,117 @@ int main(int argc, char **argv) } } - #ifdef _DEBUG +#ifdef _DEBUG netstackdump = fopen("netstackdump", "wb"); netstackdump_read = fopen("netstackdump_read", "wb"); - #endif - - // User defined seek offset - if (dStartOffset > 0) { - if (bLiveStream) - Log(LOGWARNING, "Can't seek in a live stream, ignoring --seek option"); - // Don't need the offset if resuming an existing file - else if (bResume) - Log(LOGDEBUG, "Can't seek a resumed stream, ignoring --seek option"); - else - dSeek += dStartOffset; - } +#endif while (tries > 0 && !bCtrlC) { tries--; - Log(LOGDEBUG, "Setting buffer time to: %dms", bufferTime); - rtmp->SetBufferMS(bufferTime); + Log(LOGDEBUG, "Setting buffer time to: %dms", bufferTime); + rtmp->SetBufferMS(bufferTime); - if (first) { - first = 0; - LogPrintf("Connecting ...\n"); + if (first) { + first = 0; + LogPrintf("Connecting ...\n"); - if (!rtmp->Connect()) { - break; - } + if (!rtmp->Connect()) { + break; + } - Log(LOGINFO, "Connected..."); - - timestamp = dSeek; - if(dSeek != 0) { - LogPrintf("Continuing at TS: %d ms\n", timestamp); - } + Log(LOGINFO, "Connected..."); - if (!rtmp->ConnectStream(dSeek)) { - break; + timestamp = dSeek; + if(dSeek != 0) { + LogPrintf("Continuing at TS: %d ms\n", timestamp); + } + + // User defined seek offset + if (dStartOffset > 0) { + // Don't need the start offset if resuming an existing file + if (bResume) { + Log(LOGWARNING, "Can't seek a resumed stream, ignoring --start option"); + dStartOffset = 0; + } else { + // ??? we want to add not equals ??? + dSeek += dStartOffset; + } + } + + // Calculate the length of the stream to still play + if (dStopOffset > 0) { + dLength = dStopOffset - dSeek; + + // Quit if start seek is past required stop offset + if(dSeek >= dStopOffset) { + LogPrintf("Already Completed\n"); + return RD_SUCCESS; + } + } + + if (!rtmp->ConnectStream(dSeek, dLength)) { + break; + } } - } - nStatus = Download(rtmp, file, dSeek, dStopOffset, duration, bResume, + nStatus = Download(rtmp, file, dSeek, dLength, dStopOffset, duration, bResume, metaHeader, nMetaHeaderSize, initialFrame, initialFrameType, nInitialFrameSize, nSkipKeyFrames, bStdoutMode, bLiveStream, bOverrideBufferTime, bufferTime, &percent); free(initialFrame); - initialFrame = NULL; + initialFrame = NULL; - /* If we succeeded, we're done. If writing to stdout - * we can't seek and retry. - */ - if (nStatus != RD_INCOMPLETE || bStdoutMode || !rtmp->IsTimedout()) - break; - - nInitialFrameSize = 0; + /* If we succeeded, we're done. If writing to stdout + * we can't seek and retry. + */ + if (nStatus != RD_INCOMPLETE || bStdoutMode || !rtmp->IsTimedout()) + break; - Log(LOGINFO, "Connection timed out, trying to reconnect.\n\n"); + nInitialFrameSize = 0; + + Log(LOGINFO, "Connection timed out, trying to reconnect.\n\n"); - nStatus = GetLastKeyframe(file, nSkipKeyFrames, + nStatus = GetLastKeyframe(file, nSkipKeyFrames, &dSeek, &initialFrame, &initialFrameType, &nInitialFrameSize); - if (nStatus != RD_SUCCESS) { + if (nStatus != RD_SUCCESS) { Log(LOGDEBUG, "Failed to get last keyframe."); break; - } + } - if (!rtmp->ReconnectStream(bufferTime, dSeek)) { + // Calculate the length of the stream to still play + if (dStopOffset > 0) { + dLength = dStopOffset - dSeek; + + // Quit if start seek is past required stop offset + if(dLength <= 0) { + LogPrintf("Already Completed\n"); + nStatus = RD_SUCCESS; + break; + } + } + + if (!rtmp->ReconnectStream(bufferTime, dSeek, dLength)) { Log(LOGERROR, "Failed to resume the stream\n\n"); - if (!rtmp->IsTimedout()) { + if (!rtmp->IsTimedout()) { nStatus = RD_FAILED; break; - } - } + } + } bResume = true; } + // If duration is available then assume the download is complete if > 99.9% + if (bLiveStream == false && dStopOffset <= 0) { + if (duration > 0 && percent > 99.9) + nStatus = RD_SUCCESS; + else + nStatus = RD_INCOMPLETE; + } + if (nStatus == RD_SUCCESS) { LogPrintf("Download complete\n"); } else if (nStatus == RD_INCOMPLETE) { Modified: streams.cpp ============================================================================== --- streams.cpp Fri Nov 6 06:36:42 2009 (r25) +++ streams.cpp Fri Nov 6 06:38:22 2009 (r26) @@ -641,6 +641,7 @@ void processTCPrequest req.flashVer, req.subscribepath, dSeek, + -1, // length req.bLiveStream, req.timeout);

1 0

r25 - streams.cpp
by hyc 06 Nov '09

06 Nov '09

Author: hyc Date: Fri Nov 6 06:36:42 2009 New Revision: 25 Log: Missing sockshost param Modified: streams.cpp Modified: streams.cpp ============================================================================== --- streams.cpp Fri Nov 6 04:57:02 2009 (r24) +++ streams.cpp Fri Nov 6 06:36:42 2009 (r25) @@ -629,6 +629,7 @@ void processTCPrequest req.protocol, req.hostname, req.rtmpport, + NULL, // sockshost req.playpath, req.tcUrl, req.swfUrl,

1 0

r24 - rtmp.cpp
by hyc 06 Nov '09

06 Nov '09

Author: hyc Date: Fri Nov 6 04:57:02 2009 New Revision: 24 Log: Portability fixes for SOCKS support Modified: rtmp.cpp Modified: rtmp.cpp ============================================================================== --- rtmp.cpp Fri Nov 6 04:38:08 2009 (r23) +++ rtmp.cpp Fri Nov 6 04:57:02 2009 (r24) @@ -186,9 +186,12 @@ void CRTMP::SetupStream( if(sockshost) { const char *socksport = strchr(sockshost, ':'); + char *hostname = strdup(sockshost); + + if(socksport) + hostname[socksport - sockshost] = '\0'; + Link.sockshost = hostname; - Link.sockshost = strndup(sockshost, - socksport ? socksport - sockshost : strlen(sockshost)); Link.socksport = socksport ? atoi(socksport + 1) : 1080; Log(LOGDEBUG, "Connecting via SOCKS proxy: %s:%d", Link.sockshost, Link.socksport); } else { @@ -315,22 +318,21 @@ bool CRTMP::Connect() { } bool CRTMP::SocksNegotiate() { - char packet[255]; sockaddr_in service; memset(&service, 0, sizeof(sockaddr_in)); add_addr_info(&service, Link.hostname, Link.port); unsigned long addr = htonl(service.sin_addr.s_addr); - int len = snprintf(packet, sizeof packet, "%c%c%c%c%c%c%c%c%c", + char packet[] = { 4, 1, // SOCKS 4, connect (Link.port >> 8) & 0xFF, (Link.port) & 0xFF, (char) (addr >> 24) & 0xFF, (char) (addr >> 16) & 0xFF, (char) (addr >> 8) & 0xFF, (char) addr & 0xFF, - 0); // NULL terminate + 0}; // NULL terminate - WriteN(packet, len); + WriteN(packet, sizeof packet); if(ReadN(packet, 8) != 8) return false;

1 0

rtmpdump-yle patches [1/3]
by Antti Ajanki 06 Nov '09

06 Nov '09

Hello, It's great that rtmpdump has a public repository again. I see that some of the changes from my rtmpdump-yle [0] has already been merged. Can you merge this set of changes, too? This first patch adds ability to parse mp3 playpaths, and splits the very long ParseUrl function into two. [0] http://users.tkk.fi/~aajanki/rtmpdump-yle/index-en.html Antti

2 1

r23 - AMFObject.cpp AMFObject.h
by hyc 06 Nov '09

06 Nov '09

Author: hyc Date: Fri Nov 6 04:38:08 2009 New Revision: 23 Log: >From Antti Ajanki: pass name by reference Modified: AMFObject.cpp AMFObject.h Modified: AMFObject.cpp ============================================================================== --- AMFObject.cpp Fri Nov 6 04:36:13 2009 (r22) +++ AMFObject.cpp Fri Nov 6 04:38:08 2009 (r23) @@ -72,7 +72,7 @@ const std::string &RTMP_LIB::AMFObjectPr return m_strName; } -void RTMP_LIB::AMFObjectProperty::SetPropName(const std::string strName) +void RTMP_LIB::AMFObjectProperty::SetPropName(const std::string& strName) { m_strName = strName; } Modified: AMFObject.h ============================================================================== --- AMFObject.h Fri Nov 6 04:36:13 2009 (r22) +++ AMFObject.h Fri Nov 6 04:38:08 2009 (r23) @@ -67,7 +67,7 @@ namespace RTMP_LIB virtual ~AMFObjectProperty(); const std::string &GetPropName() const; - void SetPropName(const std::string strName); + void SetPropName(const std::string& strName); AMFDataType GetType() const;

1 0

r22 - rtmpdump.cpp
by hyc 06 Nov '09

06 Nov '09

Author: hyc Date: Fri Nov 6 04:36:13 2009 New Revision: 22 Log: Set stdout to binary mode for WIN32 Modified: rtmpdump.cpp Modified: rtmpdump.cpp ============================================================================== --- rtmpdump.cpp Fri Nov 6 04:32:22 2009 (r21) +++ rtmpdump.cpp Fri Nov 6 04:36:13 2009 (r22) @@ -28,8 +28,13 @@ #ifdef WIN32 #include <winsock.h> +#include <io.h> +#define SET_BINMODE(f) setmode(fileno(f), O_BINARY) +#else +#define SET_BINMODE(f) #endif + #include "rtmp.h" #include "log.h" #include "AMFObject.h" @@ -1218,9 +1223,10 @@ int main(int argc, char **argv) } if (!file) { - if(bStdoutMode) + if(bStdoutMode) { file = stdout; - else + SET_BINMODE(file); + } else { file = fopen(flvFile, "w+b"); if(file == 0) {

1 0

r21 - parseurl.c parseurl.h
by hyc 06 Nov '09

06 Nov '09

Author: hyc Date: Fri Nov 6 04:32:22 2009 New Revision: 21 Log: >From Antti Ajanki: split parseurl function, handle mp3 playpaths Modified: parseurl.c parseurl.h Modified: parseurl.c ============================================================================== --- parseurl.c Mon Nov 2 05:20:09 2009 (r20) +++ parseurl.c Fri Nov 6 04:32:22 2009 (r21) @@ -257,61 +257,77 @@ parsehost: p += appnamelen; iEnd -= appnamelen; - // parse playpath - int iPlaypathPos = -1; - int iPlaypathLen = -1; + if (*p == '/') { + p += 1; + iEnd -= 1; + } - int bAddMP4 = 0; // used to add at the end mp4: in front of the playpath + *playpath = ParsePlaypath(p); - // here filter out semicolon added parameters, e.g. slist=bla...;abc=def - //if((temp=strstr(p, ";"))!=0) - // iEnd = temp-p-1; - - if(*p=='?' && (temp=strstr(p, "slist="))!=0) { - iPlaypathPos = temp-p+6; + return 1; +} - int iAnd = iEnd+1; - if((temp=strstr(p+iPlaypathPos, "&"))!=0) - iAnd = temp-p; - if(iAnd < iEnd) - iPlaypathLen = iAnd-iPlaypathPos; - else - iPlaypathLen = iEnd-iPlaypathPos; // +1 - } else { // no slist parameter, so take string after applen - if(iEnd > 0) { - iPlaypathPos = 1; - iPlaypathLen = iEnd-iPlaypathPos;//+1; - - // filter .flv from playpath specified with slashes: rtmp://host/app/path.flv - if(iPlaypathLen >=4) { - if(strncmp(&p[iPlaypathPos+iPlaypathLen-4], ".f4v", 4)==0 || strncmp(&p[iPlaypathPos+iPlaypathLen-4], ".mp4", 4)==0) { - bAddMP4 = 1; - } else if(strncmp(&p[iPlaypathPos+iPlaypathLen-4], ".flv", 4)==0) { - iPlaypathLen-=4; - } - } - } else { - Log(LOGERROR, "No playpath found!"); +/* + * Extracts playpath from RTMP URL. playpath is the file part of the + * URL, i.e. the part that comes after rtmp://host:port/app/ + * + * Returns the stream name in a format understood by FMS. The name is + * the playpath part of the URL with formating depending on the stream + * type: + * + * mp4 streams: prepend "mp4:" + * mp3 streams: prepend "mp3:", remove extension + * flv streams: remove extension + */ +char *ParsePlaypath(const char *playpath) { + if (!playpath || !*playpath) + return NULL; + + int addMP4 = 0; + int addMP3 = 0; + const char *temp; + const char *ppstart = playpath; + int pplen = strlen(playpath); + + if ((*ppstart == '?') && + (temp=strstr(ppstart, "slist=")) != 0) { + ppstart = temp+6; + pplen = strlen(ppstart); + + temp = strchr(ppstart, '&'); + if (temp) { + pplen = temp-ppstart; } } - if(iPlaypathLen > -1) { - *playpath = (char *)malloc((iPlaypathLen+(bAddMP4?4:0)+1)*sizeof(char)); - char *playpathptr = *playpath; - - if(bAddMP4 && strncmp(&p[iPlaypathPos], "mp4:", 4)!=0) { - strcpy(playpathptr, "mp4:"); - playpathptr+=4; + if (pplen >= 4) { + const char *ext = &ppstart[pplen-4]; + if ((strcmp(ext, ".f4v") == 0) || + (strcmp(ext, ".mp4") == 0)) { + addMP4 = 1; + } else if (strcmp(ext, ".flv") == 0) { + pplen -= 4; + } else if (strcmp(ext, ".mp3") == 0) { + addMP3 = 1; + pplen -= 4; } + } - strncpy(playpathptr, &p[iPlaypathPos], iPlaypathLen); - playpathptr[iPlaypathLen]=0; + char *streamname = (char *)malloc((pplen+4+1)*sizeof(char)); + if (!streamname) + return NULL; - Log(LOGDEBUG, "Parsed playpath: %s", *playpath); - } else { - Log(LOGWARNING, "No playpath in URL!"); + char *destptr = streamname; + if (addMP4 && (strncmp(ppstart, "mp4:", 4) != 0)) { + strcpy(destptr, "mp4:"); + destptr += 4; + } else if (addMP3 && (strncmp(ppstart, "mp3:", 4) != 0)) { + strcpy(destptr, "mp3:"); + destptr += 4; } - return 1; -} + strncpy(destptr, ppstart, pplen); + destptr[pplen] = '\0'; + return streamname; +} Modified: parseurl.h ============================================================================== --- parseurl.h Mon Nov 2 05:20:09 2009 (r20) +++ parseurl.h Fri Nov 6 04:32:22 2009 (r21) @@ -26,6 +26,7 @@ extern "C" { #endif int hex2bin(char *str, char **hex); int ParseUrl(char *url, int *protocol, char **host, unsigned int *port, char **playpath, char **app); +char *ParsePlaypath(const char *playpath); #ifdef __cplusplus } #endif

1 0

website is up
by compn 06 Nov '09

06 Nov '09

http://rtmpdump.mplayerhq.hu its ... not much to look at. if you want to write some better html or make a complete site (with docs, changelog, etc) please zip+send it to projects(a)mplayerhq.hu someone mentioned a tarball release too? also if someone wants to create some binary builds (mac/mingw/cygwin) , i think those can be hosted as well. -compn

2 1

rtmpdump-yle patches [3/3]
by Antti Ajanki 05 Nov '09

05 Nov '09

Avoid an unnecessary temporary copy by passing a reference. Antti

1 0

rtmpdump-yle patches [2/3]
by Antti Ajanki 05 Nov '09

05 Nov '09

A rtmpdump-yle user reported that on MinGW Win32 environment (and presumably on other Windows environments, too) the streams get corrupted when output to stdout because on Windows the default text output mode converts \n to \r\n. This patch changes stdout to binary mode, which passes the data without modifications. Antti

1 0

SOCKS support take 2
by Monsieur Video 05 Nov '09

05 Nov '09

I was a little eager sending that previous patch, here's one which actually works.. I had to stop using Socks4a as I found out it doesn't work with SSH dynamic port forwarding, the main reason I wanted to use that was so DNS lookups could happen on the server, which helps for things like Akamai. (SOCKS 5 would be nice, but it's harder to write).

2 3

Release plans?
by Monsieur Video 03 Nov '09

03 Nov '09

Hello, I wondered what the plans for releasing this code are? It would be nice if we could point users of get-flash-videos at a release rather than a subversion repo, I don't want to jump the gun but what is in SVN now is more useful to many people compared to rtmpdump 1.6.

3 4

r20 - ChangeLog
by hyc 02 Nov '09

02 Nov '09

Author: hyc Date: Mon Nov 2 05:20:09 2009 New Revision: 20 Log: SOCKS4 support Modified: ChangeLog Modified: ChangeLog ============================================================================== --- ChangeLog Mon Nov 2 03:51:17 2009 (r19) +++ ChangeLog Mon Nov 2 05:20:09 2009 (r20) @@ -2,12 +2,14 @@ RTMPDump Copyright 2008-2009 Andrej Stepanchuk; Distributed under the GPL v2 Copyright 2009 Howard Chu -30 October 2009, v1.7 +1 November 2009, v1.7 - added --subscribe option for subscribing to a stream - added --start / --stop options for specifying endpoints of a stream - added --debug / --quiet / --verbose options for controlling output +- added SOCKS4 support (by Monsieur Video) + - restructured to support auto-restart of timed-out streams - rewritten byteswapping, works on all platforms

1 0

r19 - rtmp.cpp rtmp.h rtmpdump.cpp
by hyc 02 Nov '09

02 Nov '09

Author: hyc Date: Mon Nov 2 03:51:17 2009 New Revision: 19 Log: SOCKS4 support from Monsieur Video Modified: rtmp.cpp rtmp.h rtmpdump.cpp Modified: rtmp.cpp ============================================================================== --- rtmp.cpp Sat Oct 31 03:49:17 2009 (r18) +++ rtmp.cpp Mon Nov 2 03:51:17 2009 (r19) @@ -129,6 +129,7 @@ void CRTMP::SetupStream( int protocol, const char *hostname, unsigned int port, + const char *sockshost, const char *playpath, const char *tcUrl, const char *swfUrl, @@ -182,6 +183,20 @@ void CRTMP::SetupStream( Link.SWFSize = 0; } + if(sockshost) + { + const char *socksport = strchr(sockshost, ':'); + + Link.sockshost = strndup(sockshost, + socksport ? socksport - sockshost : strlen(sockshost)); + Link.socksport = socksport ? atoi(socksport + 1) : 1080; + Log(LOGDEBUG, "Connecting via SOCKS proxy: %s:%d", Link.sockshost, Link.socksport); + } else { + Link.sockshost = NULL; + Link.socksport = 0; + } + + Link.tcUrl = tcUrl; Link.swfUrl = swfUrl; Link.pageUrl = pageUrl; @@ -202,6 +217,24 @@ void CRTMP::SetupStream( Link.port = 1935; } +static bool add_addr_info(sockaddr_in* service, const char *hostname, int port) +{ + service->sin_addr.s_addr = inet_addr(hostname); + if (service->sin_addr.s_addr == INADDR_NONE) + { + struct hostent *host = gethostbyname(hostname); + if (host == NULL || host->h_addr == NULL) + { + Log(LOGERROR, "Problem accessing the DNS. (addr: %s)", hostname); + return false; + } + service->sin_addr = *(struct in_addr*)host->h_addr; + } + + service->sin_port = htons(port); + return true; +} + bool CRTMP::Connect() { if (!Link.hostname) return false; @@ -215,19 +248,16 @@ bool CRTMP::Connect() { sockaddr_in service; memset(&service, 0, sizeof(sockaddr_in)); service.sin_family = AF_INET; - service.sin_addr.s_addr = inet_addr(Link.hostname); - if (service.sin_addr.s_addr == INADDR_NONE) + + if (Link.socksport) { - struct hostent *host = gethostbyname(Link.hostname); - if (host == NULL || host->h_addr == NULL) - { - Log(LOGERROR, "Problem accessing the DNS. (addr: %s)", Link.hostname); - return false; - } - service.sin_addr = *(struct in_addr*)host->h_addr; + // Connect via SOCKS + if(!add_addr_info(&service, Link.sockshost, Link.socksport)) return false; + } else { + // Connect directly + if(!add_addr_info(&service, Link.hostname, Link.port)) return false; } - service.sin_port = htons(Link.port); m_socket = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); if (m_socket != -1) { @@ -240,6 +270,16 @@ bool CRTMP::Connect() { return false; } + if(Link.socksport) { + Log(LOGDEBUG, "%s ... SOCKS negotiation", __FUNCTION__); + if (!SocksNegotiate()) + { + Log(LOGERROR, "%s, SOCKS negotiation failed.", __FUNCTION__); + Close(); + return false; + } + } + Log(LOGDEBUG, "%s, ... connected, handshaking", __FUNCTION__); if (!HandShake()) { @@ -274,6 +314,35 @@ bool CRTMP::Connect() { return true; } +bool CRTMP::SocksNegotiate() { + char packet[255]; + sockaddr_in service; + memset(&service, 0, sizeof(sockaddr_in)); + + add_addr_info(&service, Link.hostname, Link.port); + unsigned long addr = htonl(service.sin_addr.s_addr); + + int len = snprintf(packet, sizeof packet, "%c%c%c%c%c%c%c%c%c", + 4, 1, // SOCKS 4, connect + (Link.port >> 8) & 0xFF, + (Link.port) & 0xFF, + (char) (addr >> 24) & 0xFF, (char) (addr >> 16) & 0xFF, + (char) (addr >> 8) & 0xFF, (char) addr & 0xFF, + 0); // NULL terminate + + WriteN(packet, len); + + if(ReadN(packet, 8) != 8) + return false; + + if(packet[0] == 0 && packet[1] == 90) { + return true; + } else { + Log(LOGERROR, "%s, SOCKS returned error code %d", packet[1]); + return false; + } +} + bool CRTMP::ConnectStream(double seekTime) { if (seekTime >= -2.0) Link.seekTime = seekTime; Modified: rtmp.h ============================================================================== --- rtmp.h Sat Oct 31 03:49:17 2009 (r18) +++ rtmp.h Mon Nov 2 03:51:17 2009 (r19) @@ -99,7 +99,10 @@ typedef struct //char SWFHashHMAC[32]; char SWFVerificationResponse[42]; - #endif + #endif + + const char *sockshost; + unsigned short socksport; } LNK; class CRTMP @@ -116,6 +119,7 @@ class CRTMP int protocol, const char *hostname, unsigned int port, + const char *sockshost, const char *playpath, const char *tcUrl, const char *swfUrl, @@ -164,6 +168,7 @@ class CRTMP protected: bool HandShake(bool FP9HandShake=true); bool RTMPConnect(); + bool SocksNegotiate(); bool SendConnectPacket(); bool SendServerBW(); Modified: rtmpdump.cpp ============================================================================== --- rtmpdump.cpp Sat Oct 31 03:49:17 2009 (r18) +++ rtmpdump.cpp Mon Nov 2 03:51:17 2009 (r19) @@ -874,6 +874,7 @@ int main(int argc, char **argv) char *swfHash = 0; uint32_t swfSize = 0; char *flashVer = 0; + char *sockshost = 0; char *flvFile = 0; @@ -900,6 +901,7 @@ int main(int argc, char **argv) {"help", 0, NULL, 'h'}, {"host", 1, NULL, 'n'}, {"port", 1, NULL, 'c'}, + {"socks", 1, NULL, 'S'}, {"protocol",1, NULL, 'l'}, {"playpath",1, NULL, 'y'}, {"rtmp", 1, NULL, 'r'}, @@ -926,7 +928,7 @@ int main(int argc, char **argv) {0,0,0,0} }; - while((opt = getopt_long(argc, argv, "hVveqzr:s:t:p:a:f:o:u:n:c:l:y:m:k:d:A:B:w:x:", longopts, NULL)) != -1) { + while((opt = getopt_long(argc, argv, "hVveqzr:s:t:p:a:f:o:u:n:c:l:y:m:k:d:A:B:w:x:S:", longopts, NULL)) != -1) { switch(opt) { case 'h': LogPrintf("\nThis program dumps the media content streamed over rtmp.\n\n"); @@ -934,6 +936,7 @@ int main(int argc, char **argv) LogPrintf("--rtmp|-r url URL (e.g. rtmp//hotname[:port]/path)\n"); LogPrintf("--host|-n hostname Overrides the hostname in the rtmp url\n"); LogPrintf("--port|-c port Overrides the port in the rtmp url\n"); + LogPrintf("--socks|-S host:port Use the specified SOCKS proxy\n"); LogPrintf("--protocol|-l Overrides the protocol in the rtmp url (0 - RTMP, 3 - RTMPE)\n"); LogPrintf("--playpath|-y Overrides the playpath parsed from rtmp url\n"); LogPrintf("--swfUrl|-s url URL to player swf file\n"); @@ -1095,6 +1098,9 @@ int main(int argc, char **argv) case 'z': debuglevel = LOGALL; break; + case 'S': + sockshost = optarg; + break; default: LogPrintf("unknown option: %c\n", opt); break; @@ -1177,7 +1183,7 @@ int main(int argc, char **argv) memset(buffer, 0, bufferSize); CRTMP *rtmp = new CRTMP(); - rtmp->SetupStream(protocol, hostname, port, playpath, tcUrl, swfUrl, + rtmp->SetupStream(protocol, hostname, port, sockshost, playpath, tcUrl, swfUrl, pageUrl, app, auth, swfHash, swfSize, flashVer, subscribepath, dSeek, bLiveStream, timeout);

1 0