September 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

Problem running git master rtmpdump
by Matt Hirsch 28 Sep '13

28 Sep '13

I cloned rtmpdump master from git today: git clone git://git.ffmpeg.org/rtmpdump I'm having trouble running the code. Bizarrely, the RTMP structure seems to have different sizes in main() and RTMP_Init(). I've set the CFLAGS to -O0 -g to aid in debugging. What could be going on here? $ gcc -v Using built-in specs. COLLECT_GCC=gcc COLLECT_LTO_WRAPPER=/usr/libexec/gcc/x86_64-redhat-linux/4.8.1/lto-wrapper Target: x86_64-redhat-linux Configured with: ../configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info --with-bugurl=http://bugzilla.redhat.com/bugzilla --enable-bootstrap --enable-shared --enable-threads=posix --enable-checking=release --with-system-zlib --enable-__cxa_atexit --disable-libunwind-exceptions --enable-gnu-unique-object --enable-linker-build-id --with-linker-hash-style=gnu --enable-languages=c,c++,objc,obj-c++,java,fortran,ada,go,lto --enable-plugin --enable-initfini-array --enable-java-awt=gtk --disable-dssi --with-java-home=/usr/lib/jvm/java-1.5.0-gcj-1.5.0.0/jre --enable-libgcj-multifile --enable-java-maintainer-mode --with-ecj-jar=/usr/share/java/eclipse-ecj.jar --disable-libjava-multilib --with-isl=/builddir/build/BUILD/gcc-4.8.1-20130603/obj-x86_64-redhat-linux/isl-install --with-cloog=/builddir/build/BUILD/gcc-4.8.1-20130603/obj-x86_64-redhat-linux/cloog-install --with-tune=generic --with-arch_32=i686 --build=x86_64-redhat-linux Thread model: posix gcc version 4.8.1 20130603 (Red Hat 4.8.1-1) (GCC) $ gdb ./rtmpdump GNU gdb (GDB) Fedora 7.6.1-41.fc19 Copyright (C) 2013 Free Software Foundation, Inc. License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html> This is free software: you are free to change and redistribute it. There is NO WARRANTY, to the extent permitted by law. Type "show copying" and "show warranty" for details. This GDB was configured as "x86_64-redhat-linux-gnu". For bug reporting instructions, please see: <http://www.gnu.org/software/gdb/bugs/>... Reading symbols from /home/mhirsch/rtmpdump/rtmpdump...done. (gdb) run Starting program: /home/mhirsch/rtmpdump/./rtmpdump [Thread debugging using libthread_db enabled] Using host libthread_db library "/lib64/libthread_db.so.1". RTMPDump v2.4 (c) 2010 Andrej Stepanchuk, Howard Chu, The Flvstreamer Team; license: GPL Program received signal SIGSEGV, Segmentation fault. __memset_sse2 () at ../sysdeps/x86_64/memset.S:909 909 movntdq %xmm0,0x20(%rdi) Missing separate debuginfos, use: debuginfo-install gnome-keyring-3.8.2-1.fc19.x86_64 keyutils-libs-1.5.6-1.fc19.x86_64 libselinux-2.1.13-15.fc19.x86_64 nss-softokn-freebl-3.15.1-1.fc19.x86_64 (gdb) up #1 0x0000003d08606590 in memset (__len=1329016, __ch=0, __dest=0x7fffffff9ee0) at /usr/include/bits/string3.h:84 warning: Source file is more recent than executable. 84 return __builtin___memset_chk (__dest, __ch, __len, __bos0 (__dest)); (gdb) up #2 RTMP_Init (r=0x7fffffff9ee0) at rtmp.c:250 250 memset(r, 0, sizeof(RTMP)); (gdb) print sizeof(RTMP) $1 = 1329016 (gdb) up #3 0x0000000000403295 in main (argc=1, argv=0x7fffffffe398) at rtmpdump.c:819 819 RTMP_Init(&rtmp); (gdb) print sizeof(RTMP) $2 = 17088 (gdb) quit

2 1

Re: [rtmpdump] Problem running git master rtmpdump
by Matt Hirsch 28 Sep '13

28 Sep '13

On Thu, Sep 26, 2013 at 4:26 AM, Matt Hirsch <matthew.hirsch(a)gmail.com> wrote: > I cloned rtmpdump master from git today: git clone git://git.ffmpeg.org/rtmpdump > > I'm having trouble running the code. Bizarrely, the RTMP structure > seems to have different sizes in main() and RTMP_Init(). I've set the > CFLAGS to -O0 -g to aid in debugging. What could be going on here? Ah, silly me. I was mixing the installed librtmp library with the newly compiled rtmpdump binary. Using LD_LIBRARY_PATH to point to the correct library solved it.

1 0

does RTMP_Read() return a full video frame?
by Rich Rodecker 23 Sep '13

23 Sep '13

I know RTMP_Read gets a media packet, but I can't tell if a video packet would contain a full video frame or not.

2 1

regression in commit 8880d1456b282ee79979adbe7b6a6eb8ad371081
by Cary W. 01 Sep '13

01 Sep '13

Hi, After updating to the latest rtmpdump, I found that connecting to this rtmp server no longer works correctly: rtmpdump --host cp80909.live.edgefcs.net --playpath VAN1049_AAC@33917 --app live?ovpfv=2.1.4 --tcUrl rtmp:// cp80909.live.edgefcs.net:1935/live?ovpfv=2.1.4 -v most of the time it would just freeze after receiving a few kilobytes, or when connecting. After some testing, I narrowed it down to commit 8880d1456b282ee79979adbe7b6a6eb8ad371081 (Unexpected BW Response Fix). After reverting that commit on top of the tip of the git history, the newest (git) version worked too.

1 0