July 2011 - rtmpdump - lists.mplayerhq.hu

rutube.ru dumping stopped working: ERROR: RTMP_ReadPacket, failed to read RTMP packet header
by al_9x＠yahoo.com 05 Nov '11

05 Nov '11

xp sp3, rtmpdump 2.3, confirmed on several videos rtmpdump params obtained from rtmpsrv download starts, but after ~2MB there is an error: "ERROR: RTMP_ReadPacket, failed to read RTMP packet header" rtmpdump pegs the cpu/core and nothing more is downloaded example: http://rutube.ru/tracks/4322127.html?v=5aecd537dc35d7723f00f93db4c4eafc rtmpdump command: rtmpdump -r "rtmp://video-1-14.rutube.ru:1935/rutube_vod_2/" -a "rutube_vod_2/" -f "WIN 10,3,180,65" -W "http://rutube.ru/player.swf" -p "http://rutube.ru/tracks/4322127.html?v=5aecd537dc35d7723f00f93db4c4eafc" -y "mp4:vol23/movies/5a/ec/5aecd537dc35d7723f00f93db4c4eafc.mp4?e=1302852600&s=48aa7c24f91beb34c8394e339c239c33&blid=10b34437e24fb557ae0525243039e3d3" -o 5aecd537dc35d7723f00f93db4c4eafc.flv

5 14

[PATCH] AMF Object Callback
by Chris Larsen 29 Aug '11

29 Aug '11

Hello, the attached patch is a re-submit of one I posted earlier. It adds an AMF callback method that lets the client application work directly with received AMF objects to parse them for information like LLNW or Akamai authentication instead of having to build custom stuff like that directly into rtmpdump. Please let me know if the patch is bad or you find something wrong with it. Thanks.

3 12

How to submit a patch
by Казаков Виктор 02 Aug '11

02 Aug '11

Hello all! I've recently came across an issue with publishing RTMP (librtmp). Publishing was just stopping after some time. I found a bug in the code, made a patch, and now it works fine. I'd like to share this patch with everyone. How do I do that? Thanks! Viktor

7 16

branch master updated. f1abda0 Cleanup previous commit
by gil＠avcodec.org 31 Jul '11

31 Jul '11

The branch, master has been updated via f1abda046ca5a3f1efa63033c542e686b43dbcf3 (commit) via 024d201c36e1b40f4f4d473e87d405e1b411230f (commit) from ec422962d58b8e0d9bfcf0af6e450e0e349947da (commit) - Log ----------------------------------------------------------------- commit f1abda046ca5a3f1efa63033c542e686b43dbcf3 Author: Howard Chu <hyc(a)highlandsun.com> AuthorDate: Sun Jul 31 13:21:12 2011 -0700 Commit: Howard Chu <hyc(a)highlandsun.com> CommitDate: Sun Jul 31 13:21:12 2011 -0700 Cleanup previous commit diff --git a/rtmpsrv.c b/rtmpsrv.c index 805ce0d..b45aae3 100644 --- a/rtmpsrv.c +++ b/rtmpsrv.c @@ -1,6 +1,6 @@ /* Simple RTMP Server * Copyright (C) 2009 Andrej Stepanchuk - * Copyright (C) 2009 Howard Chu + * Copyright (C) 2009-2011 Howard Chu * * This Program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -95,7 +95,10 @@ STREAMING_SERVER *rtmpServer = 0; // server structure pointer STREAMING_SERVER *startStreaming(const char *address, int port); void stopStreaming(STREAMING_SERVER * server); -char *strreplace(char *srcstr, int srclen, char *orig, char *repl); +void AVreplace(AVal *src, const AVal *orig, const AVal *repl); + +static const AVal av_dquote = AVC("\""); +static const AVal av_escdquote = AVC("\\\""); typedef struct { @@ -579,10 +582,12 @@ ServeInvoke(STREAMING_SERVER *server, RTMP * r, RTMPPacket *packet, unsigned int } else if (AVMATCH(&method, &av_NetStream_Authenticate_UsherToken)) { - AMFObjectProperty *prop = AMF_GetProp(&obj, NULL, 3); - AMFProp_GetString(prop, &r->Link.usherToken); - prop->p_vu.p_aval.av_len = 0; - prop->p_vu.p_aval.av_val = NULL; + AVal usherToken; + AMFProp_GetString(AMF_GetProp(&obj, NULL, 3), &usherToken); + AVreplace(&usherToken, &av_dquote, &av_escdquote); + server->arglen += 6 + usherToken.av_len; + server->argc += 2; + r->Link.usherToken = usherToken; } else if (AVMATCH(&method, &av_play)) { @@ -600,11 +605,10 @@ ServeInvoke(STREAMING_SERVER *server, RTMP * r, RTMPPacket *packet, unsigned int if (r->Link.tcUrl.av_len) { len = server->arglen + r->Link.playpath.av_len + 4 + - sizeof("rtmpdump") + r->Link.playpath.av_len + 12 + - r->Link.usherToken.av_len + 64; + sizeof("rtmpdump") + r->Link.playpath.av_len + 12; server->argc += 5; - cmd = malloc(len + (server->argc + 2) * sizeof(AVal)); + cmd = malloc(len + server->argc * sizeof(AVal)); ptr = cmd; argv = (AVal *)(cmd + len); argv[0].av_val = cmd; @@ -650,17 +654,17 @@ ServeInvoke(STREAMING_SERVER *server, RTMP * r, RTMPPacket *packet, unsigned int ptr += sprintf(ptr, " -p \"%s\"", r->Link.pageUrl.av_val); argv[argc++].av_len = r->Link.pageUrl.av_len; } - if (r->Link.usherToken.av_val) - { - char *usherToken = strreplace(r->Link.usherToken.av_val, r->Link.usherToken.av_len, "\"", "\\\""); + if (r->Link.usherToken.av_val) + { argv[argc].av_val = ptr + 1; - argv[argc++].av_len = 5; - argv[argc].av_val = ptr + 8; - ptr += sprintf(ptr, " --jtv \"%s\"", usherToken); - argv[argc++].av_len = strlen(usherToken); - server->argc += 2; - free(usherToken); - } + argv[argc++].av_len = 2; + argv[argc].av_val = ptr + 5; + ptr += sprintf(ptr, " -j \"%s\"", r->Link.usherToken.av_val); + argv[argc++].av_len = r->Link.usherToken.av_len; + free(r->Link.usherToken.av_val); + r->Link.usherToken.av_val = NULL; + r->Link.usherToken.av_len = 0; + } if (r->Link.extras.o_num) { ptr = dumpAMF(&r->Link.extras, ptr, argv, &argc); AMF_Reset(&r->Link.extras); @@ -932,6 +936,11 @@ cleanup: rtmp.Link.pageUrl.av_val = NULL; rtmp.Link.app.av_val = NULL; rtmp.Link.flashVer.av_val = NULL; + if (rtmp.Link.usherToken.av_val) + { + free(rtmp.Link.usherToken.av_val); + rtmp.Link.usherToken.av_val = NULL; + } RTMP_LogPrintf("done!\n\n"); quit: @@ -1133,38 +1142,42 @@ main(int argc, char **argv) return nStatus; } -char * -strreplace(char *srcstr, int srclen, char *orig, char *repl) +void +AVreplace(AVal *src, const AVal *orig, const AVal *repl) { - char *ptr = NULL, *srcstrstart = srcstr; - int origlen = strlen(orig); - int repllen = strlen(repl); - if (!srclen) - srclen = strlen(srcstr); - char *srcend = srcstr + srclen; - int deststrbuffer = srclen / origlen * repllen; - if (deststrbuffer < srclen) - deststrbuffer = srclen; - char *deststr = calloc(deststrbuffer + 1, sizeof(char)); - char *deststrstart = deststr; - - if ( (ptr = strstr(srcstr, orig)) ) - { - do + char *srcbeg = src->av_val; + char *srcend = src->av_val + src->av_len; + char *dest, *sptr, *dptr; + int n = 0; + + /* count occurrences of orig in src */ + sptr = src->av_val; + while (sptr < srcend && (sptr = strstr(sptr, orig->av_val))) { - int len = ptr - srcstrstart; - memcpy(deststrstart, srcstrstart, len); - srcstrstart += len + origlen; - deststrstart += len; - memcpy(deststrstart, repl, repllen); - deststrstart += repllen; - ptr = strstr(srcstrstart, orig); + n++; + sptr += orig->av_len; } - while (ptr && (ptr < srcend)); - strncpy(deststrstart, srcstrstart, srcend-srcstrstart); - return deststr; - } + if (!n) + return; - strncpy(deststr, srcstr, srclen); - return deststr; + dest = malloc(src->av_len + 1 + (repl->av_len - orig->av_len) * n); + + sptr = src->av_val; + dptr = dest; + while (sptr < srcend && (sptr = strstr(sptr, orig->av_val))) + { + n = sptr - srcbeg; + memcpy(dptr, srcbeg, n); + srcbeg += n; + dptr += n; + memcpy(dptr, repl->av_val, repl->av_len); + dptr += repl->av_len; + sptr += orig->av_len; + } + n = srcend - srcbeg; + memcpy(dptr, srcbeg, n); + dptr += n; + *dptr = '\0'; + src->av_val = dest; + src->av_len = dptr - dest; } commit 024d201c36e1b40f4f4d473e87d405e1b411230f Author: KSV <faltuvisitor(a)yahoo.co.in> AuthorDate: Sun Jul 31 12:33:46 2011 -0700 Commit: Howard Chu <hyc(a)highlandsun.com> CommitDate: Sun Jul 31 13:20:36 2011 -0700 Justin.TV usherToken detection diff --git a/rtmpsrv.c b/rtmpsrv.c index f1b6c66..805ce0d 100644 --- a/rtmpsrv.c +++ b/rtmpsrv.c @@ -95,6 +95,7 @@ STREAMING_SERVER *rtmpServer = 0; // server structure pointer STREAMING_SERVER *startStreaming(const char *address, int port); void stopStreaming(STREAMING_SERVER * server); +char *strreplace(char *srcstr, int srclen, char *orig, char *repl); typedef struct { @@ -261,6 +262,7 @@ static const AVal av_NetStream_Play_Stop = AVC("NetStream.Play.Stop"); static const AVal av_Stopped_playing = AVC("Stopped playing"); SAVC(details); SAVC(clientid); +static const AVal av_NetStream_Authenticate_UsherToken = AVC("NetStream.Authenticate.UsherToken"); static int SendPlayStart(RTMP *r) @@ -575,6 +577,13 @@ ServeInvoke(STREAMING_SERVER *server, RTMP * r, RTMPPacket *packet, unsigned int { SendResultNumber(r, txn, 10.0); } + else if (AVMATCH(&method, &av_NetStream_Authenticate_UsherToken)) + { + AMFObjectProperty *prop = AMF_GetProp(&obj, NULL, 3); + AMFProp_GetString(prop, &r->Link.usherToken); + prop->p_vu.p_aval.av_len = 0; + prop->p_vu.p_aval.av_val = NULL; + } else if (AVMATCH(&method, &av_play)) { char *file, *p, *q, *cmd, *ptr; @@ -591,10 +600,11 @@ ServeInvoke(STREAMING_SERVER *server, RTMP * r, RTMPPacket *packet, unsigned int if (r->Link.tcUrl.av_len) { len = server->arglen + r->Link.playpath.av_len + 4 + - sizeof("rtmpdump") + r->Link.playpath.av_len + 12; + sizeof("rtmpdump") + r->Link.playpath.av_len + 12 + + r->Link.usherToken.av_len + 64; server->argc += 5; - cmd = malloc(len + server->argc * sizeof(AVal)); + cmd = malloc(len + (server->argc + 2) * sizeof(AVal)); ptr = cmd; argv = (AVal *)(cmd + len); argv[0].av_val = cmd; @@ -640,6 +650,17 @@ ServeInvoke(STREAMING_SERVER *server, RTMP * r, RTMPPacket *packet, unsigned int ptr += sprintf(ptr, " -p \"%s\"", r->Link.pageUrl.av_val); argv[argc++].av_len = r->Link.pageUrl.av_len; } + if (r->Link.usherToken.av_val) + { + char *usherToken = strreplace(r->Link.usherToken.av_val, r->Link.usherToken.av_len, "\"", "\\\""); + argv[argc].av_val = ptr + 1; + argv[argc++].av_len = 5; + argv[argc].av_val = ptr + 8; + ptr += sprintf(ptr, " --jtv \"%s\"", usherToken); + argv[argc++].av_len = strlen(usherToken); + server->argc += 2; + free(usherToken); + } if (r->Link.extras.o_num) { ptr = dumpAMF(&r->Link.extras, ptr, argv, &argc); AMF_Reset(&r->Link.extras); @@ -1111,3 +1132,39 @@ main(int argc, char **argv) #endif return nStatus; } + +char * +strreplace(char *srcstr, int srclen, char *orig, char *repl) +{ + char *ptr = NULL, *srcstrstart = srcstr; + int origlen = strlen(orig); + int repllen = strlen(repl); + if (!srclen) + srclen = strlen(srcstr); + char *srcend = srcstr + srclen; + int deststrbuffer = srclen / origlen * repllen; + if (deststrbuffer < srclen) + deststrbuffer = srclen; + char *deststr = calloc(deststrbuffer + 1, sizeof(char)); + char *deststrstart = deststr; + + if ( (ptr = strstr(srcstr, orig)) ) + { + do + { + int len = ptr - srcstrstart; + memcpy(deststrstart, srcstrstart, len); + srcstrstart += len + origlen; + deststrstart += len; + memcpy(deststrstart, repl, repllen); + deststrstart += repllen; + ptr = strstr(srcstrstart, orig); + } + while (ptr && (ptr < srcend)); + strncpy(deststrstart, srcstrstart, srcend-srcstrstart); + return deststr; + } + + strncpy(deststr, srcstr, srclen); + return deststr; +} ----------------------------------------------------------------------- Summary of changes: rtmpsrv.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 71 insertions(+), 1 deletions(-) hooks/post-receive --

