From 08cd95e8a37674401ed24e5e6f4f7402edb7fdeb Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Fri, 20 Jul 2012 16:36:47 +0200 Subject: [PATCH] RTMPTE protocol support MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Martin Storsjö --- Changelog | 1 + configure | 1 + doc/general.texi | 2 +- doc/protocols.texi | 8 ++++++++ libavformat/Makefile | 1 + libavformat/allformats.c | 1 + libavformat/rtmpcrypt.c | 33 +++++++++++++++++++++++++++++---- libavformat/rtmpproto.c | 23 ++++++++++++++++++++++- libavformat/version.h | 2 +- 9 files changed, 65 insertions(+), 7 deletions(-) diff --git a/Changelog b/Changelog index d51f5d3106..ea2c353a15 100644 --- a/Changelog +++ b/Changelog @@ -40,6 +40,7 @@ version : - JPEG 2000 encoding support through OpenJPEG - G.723.1 demuxer and decoder - RTMPE protocol support +- RTMPTE protocol support version 0.8: diff --git a/configure b/configure index b862fd3f24..aa5797ab9a 100755 --- a/configure +++ b/configure @@ -1569,6 +1569,7 @@ rtmpe_protocol_select="ffrtmpcrypt_protocol" rtmps_protocol_deps="!librtmp_protocol" rtmps_protocol_select="tls_protocol" rtmpt_protocol_select="ffrtmphttp_protocol" +rtmpte_protocol_select="ffrtmpcrypt_protocol ffrtmphttp_protocol" rtmpts_protocol_select="ffrtmphttp_protocol" rtp_protocol_select="udp_protocol" sctp_protocol_deps="network netinet_sctp_h" diff --git a/doc/general.texi b/doc/general.texi index c54ac00125..05855542bf 100644 --- a/doc/general.texi +++ b/doc/general.texi @@ -847,7 +847,7 @@ performance on systems without hardware floating point support). @item RTMPE @tab X @item RTMPS @tab X @item RTMPT @tab X -@item RTMPTE @tab E +@item RTMPTE @tab X @item RTMPTS @tab X @item RTP @tab X @item SCTP @tab X diff --git a/doc/protocols.texi b/doc/protocols.texi index fcb4da801e..7b84f25815 100644 --- a/doc/protocols.texi +++ b/doc/protocols.texi @@ -271,6 +271,14 @@ The Real-Time Messaging Protocol tunneled through HTTP (RTMPT) is used for streaming multimedia content within HTTP requests to traverse firewalls. +@section rtmpte + +Encrypted Real-Time Messaging Protocol tunneled through HTTP. + +The Encrypted Real-Time Messaging Protocol tunneled through HTTP (RTMPTE) +is used for streaming multimedia content within HTTP requests to traverse +firewalls. + @section rtmpts Real-Time Messaging Protocol tunneled through HTTPS. diff --git a/libavformat/Makefile b/libavformat/Makefile index 31a53345e7..2263b9648d 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -357,6 +357,7 @@ OBJS-$(CONFIG_RTMP_PROTOCOL) += rtmpproto.o rtmppkt.o OBJS-$(CONFIG_RTMPE_PROTOCOL) += rtmpproto.o rtmppkt.o OBJS-$(CONFIG_RTMPS_PROTOCOL) += rtmpproto.o rtmppkt.o OBJS-$(CONFIG_RTMPT_PROTOCOL) += rtmpproto.o rtmppkt.o +OBJS-$(CONFIG_RTMPTE_PROTOCOL) += rtmpproto.o rtmppkt.o OBJS-$(CONFIG_RTMPTS_PROTOCOL) += rtmpproto.o rtmppkt.o OBJS-$(CONFIG_RTP_PROTOCOL) += rtpproto.o OBJS-$(CONFIG_SCTP_PROTOCOL) += sctp.o diff --git a/libavformat/allformats.c b/libavformat/allformats.c index 4e694b26fe..40770e5253 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -263,6 +263,7 @@ void av_register_all(void) REGISTER_PROTOCOL (RTMPE, rtmpe); REGISTER_PROTOCOL (RTMPS, rtmps); REGISTER_PROTOCOL (RTMPT, rtmpt); + REGISTER_PROTOCOL (RTMPTE, rtmpte); REGISTER_PROTOCOL (RTMPTS, rtmpts); REGISTER_PROTOCOL (RTP, rtp); REGISTER_PROTOCOL (SCTP, sctp); diff --git a/libavformat/rtmpcrypt.c b/libavformat/rtmpcrypt.c index e5afcc94ff..6a4332de86 100644 --- a/libavformat/rtmpcrypt.c +++ b/libavformat/rtmpcrypt.c @@ -26,6 +26,7 @@ #include "libavutil/blowfish.h" #include "libavutil/intreadwrite.h" +#include "libavutil/opt.h" #include "libavutil/rc4.h" #include "libavutil/xtea.h" @@ -37,11 +38,13 @@ /* protocol handler context */ typedef struct RTMPEContext { + const AVClass *class; URLContext *stream; ///< TCP stream FF_DH *dh; ///< Diffie-Hellman context struct AVRC4 key_in; ///< RC4 key used for decrypt data struct AVRC4 key_out; ///< RC4 key used for encrypt data int handshaked; ///< flag indicating when the handshake is performed + int tunneling; ///< use a HTTP connection (RTMPTE) } RTMPEContext; static const uint8_t rtmpe8_keys[16][16] = { @@ -248,11 +251,17 @@ static int rtmpe_open(URLContext *h, const char *uri, int flags) av_url_split(NULL, 0, NULL, 0, host, sizeof(host), &port, NULL, 0, uri); - if (port < 0) - port = 1935; + if (rt->tunneling) { + if (port < 0) + port = 80; + ff_url_join(url, sizeof(url), "ffrtmphttp", NULL, host, port, NULL); + } else { + if (port < 0) + port = 1935; + ff_url_join(url, sizeof(url), "tcp", NULL, host, port, NULL); + } - /* open the tcp connection */ - ff_url_join(url, sizeof(url), "tcp", NULL, host, port, NULL); + /* open the tcp or ffrtmphttp connection */ if ((ret = ffurl_open(&rt->stream, url, AVIO_FLAG_READ_WRITE, &h->interrupt_callback, NULL)) < 0) { rtmpe_close(h); @@ -298,6 +307,21 @@ static int rtmpe_write(URLContext *h, const uint8_t *buf, int size) return size; } +#define OFFSET(x) offsetof(RTMPEContext, x) +#define DEC AV_OPT_FLAG_DECODING_PARAM + +static const AVOption ffrtmpcrypt_options[] = { + {"ffrtmpcrypt_tunneling", "Use a HTTP tunneling connection (RTMPTE).", OFFSET(tunneling), AV_OPT_TYPE_INT, {0}, 0, 1, DEC}, + { NULL }, +}; + +static const AVClass ffrtmpcrypt_class = { + .class_name = "ffrtmpcrypt", + .item_name = av_default_item_name, + .option = ffrtmpcrypt_options, + .version = LIBAVUTIL_VERSION_INT, +}; + URLProtocol ff_ffrtmpcrypt_protocol = { .name = "ffrtmpcrypt", .url_open = rtmpe_open, @@ -306,4 +330,5 @@ URLProtocol ff_ffrtmpcrypt_protocol = { .url_close = rtmpe_close, .priv_data_size = sizeof(RTMPEContext), .flags = URL_PROTOCOL_FLAG_NETWORK, + .priv_data_class = &ffrtmpcrypt_class, }; diff --git a/libavformat/rtmpproto.c b/libavformat/rtmpproto.c index 67a89c5c82..f7ba7d5ef8 100644 --- a/libavformat/rtmpproto.c +++ b/libavformat/rtmpproto.c @@ -1192,7 +1192,10 @@ static int rtmp_open(URLContext *s, const char *uri, int flags) if (port < 0) port = RTMPS_DEFAULT_PORT; ff_url_join(buf, sizeof(buf), "tls", NULL, hostname, port, NULL); - } else if (!strcmp(proto, "rtmpe")) { + } else if (!strcmp(proto, "rtmpe") || (!strcmp(proto, "rtmpte"))) { + if (!strcmp(proto, "rtmpte")) + av_dict_set(&opts, "ffrtmpcrypt_tunneling", "1", 1); + /* open the encrypted connection */ ff_url_join(buf, sizeof(buf), "ffrtmpcrypt", NULL, hostname, port, NULL); rt->encrypted = 1; @@ -1574,6 +1577,24 @@ URLProtocol ff_rtmpt_protocol = { .priv_data_class = &rtmpt_class, }; +static const AVClass rtmpte_class = { + .class_name = "rtmpte", + .item_name = av_default_item_name, + .option = rtmp_options, + .version = LIBAVUTIL_VERSION_INT, +}; + +URLProtocol ff_rtmpte_protocol = { + .name = "rtmpte", + .url_open = rtmp_open, + .url_read = rtmp_read, + .url_write = rtmp_write, + .url_close = rtmp_close, + .priv_data_size = sizeof(RTMPContext), + .flags = URL_PROTOCOL_FLAG_NETWORK, + .priv_data_class = &rtmpte_class, +}; + static const AVClass rtmpts_class = { .class_name = "rtmpts", .item_name = av_default_item_name, diff --git a/libavformat/version.h b/libavformat/version.h index 3681e8db13..bc6cae664b 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -30,7 +30,7 @@ #include "libavutil/avutil.h" #define LIBAVFORMAT_VERSION_MAJOR 54 -#define LIBAVFORMAT_VERSION_MINOR 11 +#define LIBAVFORMAT_VERSION_MINOR 12 #define LIBAVFORMAT_VERSION_MICRO 0 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \