January 2014 - 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

Re: [rtmpdump] rtmpdump not detecting playpath
by Susi Lehtola 13 Jan '14

13 Jan '14

On Mon, 13 Jan 2014 14:04:38 +1100 Martin Panter <vadmium(a)gmail.com> wrote: > Hi Susi, perhaps this message from message from Howard Chu would be > interesting to you or your playpath bug reporter: “Users should just > learn to explicitly pass the app and playpath and not rely on the > builtin parser at all.” > > https://lists.mplayerhq.hu/pipermail/rtmpdump/2013-May/002304.html Hi, this is actually something along the lines I initially suspected, thanks. -- Susi Lehtola susi.lehtola(a)iki.fi

1 0

Re: [rtmpdump] rtmpdump not detecting playpath
by Martin Panter 13 Jan '14

13 Jan '14

Hi Susi, perhaps this message from message from Howard Chu would be interesting to you or your playpath bug reporter: “Users should just learn to explicitly pass the app and playpath and not rely on the builtin parser at all.” https://lists.mplayerhq.hu/pipermail/rtmpdump/2013-May/002304.html

1 0

rtmpdump not detecting playpath
by Susi Lehtola 08 Jan '14

08 Jan '14

Hi, I'm the new maintainer of the rtmpdump package in RPMFusion (for the Fedora linux distribution). The package hadn't been updated for a couple of years, and I just updated it to the newest SCM snapshot, but I already got a bug report on it. See below (copied from https://bugzilla.rpmfusion.org/show_bug.cgi?id=3113) Susi ** With previous version rtmpdump-2.4-0.3.20110811gitc58cfb3e.fc19.i686 playpathin this example detected fine as mp4:demo/sample (and right app wizard/_definst_) $ rtmpdump -V -r rtmp://draco.streamingwizard.com/wizard/_definst_/demo/sample.mp4 -o sample.mp4 RTMPDump v2.4 (c) 2010 Andrej Stepanchuk, Howard Chu, The Flvstreamer Team; license: GPL DEBUG: Parsing... DEBUG: Parsed protocol: 0 DEBUG: Parsed host : draco.streamingwizard.com DEBUG: Parsed app : wizard/_definst_ DEBUG: Protocol : RTMP DEBUG: Hostname : draco.streamingwizard.com DEBUG: Port : 1935 DEBUG: Playpath : mp4:demo/sample DEBUG: tcUrl : rtmp://draco.streamingwizard.com:1935/wizard/_definst_ DEBUG: app : wizard/_definst_ DEBUG: live : no DEBUG: timeout : 30 sec DEBUG: Setting buffer time to: 36000000ms But with new version wrong playpath detected (mp4:sample) and wrong app (wizard/_definst_/demo). $ rtmpdump -V -r rtmp://draco.streamingwizard.com/wizard/_definst_/demo/sample.mp4 -osample.mp4 RTMPDump v2.4 (c) 2010 Andrej Stepanchuk, Howard Chu, The Flvstreamer Team; license: GPL DEBUG: Parsing... DEBUG: Parsed protocol: 0 DEBUG: Parsed host : draco.streamingwizard.com DEBUG: Parsed app : wizard/_definst_/demo DEBUG: Protocol : RTMP DEBUG: Hostname : draco.streamingwizard.com DEBUG: Port : 1935 DEBUG: Playpath : mp4:sample DEBUG: tcUrl : rtmp://draco.streamingwizard.com:1935/wizard/_definst_/demo DEBUG: app : wizard/_definst_/demo DEBUG: live : no DEBUG: timeout : 30 sec DEBUG: Setting buffer time to: 36000000ms Connecting ... DEBUG: RTMP_Connect1, ... connected, handshaking DEBUG: HandShake: Type Answer : 03 DEBUG: HandShake: Server Uptime : 96850052 DEBUG: HandShake: FMS Version : 3.0.1.1 DEBUG: HandShake: Handshaking finished.... DEBUG: RTMP_Connect1, handshaked DEBUG: Invoking connect INFO: Connected... DEBUG: HandleServerBW: server BW = 2500000 DEBUG: HandleClientBW: client BW = 2500000 2 DEBUG: HandleCtrl, received ctrl. type: 0, len: 6 DEBUG: HandleCtrl, Stream Begin 0 DEBUG: HandleChangeChunkSize, received: chunk size change to 4096 DEBUG: RTMP_ClientPacket, received: invoke 261 bytes DEBUG: (object begin) DEBUG: (object begin) DEBUG: Property: <Name: fmsVer, STRING: FMS/3,5,7,7009> DEBUG: Property: <Name: capabilities, NUMBER: 31.00> DEBUG: Property: <Name: mode, NUMBER: 1.00> DEBUG: (object end) DEBUG: (object begin) DEBUG: Property: <Name: level, STRING: status> DEBUG: Property: <Name: code, STRING: NetConnection.Connect.Success> DEBUG: Property: <Name: description, STRING: Connection succeeded.> DEBUG: Property: <Name: data, ECMA_ARRAY> DEBUG: (object begin) DEBUG: Property: <Name: version, STRING: 3,5,7,7009> DEBUG: (object end) DEBUG: Property: <Name: clientid, NUMBER: 60311607.00> DEBUG: Property: <Name: objectEncoding, NUMBER: 0.00> DEBUG: (object end) DEBUG: (object end) DEBUG: HandleInvoke, server invoking <_result> DEBUG: HandleInvoke, received result for method call <connect> DEBUG: sending ctrl. type: 0x0003 DEBUG: Invoking createStream DEBUG: RTMP_ClientPacket, received: invoke 29 bytes DEBUG: (object begin) DEBUG: Property: NULL DEBUG: (object end) DEBUG: HandleInvoke, server invoking <_result> DEBUG: HandleInvoke, received result for method call <createStream> DEBUG: SendPlay, seekTime=0, stopTime=0, sending play: mp4:sample DEBUG: Invoking play DEBUG: sending ctrl. type: 0x0003 DEBUG: RTMP_ClientPacket, received: invoke 171 bytes DEBUG: (object begin) DEBUG: Property: NULL DEBUG: (object begin) DEBUG: Property: <Name: level, STRING: error> DEBUG: Property: <Name: code, STRING: NetStream.Play.StreamNotFound> DEBUG: Property: <Name: description, STRING: Failed to play sample; stream not found.> DEBUG: Property: <Name: clientid, NUMBER: 60311607.00> DEBUG: Property: <Name: details, STRING: sample> DEBUG: (object end) DEBUG: (object end) DEBUG: HandleInvoke, server invoking <onStatus> DEBUG: HandleInvoke, onStatus: NetStream.Play.StreamNotFound ERROR: Closing connection: NetStream.Play.StreamNotFound DEBUG: Closing connection. So rtmpdump-2.4-1.20131205.gitdc76f0a.fc20 needs at least additional parameter "-y mp4:demo/sample" which was not needed with previous version. -- Susi Lehtola susi.lehtola(a)iki.fi

1 0