1 0

[PATCH] Detection of UsherAuthentication token by rtmpsrv
by KSV 31 Jul '11

31 Jul '11

Hi all, Patch to auto detect the UsherAuthentication token used by Justin.tv is attached herewith. Regards KSV

1 0

branch master updated. ec42296 Darwin dylib updates
by gil＠avcodec.org 29 Jul '11

29 Jul '11

The branch, master has been updated via ec422962d58b8e0d9bfcf0af6e450e0e349947da (commit) from b627335dc37fd5265ac6d23a441ee2d89ab503c8 (commit) - Log ----------------------------------------------------------------- commit ec422962d58b8e0d9bfcf0af6e450e0e349947da Author: Scott D. Davilla <davilla(a)xbmc.org> AuthorDate: Fri Jul 29 11:26:35 2011 -0700 Commit: Howard Chu <hyc(a)highlandsun.com> CommitDate: Fri Jul 29 11:26:35 2011 -0700 Darwin dylib updates Bring in line with current practice for Darwin dynamic libs diff --git a/librtmp/Makefile b/librtmp/Makefile index b88baf4..a0125f1 100644 --- a/librtmp/Makefile +++ b/librtmp/Makefile @@ -52,8 +52,8 @@ SODIR_mingw=$(BINDIR) SODIR=$(SODIR_$(SYS)) SO_LDFLAGS_posix=-shared -Wl,-soname,$@ -SO_LDFLAGS_darwin=-dynamiclib -flat_namespace -undefined suppress -fno-common \ - -headerpad_max_install_names +SO_LDFLAGS_darwin=-dynamiclib -twolevel_namespace -undefined dynamic_lookup \ + -fno-common -headerpad_max_install_names -install_name $(libdir)/$@ SO_LDFLAGS_mingw=-shared -Wl,--out-implib,librtmp.dll.a SO_LDFLAGS=$(SO_LDFLAGS_$(SYS)) ----------------------------------------------------------------------- Summary of changes: librtmp/Makefile | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) hooks/post-receive --

1 0

RTMPDUMP v2.4 error message libz-1.dll is was not found
by Steven Penny 27 Jul '11

27 Jul '11

On Wed, Jul 27, 2011 at 4:19 AM, Radoslav Stefanisin wrote: > I am just downloaded rtmpdump v2.4 from http://rtmpdump.mplayerhq.hu/, but I > can not launch this version under Windows XP OS. > > There is appeared error message "libz-1.dll is was not found". Ok i recompiled with static librtmp and static libz http://dl.dropbox.com/u/26639067/rtmpdump-20110723-git-b627335-win32.zip

2 1

Re: [rtmpdump] RTMPDUMP v2.4 error message libz-1.dll is was not found
by Steven Penny 27 Jul '11

27 Jul '11

On Wed, Jul 27, 2011 at 11:20 AM, <pnixte(a)gmail.com> wrote: > Could you share the "make" options for this static build? http://svnpenn.blogspot.com/2011/06/rtmpdump-mingw.html Install required packages mingw-get install libz mingw-get install msys-wget Install PolarSSL wget http://polarssl.org/code/releases/polarssl-0.14.3-gpl.tgz tar fx polarssl-0.14.3-gpl.tgz cd polarssl-0.14.3 make CC=gcc LDFLAGS="-L../library -lpolarssl -lws2_32" make DESTDIR=/MinGW install Install RTMPdump wget http://repo.or.cz/w/rtmpdump.git/snapshot/HEAD.tar.gz tar fx HEAD.tar.gz cd rtmpdump make SHARED= SYS=mingw CRYPTO=POLARSSL LIBZ="-lz -static" VERSION="2.4\ git-c28f1ba\ 2011-7-12" Optional, make librtmp.dll make SYS=mingw CRYPTO=POLARSSL LIBZ="-lz -static"

