April 2010 - rtmpdump - lists.mplayerhq.hu

r455 - trunk/librtmp/parseurl.c
by hyc 29 Apr '10

29 Apr '10

Author: hyc Date: Fri Apr 30 01:33:33 2010 New Revision: 455 Log: Don't strip suffix if prefix was already present Modified: trunk/librtmp/parseurl.c Modified: trunk/librtmp/parseurl.c ============================================================================== --- trunk/librtmp/parseurl.c Thu Apr 29 20:31:05 2010 (r454) +++ trunk/librtmp/parseurl.c Fri Apr 30 01:33:33 2010 (r455) @@ -241,12 +241,20 @@ void RTMP_ParsePlaypath(AVal *in, AVal * return; 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; + if (addMP4) { + if (strncmp(ppstart, "mp4:", 4)) { + strcpy(destptr, "mp4:"); + destptr += 4; + } else { + subExt = 0; + } + } else if (addMP3) { + if (strncmp(ppstart, "mp3:", 4)) { + strcpy(destptr, "mp3:"); + destptr += 4; + } else { + subExt = 0; + } } for (p=(char *)ppstart; pplen >0;) {

1 0

r454 - web/index.html
by hyc 29 Apr '10

29 Apr '10

Author: hyc Date: Thu Apr 29 20:31:05 2010 New Revision: 454 Log: Update mplayer link Modified: web/index.html Modified: web/index.html ============================================================================== --- web/index.html Thu Apr 29 17:42:08 2010 (r453) +++ web/index.html Thu Apr 29 20:31:05 2010 (r454) @@ -6,7 +6,7 @@ <meta http-equiv="content-type" content="text/html;charset=utf-8"> </head> <body> -<h1>RTMP Dump</h1> +<h1>RTMPDump</h1> <p> rtmpdump is a toolkit for RTMP streams. All forms of RTMP are supported, @@ -124,7 +124,7 @@ Projects using rtmpdump: <a href="http://sourceforge.net/projects/mlbviewer/">mlbviewer</a><br> <a href="http://users.on.net/~m.elliott/i/index.html">iViewNapper</a><br> <a href="http://ffmpeg.org">FFmpeg</a> (uses librtmp)<br> -<a href="http://repo.or.cz/w/mplayer.git">MPlayer development branch</a> (ffmpeg+librtmp)<br> +<a href="http://repo.or.cz/w/mplayer-build.git">MPlayer</a> (ffmpeg+librtmp)<br> </p> <p> <br>

1 0

r453 - in trunk: Makefile librtmp/Makefile librtmp/dh.h librtmp/handshake.h librtmp/hashswf.c librtmp/rtmp.c librtmp/rtmp_sys.h
by hyc 29 Apr '10

29 Apr '10

Author: hyc Date: Thu Apr 29 17:42:08 2010 New Revision: 453 Log: Add support for polarssl, http://www.polarssl.org Modified: trunk/Makefile trunk/librtmp/Makefile trunk/librtmp/dh.h trunk/librtmp/handshake.h trunk/librtmp/hashswf.c trunk/librtmp/rtmp.c trunk/librtmp/rtmp_sys.h Modified: trunk/Makefile ============================================================================== --- trunk/Makefile Wed Apr 28 23:19:03 2010 (r452) +++ trunk/Makefile Thu Apr 29 17:42:08 2010 (r453) @@ -4,9 +4,11 @@ CC=$(CROSS_COMPILE)gcc LD=$(CROSS_COMPILE)ld CRYPTO=OPENSSL +#CRYPTO=POLARSSL #CRYPTO=GNUTLS LIB_GNUTLS=-lgnutls -lgcrypt LIB_OPENSSL=-lssl -lcrypto +LIB_POLARSSL=-lpolarssl CRYPTO_LIB=$(LIB_$(CRYPTO)) DEF_=-DNO_CRYPTO CRYPTO_DEF=$(DEF_$(CRYPTO)) Modified: trunk/librtmp/Makefile ============================================================================== --- trunk/librtmp/Makefile Wed Apr 28 23:19:03 2010 (r452) +++ trunk/librtmp/Makefile Thu Apr 29 17:42:08 2010 (r453) @@ -8,6 +8,7 @@ AR=$(CROSS_COMPILE)ar CRYPTO=OPENSSL #CRYPTO=GNUTLS +DEF_POLARSSL=-DUSE_POLARSSL DEF_OPENSSL=-DUSE_OPENSSL DEF_GNUTLS=-DUSE_GNUTLS DEF_=-DNO_CRYPTO Modified: trunk/librtmp/dh.h ============================================================================== --- trunk/librtmp/dh.h Wed Apr 28 23:19:03 2010 (r452) +++ trunk/librtmp/dh.h Thu Apr 29 17:42:08 2010 (r453) @@ -26,10 +26,60 @@ #include <assert.h> #include <limits.h> -#ifdef USE_GNUTLS +#ifdef USE_POLARSSL +#include <polarssl/dhm.h> +typedef mpi * MP_t; +#define MP_new(m) m = malloc(sizeof(mpi)); mpi_init(m, NULL) +#define MP_set_w(mpi, w) mpi_lset(mpi, w) +#define MP_cmp(u, v) mpi_cmp_mpi(u, v) +#define MP_set(u, v) mpi_copy(u, v) +#define MP_sub_w(mpi, w) mpi_sub_int(mpi, mpi, w) +#define MP_cmp_1(mpi) mpi_cmp_int(mpi, 1) +#define MP_modexp(r, y, q, p) mpi_exp_mod(r, y, q, p, NULL) +#define MP_free(mpi) mpi_free(mpi, NULL); free(mpi) +#define MP_gethex(u, hex, res) MP_new(u); res = mpi_read_string(u, 16, hex) == 0 +#define MP_bytes(u) mpi_size(u) +#define MP_setbin(u,buf,len) mpi_write_binary(u,buf,len) +#define MP_getbin(u,buf,len) MP_new(u); mpi_read_binary(u,buf,len) + +typedef struct MDH { + MP_t p; + MP_t g; + MP_t pub_key; + MP_t priv_key; + long length; + dhm_context ctx; +} MDH; + +#define MDH_new() calloc(1,sizeof(MDH)) +#define MDH_free(vp) {MDH *dh = vp; dhm_free(&dh->ctx); MP_free(dh->p); MP_free(dh->g); MP_free(dh->pub_key); MP_free(dh->priv_key); free(dh);} + +static int MDH_generate_key(MDH *dh) +{ + unsigned char out[2]; + MP_set(&dh->ctx.P, dh->p); + MP_set(&dh->ctx.G, dh->g); + dh->ctx.len = 128; + dhm_make_public(&dh->ctx, 1024, out, 1, havege_rand, &RTMP_TLS_ctx->hs); + MP_new(dh->pub_key); + MP_new(dh->priv_key); + MP_set(dh->pub_key, &dh->ctx.GX); + MP_set(dh->priv_key, &dh->ctx.X); + return 1; +} + +static int MDH_compute_key(uint8_t *secret, size_t len, MP_t pub, MDH *dh) +{ + int n = len; + MP_set(&dh->ctx.GY, pub); + dhm_calc_secret(&dh->ctx, secret, &n); + return 0; +} + +#elif defined(USE_GNUTLS) #include <gcrypt.h> typedef gcry_mpi_t MP_t; -#define MP_new() gcry_mpi_new(1) +#define MP_new(m) m = gcry_mpi_new(1) #define MP_set_w(mpi, w) gcry_mpi_set_ui(mpi, w) #define MP_cmp(u, v) gcry_mpi_cmp(u, v) #define MP_set(u, v) gcry_mpi_set(u, v) @@ -37,7 +87,7 @@ typedef gcry_mpi_t MP_t; #define MP_cmp_1(mpi) gcry_mpi_cmp_ui(mpi, 1) #define MP_modexp(r, y, q, p) gcry_mpi_powm(r, y, q, p) #define MP_free(mpi) gcry_mpi_release(mpi) -#define MP_gethex(u, hex, res) res = (gcry_mpi_scan(u, GCRYMPI_FMT_HEX, hex, 0, 0) == 0) +#define MP_gethex(u, hex, res) res = (gcry_mpi_scan(&u, GCRYMPI_FMT_HEX, hex, 0, 0) == 0) #define MP_bytes(u) (gcry_mpi_get_nbits(u) + 7) / 8 #define MP_setbin(u,buf,len) gcry_mpi_print(GCRYMPI_FMT_USG,buf,len,NULL,u) #define MP_getbin(u,buf,len) gcry_mpi_scan(&u,GCRYMPI_FMT_USG,buf,len,NULL) @@ -56,7 +106,6 @@ typedef struct MDH { extern MP_t gnutls_calc_dh_secret(MP_t *priv, MP_t g, MP_t p); extern MP_t gnutls_calc_dh_key(MP_t y, MP_t x, MP_t p); - #define MDH_generate_key(dh) (dh->pub_key = gnutls_calc_dh_secret(&dh->priv_key, dh->g, dh->p)) static int MDH_compute_key(uint8_t *secret, size_t len, MP_t pub, MDH *dh) { @@ -71,12 +120,12 @@ static int MDH_compute_key(uint8_t *secr return -1; } -#else +#else /* USE_OPENSSL */ #include <openssl/bn.h> #include <openssl/dh.h> typedef BIGNUM * MP_t; -#define MP_new() BN_new() +#define MP_new(m) m = BN_new() #define MP_set_w(mpi, w) BN_set_word(mpi, w) #define MP_cmp(u, v) BN_cmp(u, v) #define MP_set(u, v) BN_copy(u, v) @@ -84,7 +133,7 @@ typedef BIGNUM * MP_t; #define MP_cmp_1(mpi) BN_cmp(mpi, BN_value_one()) #define MP_modexp(r, y, q, p) do {BN_CTX *ctx = BN_CTX_new(); BN_mod_exp(r, y, q, p, ctx); BN_CTX_free(ctx);} while(0) #define MP_free(mpi) BN_free(mpi) -#define MP_gethex(u, hex, res) res = BN_hex2bn(u, hex) +#define MP_gethex(u, hex, res) res = BN_hex2bn(&u, hex) #define MP_bytes(u) BN_num_bytes(u) #define MP_setbin(u,buf,len) BN_bn2bin(u,buf) #define MP_getbin(u,buf,len) u = BN_bin2bn(buf,len,0) @@ -100,27 +149,6 @@ typedef BIGNUM * MP_t; #include "log.h" #include "dhgroups.h" -/* -MP_t dh_shared_p = 0; // shared prime -MP_t dh_shared_g = 0; // shared base - -void dh_pg_init() -{ - int res; - if(dh_shared_p || dh_shared_g) - return; - - dh_shared_p = MP_new(); - dh_shared_g = MP_new(); - assert(dh_shared_p && dh_shared_g); - - MP_gethex(&dh_shared_p, P1024, res); // prime P1024, see dhgroups.h - assert(res); - - assert(MP_set_w(dh_shared_g, 2)); // base 2 -} -*/ - /* RFC 2631, Section 2.1.5, http://www.ietf.org/rfc/rfc2631.txt */ static bool isValidPublicKey(MP_t y, MP_t p, MP_t q) @@ -129,7 +157,7 @@ isValidPublicKey(MP_t y, MP_t p, MP_t q) MP_t bn; assert(y); - bn = MP_new(); + MP_new(bn); assert(bn); /* y must lie in [2,p-1] */ @@ -182,21 +210,18 @@ DHInit(int nKeyBits) if (!dh) goto failed; - dh->g = MP_new(); + MP_new(dh->g); if (!dh->g) goto failed; - MP_gethex(&dh->p, P1024, res); /* prime P1024, see dhgroups.h */ + MP_gethex(dh->p, P1024, res); /* prime P1024, see dhgroups.h */ if (!res) { goto failed; } - if (!MP_set_w(dh->g, 2)) /* base 2 */ - { - goto failed; - } + MP_set_w(dh->g, 2); /* base 2 */ dh->length = nKeyBits; return dh; @@ -222,7 +247,7 @@ DHGenerateKey(MDH *dh) if (!MDH_generate_key(dh)) return 0; - MP_gethex(&q1, Q1024, res); + MP_gethex(q1, Q1024, res); assert(res); res = isValidPublicKey(dh->pub_key, dh->p, q1); @@ -293,7 +318,7 @@ DHComputeSharedSecretKey(MDH *dh, uint8_ if (!pubkeyBn) return -1; - MP_gethex(&q1, Q1024, len); + MP_gethex(q1, Q1024, len); assert(len); if (isValidPublicKey(pubkeyBn, dh->p, q1)) Modified: trunk/librtmp/handshake.h ============================================================================== --- trunk/librtmp/handshake.h Wed Apr 28 23:19:03 2010 (r452) +++ trunk/librtmp/handshake.h Thu Apr 29 17:42:08 2010 (r453) @@ -23,7 +23,24 @@ /* This file is #included in rtmp.c, it is not meant to be compiled alone */ -#ifdef USE_GNUTLS +#ifdef USE_POLARSSL +#include <polarssl/sha2.h> +#include <polarssl/arc4.h> +#ifndef SHA256_DIGEST_LENGTH +#define SHA256_DIGEST_LENGTH 32 +#endif +#define HMAC_CTX sha2_context +#define HMAC_setup(ctx, key, len) sha2_hmac_starts(&ctx, (unsigned char *)key, len, 0) +#define HMAC_crunch(ctx, buf, len) sha2_hmac_update(&ctx, buf, len) +#define HMAC_finish(ctx, dig, dlen) dlen = SHA256_DIGEST_LENGTH; sha2_hmac_finish(&ctx, dig) + +typedef arc4_context * RC4_handle; +#define RC4_setup(h) *h = malloc(sizeof(arc4_context)) +#define RC4_setkey(h,l,k) arc4_setup(h,k,l) +#define RC4_encrypt(h,l,d) arc4_crypt(h,l,(unsigned char *)d,(unsigned char *)d) +#define RC4_encrypt2(h,l,s,d) arc4_crypt(h,l,(unsigned char *)s,(unsigned char *)d) + +#elif defined(USE_GNUTLS) #include <gcrypt.h> #ifndef SHA256_DIGEST_LENGTH #define SHA256_DIGEST_LENGTH 32 @@ -39,7 +56,7 @@ typedef gcry_cipher_hd_t RC4_handle; #define RC4_encrypt(h,l,d) gcry_cipher_encrypt(h,(void *)d,l,NULL,0) #define RC4_encrypt2(h,l,s,d) gcry_cipher_encrypt(h,(void *)d,l,(void *)s,l) -#else +#else /* USE_OPENSSL */ #include <openssl/sha.h> #include <openssl/hmac.h> #include <openssl/rc4.h> @@ -414,7 +431,7 @@ HandShake(RTMP * r, bool FP9HandShake) if (encrypted) { /* generate Diffie-Hellmann parameters */ - r->Link.dh = DHInit(128); /* 1024 */ + r->Link.dh = DHInit(1024); if (!r->Link.dh) { RTMP_Log(RTMP_LOGERROR, "%s: Couldn't initialize Diffie-Hellmann!", @@ -806,7 +823,7 @@ SHandShake(RTMP * r) if (encrypted) { /* generate Diffie-Hellmann parameters */ - r->Link.dh = DHInit(128); + r->Link.dh = DHInit(1024); if (!r->Link.dh) { RTMP_Log(RTMP_LOGERROR, "%s: Couldn't initialize Diffie-Hellmann!", Modified: trunk/librtmp/hashswf.c ============================================================================== --- trunk/librtmp/hashswf.c Wed Apr 28 23:19:03 2010 (r452) +++ trunk/librtmp/hashswf.c Thu Apr 29 17:42:08 2010 (r453) @@ -30,7 +30,17 @@ #include "http.h" #ifdef CRYPTO -#ifdef USE_GNUTLS +#ifdef USE_POLARSSL +#include <polarssl/sha2.h> +#ifndef SHA256_DIGEST_LENGTH +#define SHA256_DIGEST_LENGTH 32 +#endif +#define HMAC_CTX sha2_context +#define HMAC_setup(ctx, key, len) sha2_hmac_starts(&ctx, (unsigned char *)key, len, 0) +#define HMAC_crunch(ctx, buf, len) sha2_hmac_update(&ctx, buf, len) +#define HMAC_finish(ctx, dig, dlen) dlen = SHA256_DIGEST_LENGTH; sha2_hmac_finish(&ctx, dig) +#define HMAC_close(ctx) +#elif defined(USE_GNUTLS) #include <gnutls/gnutls.h> #include <gcrypt.h> #ifndef SHA256_DIGEST_LENGTH @@ -41,7 +51,7 @@ #define HMAC_crunch(ctx, buf, len) gcry_md_write(ctx, buf, len) #define HMAC_finish(ctx, dig, dlen) dlen = SHA256_DIGEST_LENGTH; memcpy(dig, gcry_md_read(ctx, 0), dlen) #define HMAC_close(ctx) gcry_md_close(ctx) -#else +#else /* USE_OPENSSL */ #include <openssl/ssl.h> #include <openssl/sha.h> #include <openssl/hmac.h> Modified: trunk/librtmp/rtmp.c ============================================================================== --- trunk/librtmp/rtmp.c Wed Apr 28 23:19:03 2010 (r452) +++ trunk/librtmp/rtmp.c Thu Apr 29 17:42:08 2010 (r453) @@ -31,9 +31,11 @@ #include "log.h" #ifdef CRYPTO -#ifdef USE_GNUTLS +#ifdef USE_POLARSSL +#include <polarssl/havege.h> +#elif defined(USE_GNUTLS) #include <gnutls/gnutls.h> -#else +#else /* USE_OPENSSL */ #include <openssl/ssl.h> #include <openssl/rc4.h> #endif @@ -196,14 +198,17 @@ void RTMP_TLS_Init() { #ifdef CRYPTO -#ifdef USE_GNUTLS +#ifdef USE_POLARSSL + RTMP_TLS_ctx = calloc(1,sizeof(struct tls_ctx)); + havege_init(&RTMP_TLS_ctx->hs); +#elif defined(USE_GNUTLS) gnutls_global_init(); RTMP_TLS_ctx = malloc(sizeof(struct tls_ctx)); gnutls_certificate_allocate_credentials(&RTMP_TLS_ctx->cred); gnutls_priority_init(&RTMP_TLS_ctx->prios, "NORMAL", NULL); gnutls_certificate_set_x509_trust_file(RTMP_TLS_ctx->cred, "ca.pem", GNUTLS_X509_FMT_PEM); -#else +#else /* USE_OPENSSL */ SSL_load_error_strings(); SSL_library_init(); OpenSSL_add_all_digests(); Modified: trunk/librtmp/rtmp_sys.h ============================================================================== --- trunk/librtmp/rtmp_sys.h Wed Apr 28 23:19:03 2010 (r452) +++ trunk/librtmp/rtmp_sys.h Thu Apr 29 17:42:08 2010 (r453) @@ -48,7 +48,27 @@ #include "rtmp.h" -#ifdef USE_GNUTLS +#ifdef USE_POLARSSL +#include <polarssl/net.h> +#include <polarssl/ssl.h> +#include <polarssl/havege.h> +typedef struct tls_ctx { + havege_state hs; + ssl_session ssn; +} tls_ctx; +#define TLS_CTX tls_ctx * +#define TLS_client(ctx,s) s = malloc(sizeof(ssl_context)); ssl_init(s);\ + ssl_set_endpoint(s, SSL_IS_CLIENT); ssl_set_authmode(s, SSL_VERIFY_NONE);\ + ssl_set_rng(s, havege_rand, &ctx->hs); ssl_set_ciphers(s, ssl_default_ciphers);\ + ssl_set_session(s, 1, 600, &ctx->ssn) +#define TLS_setfd(s,fd) ssl_set_bio(s, net_recv, &fd, net_send, &fd) +#define TLS_connect(s) ssl_handshake(s) +#define TLS_read(s,b,l) ssl_read(s,(unsigned char *)b,l) +#define TLS_write(s,b,l) ssl_write(s,(unsigned char *)b,l) +#define TLS_shutdown(s) ssl_close_notify(s) +#define TLS_close(s) ssl_free(s); free(s) + +#elif defined(USE_GNUTLS) #include <gnutls/gnutls.h> typedef struct tls_ctx { gnutls_certificate_credentials_t cred; @@ -62,7 +82,8 @@ typedef struct tls_ctx { #define TLS_write(s,b,l) gnutls_record_send(s,b,l) #define TLS_shutdown(s) gnutls_bye(s, GNUTLS_SHUT_RDWR) #define TLS_close(s) gnutls_deinit(s) -#else + +#else /* USE_OPENSSL */ #define TLS_CTX SSL_CTX * #define TLS_client(ctx,s) s = SSL_new(ctx) #define TLS_setfd(s,fd) SSL_set_fd(s,fd)

2 1

r452 - web/index.html
by compn 28 Apr '10

28 Apr '10

Author: compn Date: Wed Apr 28 23:19:03 2010 New Revision: 452 Log: fix rtmpdump title spelling Modified: web/index.html Modified: web/index.html ============================================================================== --- web/index.html Mon Apr 26 15:30:37 2010 (r451) +++ web/index.html Wed Apr 28 23:19:03 2010 (r452) @@ -2,7 +2,7 @@ "http://www.w3.org/TR/html4/strict.dtd"> <html> <head> - <title>RTMP Dump</title> + <title>RTMPDump</title> <meta http-equiv="content-type" content="text/html;charset=utf-8"> </head> <body>

1 0

FW: [FFmpeg-devel] rtmp support and librtmp
by Pavel Pavlov 27 Apr '10

27 Apr '10

> -----Original Message----- > Pavel Pavlov wrote: > > Hello all, > > I'm using ffmpeg (libavformat) to read rtmp stream and I had lots of > problems with it, so I decided to scrap that code. Then for rtmp I > started to use original c++ librtmp from xbmc (xbox media center) and > right away all my problems went away. > > > > Since librtmp (http://rtmpdump.mplayerhq.hu/) was based on that > librtmp from xbmc I thought that if I compile in librtmp then I'd also > get the same nice results. > > > > However, it appears that with librtmp compiled in I cannot even open > file anymore and I get in log: > > "24: Received FLV packet before play()! Ignoring." > > and av_open_input_file returns -1 > > > > > > I use this sequence to read files: > > > > av_open_input_file() > > av_find_stream_info() > > > > loop : av_read_frame() > > > > > > is there something special that I need to do in order to be able to > use new librtmp and ffmpeg? In case if it matters, the file is regular > flv (created with ffmpeg) served from wowza streaming server. > > Among problems with regular (without librtmp) build of ffmpeg were: > quite unstable playback, freezing of playback, if the stream did not > have sound then it would freeze on start up for quite a while > (av_find_stream_info could take like 10 secs and usually when stream is > video only it would take longer to return). With librtmp from xbmc it > would work just as expected: no delays and freezing, so I guess that if > I compile in librtmp support into ffmpeg I'd get the same nice results, > but so far it breaks on the first step. Can you please tell me if there > is anything wrong with what I'm doing? Thanks > > Wowza server does quite a few things differently from genuine Adobe > servers. > librtmp has been tested mainly against Adobe servers. Your best bet is > to see > how your stream behaves using rtmpdump first, and ask about this on the > rtmpdump mailing list. > > ffmpeg's use of librtmp involves only a few API calls; anything that > might be > wrong in librtmp will have to be discussed and fixed on the rtmpdump > list. > I don't think that there is a problem with the librtmp itself, my guess is that it's some problem with librtmp.c from ffmpeg or the way that it all works with ffmpeg IO. Basically, I'm getting a error on the first call to av_open_input_file. If I use rtmpdump I'm getting the same error: RTMPDump v2.2c (c) 2010 Andrej Stepanchuk, Howard Chu, The Flvstreamer Team; license: GPL WARNING: You haven't specified an output file (-o filename), using stdout Connecting ... INFO: Connected... WARNING: Received FLV packet before play()! Ignoring. Unfortunatelly, the wowza server isn't accessible from outside so I can't give you rtmp url, is there anything I should try to see what's wrong? By the way, I'm using intel compiler to build rtmpdump in case if it matters

3 5

r451 - web/index.html
by hyc 26 Apr '10

26 Apr '10

Author: hyc Date: Mon Apr 26 15:30:37 2010 New Revision: 451 Log: MPlayer supported... sort of Modified: web/index.html Modified: web/index.html ============================================================================== --- web/index.html Sun Apr 25 01:19:14 2010 (r450) +++ web/index.html Mon Apr 26 15:30:37 2010 (r451) @@ -124,6 +124,7 @@ Projects using rtmpdump: <a href="http://sourceforge.net/projects/mlbviewer/">mlbviewer</a><br> <a href="http://users.on.net/~m.elliott/i/index.html">iViewNapper</a><br> <a href="http://ffmpeg.org">FFmpeg</a> (uses librtmp)<br> +<a href="http://repo.or.cz/w/mplayer.git">MPlayer development branch</a> (ffmpeg+librtmp)<br> </p> <p> <br>

1 0

ITV Download
by Thomas Barnett 25 Apr '10

25 Apr '10

Can someone please tell me what is the correct usage of named parameters? For example something like "...-C NN:audioCodecs:3191.00..." is giving the error ""Invalid AMF parameter". I suspect, the failure to retrieve the video may be due to not passing all the parameters required in the rtmp dump request. rtmpsuck displays many more than I use (although it fails too with handshake error). In case anyone is interested, there is a debug log from rtmpsuck at http://pastebin.com/0sMVvTnZ Regards T

1 0

r450 - trunk/librtmp/handshake.h
by hyc 24 Apr '10

24 Apr '10

Author: hyc Date: Sun Apr 25 01:19:14 2010 New Revision: 450 Log: More explicit OpenSSL check Modified: trunk/librtmp/handshake.h Modified: trunk/librtmp/handshake.h ============================================================================== --- trunk/librtmp/handshake.h Sun Apr 25 01:12:46 2010 (r449) +++ trunk/librtmp/handshake.h Sun Apr 25 01:19:14 2010 (r450) @@ -43,8 +43,8 @@ typedef gcry_cipher_hd_t RC4_handle; #include <openssl/sha.h> #include <openssl/hmac.h> #include <openssl/rc4.h> -#if OPENSSL_VERSION_NUMBER < 0x0090800 -#error Your OpenSSL installation is too old, need 0.9.8 or newer +#if OPENSSL_VERSION_NUMBER < 0x0090800 || !defined(SHA256_DIGEST_LENGTH) +#error Your OpenSSL is too old, need 0.9.8 or newer with SHA256 #endif #define HMAC_setup(ctx, key, len) HMAC_CTX_init(&ctx); HMAC_Init_ex(&ctx, key, len, EVP_sha256(), 0) #define HMAC_crunch(ctx, buf, len) HMAC_Update(&ctx, buf, len)

1 0

r449 - trunk/librtmp/handshake.h
by hyc 24 Apr '10

24 Apr '10

Author: hyc Date: Sun Apr 25 01:12:46 2010 New Revision: 449 Log: Check OpenSSL version Modified: trunk/librtmp/handshake.h Modified: trunk/librtmp/handshake.h ============================================================================== --- trunk/librtmp/handshake.h Sat Apr 24 14:04:34 2010 (r448) +++ trunk/librtmp/handshake.h Sun Apr 25 01:12:46 2010 (r449) @@ -43,6 +43,9 @@ typedef gcry_cipher_hd_t RC4_handle; #include <openssl/sha.h> #include <openssl/hmac.h> #include <openssl/rc4.h> +#if OPENSSL_VERSION_NUMBER < 0x0090800 +#error Your OpenSSL installation is too old, need 0.9.8 or newer +#endif #define HMAC_setup(ctx, key, len) HMAC_CTX_init(&ctx); HMAC_Init_ex(&ctx, key, len, EVP_sha256(), 0) #define HMAC_crunch(ctx, buf, len) HMAC_Update(&ctx, buf, len) #define HMAC_finish(ctx, dig, dlen) HMAC_Final(&ctx, dig, &dlen); HMAC_CTX_cleanup(&ctx)

1 0

r448 - in trunk: librtmp/rtmp.c librtmp/rtmp.h rtmpdump.c
by hyc 24 Apr '10

24 Apr '10

Author: hyc Date: Sat Apr 24 14:04:34 2010 New Revision: 448 Log: Add support for set_playlist command Modified: trunk/librtmp/rtmp.c trunk/librtmp/rtmp.h trunk/rtmpdump.c Modified: trunk/librtmp/rtmp.c ============================================================================== --- trunk/librtmp/rtmp.c Sat Apr 24 13:31:16 2010 (r447) +++ trunk/librtmp/rtmp.c Sat Apr 24 14:04:34 2010 (r448) @@ -447,6 +447,8 @@ static struct urlopt { "Append arbitrary AMF data to Connect message" }, { AVC("playpath"), OFF(Link.playpath), OPT_STR, 0, "Path to target media on server" }, + { AVC("playlist"), OFF(Link.lFlags), OPT_BOOL, RTMP_LF_PLST, + "Set playlist before play command" }, { AVC("live"), OFF(Link.lFlags), OPT_BOOL, RTMP_LF_LIVE, "Stream is live, no seeking possible" }, { AVC("subscribe"), OFF(Link.subscribepath), OPT_STR, 0, @@ -1977,6 +1979,47 @@ SendPlay(RTMP *r) return RTMP_SendPacket(r, &packet, true); } +SAVC(set_playlist); +SAVC(0); + +static bool +SendPlaylist(RTMP *r) +{ + RTMPPacket packet; + char pbuf[1024], *pend = pbuf + sizeof(pbuf); + char *enc; + + packet.m_nChannel = 0x08; /* we make 8 our stream channel */ + packet.m_headerType = RTMP_PACKET_SIZE_LARGE; + packet.m_packetType = 0x14; /* INVOKE */ + packet.m_nTimeStamp = 0; + packet.m_nInfoField2 = r->m_stream_id; /*0x01000000; */ + packet.m_hasAbsTimestamp = 0; + packet.m_body = pbuf + RTMP_MAX_HEADER_SIZE; + + enc = packet.m_body; + enc = AMF_EncodeString(enc, pend, &av_set_playlist); + enc = AMF_EncodeNumber(enc, pend, 0); + *enc++ = AMF_NULL; + *enc++ = AMF_ECMA_ARRAY; + *enc++ = 0; + *enc++ = 0; + *enc++ = 0; + *enc++ = AMF_OBJECT; + enc = AMF_EncodeNamedString(enc, pend, &av_0, &r->Link.playpath); + if (!enc) + return false; + if (enc + 3 >= pend) + return false; + *enc++ = 0; + *enc++ = 0; + *enc++ = AMF_OBJECT_END; + + packet.m_nBodySize = enc - packet.m_body; + + return RTMP_SendPacket(r, &packet, true); +} + static bool SendSecureTokenResponse(RTMP *r, AVal *resp) { @@ -2127,6 +2170,7 @@ SAVC(close); SAVC(code); SAVC(level); SAVC(onStatus); +SAVC(playlist_ready); static const AVal av_NetStream_Failed = AVC("NetStream.Failed"); static const AVal av_NetStream_Play_Failed = AVC("NetStream.Play.Failed"); static const AVal av_NetStream_Play_StreamNotFound = @@ -2219,6 +2263,8 @@ HandleInvoke(RTMP *r, const char *body, } else { + if (r->Link.lFlags & RTMP_LF_PLST) + SendPlaylist(r); SendPlay(r); RTMP_SendCtrl(r, 3, r->m_stream_id, r->m_nBufferMS); } @@ -2336,6 +2382,18 @@ HandleInvoke(RTMP *r, const char *body, } } } + else if (AVMATCH(&method, &av_playlist_ready)) + { + int i; + for (i = 0; i < r->m_numCalls; i++) + { + if (AVMATCH(&r->m_methodCalls[i], &av_set_playlist)) + { + AV_erase(r->m_methodCalls, &r->m_numCalls, i, true); + break; + } + } + } else { Modified: trunk/librtmp/rtmp.h ============================================================================== --- trunk/librtmp/rtmp.h Sat Apr 24 13:31:16 2010 (r447) +++ trunk/librtmp/rtmp.h Sat Apr 24 14:04:34 2010 (r448) @@ -145,11 +145,7 @@ extern "C" #define RTMP_LF_SWFV 0x0004 #define RTMP_LF_PLST 0x0008 int lFlags; -#if 0 - bool authflag; - bool bLiveStream; - bool swfVfy; -#endif + int swfAge; int protocol; Modified: trunk/rtmpdump.c ============================================================================== --- trunk/rtmpdump.c Sat Apr 24 13:31:16 2010 (r447) +++ trunk/rtmpdump.c Sat Apr 24 14:04:34 2010 (r448) @@ -125,6 +125,8 @@ static const AVal av_onMetaData = AVC("o static const AVal av_duration = AVC("duration"); static const AVal av_conn = AVC("conn"); static const AVal av_token = AVC("token"); +static const AVal av_playlist = AVC("playlist"); +static const AVal av_true = AVC("true"); int OpenResumeFile(const char *flvFile, // file name [in] @@ -640,9 +642,11 @@ void usage(char *prog) RTMP_LogPrintf ("--socks|-S host:port Use the specified SOCKS proxy\n"); RTMP_LogPrintf - ("--protocol|-l Overrides the protocol in the rtmp url (0 - RTMP, 2 - RTMPE)\n"); + ("--protocol|-l num Overrides the protocol in the rtmp url (0 - RTMP, 2 - RTMPE)\n"); RTMP_LogPrintf - ("--playpath|-y Overrides the playpath parsed from rtmp url\n"); + ("--playpath|-y path Overrides the playpath parsed from rtmp url\n"); + RTMP_LogPrintf + ("--playlist|-Y Set playlist before playing\n"); RTMP_LogPrintf("--swfUrl|-s url URL to player swf file\n"); RTMP_LogPrintf ("--tcUrl|-t url URL to played stream (default: \"rtmp://host[:port]/app\")\n"); @@ -805,6 +809,7 @@ main(int argc, char **argv) {"socks", 1, NULL, 'S'}, {"protocol", 1, NULL, 'l'}, {"playpath", 1, NULL, 'y'}, + {"playlist", 0, NULL, 'Y'}, {"rtmp", 1, NULL, 'r'}, {"swfUrl", 1, NULL, 's'}, {"tcUrl", 1, NULL, 't'}, @@ -838,7 +843,7 @@ main(int argc, char **argv) while ((opt = getopt_long(argc, argv, - "hVveqzr:s:t:p:a:b:f:o:u:C:n:c:l:y:m:k:d:A:B:T:w:x:W:X:S:#", + "hVveqzr:s:t:p:a:b:f:o:u:C:n:c:l:y:Ym:k:d:A:B:T:w:x:W:X:S:#", longopts, NULL)) != -1) { switch (opt) @@ -943,6 +948,9 @@ main(int argc, char **argv) case 'y': STR2AVAL(playpath, optarg); break; + case 'Y': + RTMP_SetOpt(&rtmp, &av_playlist, (AVal *)&av_true); + break; case 'r': { AVal parsedHost, parsedApp, parsedPlaypath;

1 0