November 2013 - rtmpdump - lists.mplayerhq.hu

[PATCH] Extended timestamp field may be present in type 3 chunk headers
by Martin Panter 03 Mar '14

03 Mar '14

>From c5a88e2ba458588b4b88a4e5b1411c9ee9c03afb Mon Sep 17 00:00:00 2001 From: Martin Panter <vadmium à gmail·com> Date: Wed, 18 Sep 2013 11:58:01 +1000 Subject: [PATCH] Extended timestamp field may be present in type 3 chunk headers MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit As described in Adobe’s RTMP specification dated 21 Dec 2012; also: * RTMPY ticket #107, “Compressed headers also can have an extended timestamp”, http://web.archive.org/web/20120624031323/http://dev.rtmpy.org/ticket/107 * https://rarut.wordpress.com/2012/03/21/announcing-nginx-rtmp-module/ This resolves intermittent hangs, segfaults and crashes I was seeing when starting ABC News 24 streams, e.g.: rtmpdump -r rtmp://cp81899.live.edgefcs.net/live/news24-med@28772 --live Some of the packets seemed to contain junk timestamp fields, which often required the extended field. --- Original in case G Mail messes this up: https://github.com/vadmium/rtmpdump/commit/c5a88e2.patch librtmp/rtmp.c | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/librtmp/rtmp.c b/librtmp/rtmp.c index 014ff8b..91ad27f 100644 --- a/librtmp/rtmp.c +++ b/librtmp/rtmp.c @@ -3573,6 +3573,7 @@ RTMP_ReadPacket(RTMP *r, RTMPPacket *packet) char *header = (char *)hbuf; int nSize, hSize, nToRead, nChunk; int didAlloc = FALSE; + int extendedTimestamp; RTMP_Log(RTMP_LOGDEBUG2, "%s: fd=%d", __FUNCTION__, r->m_sb.sb_socket); @@ -3675,17 +3676,19 @@ RTMP_ReadPacket(RTMP *r, RTMPPacket *packet) packet->m_nInfoField2 = DecodeInt32LE(header + 7); } } - if (packet->m_nTimeStamp == 0xffffff) + } + + extendedTimestamp = packet->m_nTimeStamp == 0xffffff; + if (extendedTimestamp) + { + if (ReadN(r, header + nSize, 4) != 4) { - if (ReadN(r, header + nSize, 4) != 4) - { - RTMP_Log(RTMP_LOGERROR, "%s, failed to read extended timestamp", - __FUNCTION__); - return FALSE; - } - packet->m_nTimeStamp = AMF_DecodeInt32(header + nSize); - hSize += 4; + RTMP_Log(RTMP_LOGERROR, "%s, failed to read extended timestamp", + __FUNCTION__); + return FALSE; } + packet->m_nTimeStamp = AMF_DecodeInt32(header + nSize); + hSize += 4; } RTMP_LogHexString(RTMP_LOGDEBUG2, (uint8_t *)hbuf, hSize); @@ -3730,6 +3733,10 @@ RTMP_ReadPacket(RTMP *r, RTMPPacket *packet) if (!r->m_vecChannelsIn[packet->m_nChannel]) r->m_vecChannelsIn[packet->m_nChannel] = malloc(sizeof(RTMPPacket)); memcpy(r->m_vecChannelsIn[packet->m_nChannel], packet, sizeof(RTMPPacket)); + if (extendedTimestamp) + { + r->m_vecChannelsIn[packet->m_nChannel]->m_nTimeStamp = 0xffffff; + } if (RTMPPacket_IsReady(packet)) { -- 1.8.3.4

2 4

Help using rtmpdump
by Andrea 16 Nov '13

16 Nov '13

Hi, I am trying to use rtmpdump and I get the following error rtmpdump -r "rtmpe://groupemsix.fcod.llnwd.net/a2883/e1/mp4:production/regienum/Enquete-…" --swfVfy http://www.6play.fr/rel-3/M6ReplayV3Application-3.swf -m 10 RTMPDump v2.4 (c) 2010 Andrej Stepanchuk, Howard Chu, The Flvstreamer Team; license: GPL WARNING: You haven't specified an output file (-o filename), using stdout Connecting ... WARNING: HandShake: Type mismatch: client sent 6, server answered 9 INFO: Connected... ERROR: Closing connection: NetStream.Failed I have no idea what could be wrong here (wrong url, wrong swf, server version 6 vs 9...) The handshake seems to indicate rtmpdump cannot support this server, but I am not sure what to investigate. Any idea?

1 0

[PATCH] Resuming for files larger than 4 GB (and 2 GB as well)
by ze bop 16 Nov '13

16 Nov '13

commit df503880ca21179d1bcf90c790ef7e0a3a4acbb3 Author: nospam <no(a)spam.com> Date: Sat Nov 16 19:53:08 2013 +0400 Resuming for files larger than 4 GB (and 2 GB as well). Tested on Windows only. diff --git a/rtmpdump.c b/rtmpdump.c index 13741a7..103e07f 100644 --- a/rtmpdump.c +++ b/rtmpdump.c @@ -36,10 +36,12 @@ #ifdef WIN32 #define fseeko fseeko64 #define ftello ftello64 +typedef off64_t z_off_t; #include <io.h> #include <fcntl.h> #define SET_BINMODE(f) setmode(fileno(f), O_BINARY) #else +typedef off_t z_off_t; #define SET_BINMODE(f) #endif @@ -133,7 +135,7 @@ static const AVal av_true = AVC("true"); int OpenResumeFile(const char *flvFile, // file name [in] FILE ** file, // opened file [out] - off_t * size, // size of the file [out] + z_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] @@ -148,9 +150,9 @@ OpenResumeFile(const char *flvFile, // file name [in] if (!*file) return RD_SUCCESS; // RD_SUCCESS, because we go to fresh file mode instead of quiting - fseek(*file, 0, SEEK_END); + fseeko(*file, 0, SEEK_END); *size = ftello(*file); - fseek(*file, 0, SEEK_SET); + fseeko(*file, 0, SEEK_SET); if (*size > 0) { @@ -178,7 +180,7 @@ OpenResumeFile(const char *flvFile, // file name [in] } uint32_t dataOffset = AMF_DecodeInt32(hbuf + 5); - fseek(*file, dataOffset, SEEK_SET); + fseeko(*file, dataOffset, SEEK_SET); if (fread(hbuf, 1, 4, *file) != 4) { @@ -194,7 +196,7 @@ OpenResumeFile(const char *flvFile, // file name [in] } // go through the file to find the meta data! - off_t pos = dataOffset + 4; + z_off_t pos = dataOffset + 4; int bFoundMetaHeader = FALSE; while (pos < *size - 4 && !bFoundMetaHeader) @@ -282,12 +284,12 @@ GetLastKeyframe(FILE * file, // output file [in] char buffer[bufferSize]; uint8_t dataType; int bAudioOnly; - off_t size; + z_off_t size; - fseek(file, 0, SEEK_END); + fseeko(file, 0, SEEK_END); size = ftello(file); - fseek(file, 4, SEEK_SET); + fseeko(file, 4, SEEK_SET); if (fread(&dataType, sizeof(uint8_t), 1, file) != 1) return RD_FAILED; @@ -301,7 +303,7 @@ GetLastKeyframe(FILE * file, // output file [in] //if(!bAudioOnly) // we have to handle video/video+audio different since we have non-seekable frames //{ // find the last seekable frame - off_t tsize = 0; + z_off_t tsize = 0; uint32_t prevTagSize = 0; // go through the file and find the last video keyframe @@ -447,7 +449,7 @@ Download(RTMP * rtmp, // connected RTMP object int bufferSize = 64 * 1024; char *buffer; int nRead = 0; - off_t size = ftello(file); + z_off_t size = ftello(file); unsigned long lastPercent = 0; rtmp->m_read.timestamp = dSeek; @@ -1213,7 +1215,7 @@ main(int argc, char **argv) if (!bLiveStream && !bRealtimeStream && !(protocol & RTMP_FEATURE_HTTP)) rtmp.Link.lFlags |= RTMP_LF_BUFX; - off_t size = 0; + z_off_t size = 0; // ok, we have to get the timestamp of the last keyframe (only keyframes are seekable) / last audio frame (audio only streams) if (bResume)

1 0

Closing connection
by Блогер 12 Nov '13

12 Nov '13

Trying to watch "rtmp://89.151.130.109/live/livestream" with command rtmpdump --skip 64 -r addr_above --flv - RTMPDump v2.4 (c) 2010 Andrej Stepanchuk, Howard Chu, The Flvstreamer Team; license: GPL Connecting ... WARNING: HandShake: client signature does not match! INFO: Connected... ERROR: Closing connection: NetStream.Play.StreamNotFound What is going wrong? -- () кампания ASCII Ribbon - против писем в HTML формате /\ www.asciiribbon.org - против проприетарных вложений

1 0