1 0

Re: [rtmpdump] Command to compile Windows build?
by Steven Penny 26 Jul '11

26 Jul '11

On Mon, Jul 25, 2011 at 12:47 PM, NokNok Developer wrote: > any chance i can get rtmp dll for windows? if you have a site will gladly > donate this URL now includes the DLL. the link on the RTMPdump page is missing the DLL because I did a static compile. http://dl.dropbox.com/u/26639067/rtmpdump-20110723-git-b627335-win32.zip

2 1

branch master updated. e82e3a1 update win32 binary from Steven Penny svnpenn gmail.
by gil＠avcodec.org 25 Jul '11

25 Jul '11

The branch, master has been updated via e82e3a18c146cae29a6b707c7e48023aa8a05bb4 (commit) from b3927d98d43ba56b7d5e3a76dc0c346a48736da6 (commit) - Log ----------------------------------------------------------------- commit e82e3a18c146cae29a6b707c7e48023aa8a05bb4 Author: Compn <tempn(a)twmi.rr.com> AuthorDate: Mon Jul 25 18:38:56 2011 -0400 Commit: Compn <tempn(a)twmi.rr.com> CommitDate: Mon Jul 25 18:38:56 2011 -0400 update win32 binary from Steven Penny svnpenn gmail. diff --git a/index.html b/index.html index bd200a4..6a07a21 100644 --- a/index.html +++ b/index.html @@ -96,9 +96,7 @@ relaying the data from the server to the client. 2010-06-30: Download source tarball <a href="download/rtmpdump-2.3.tgz">rtmpdump-2.3.tgz</a> -2010-06-30: Download Windows build <a href="download/rtmpdump-2.3-windows.zip">rtmpdump-2.3-windows.zip</a> - -2011-07-05: Download Windows build <a href="download/rtmpdump-GIT-050711.zip">rtmpdump-GIT-050711.zip</a> +2011-07-25: Download Windows build <a href="download/rtmpdump-20110723-git-b627335-win32.zip">rtmpdump-20110723-git-b627335-win32.zip</a> 2010-06-30: Download Android build <a href="download/rtmpdump-2.3-android.zip">rtmpdump-2.3-android.zip</a> ----------------------------------------------------------------------- Summary of changes: index.html | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) hooks/post-receive --

1 0