---
Changelog | 1 +
configure | 1 +
doc/general.texi | 1 +
doc/protocols.texi | 8 ++++++++
libavformat/Makefile | 1 +
libavformat/allformats.c | 1 +
libavformat/rtmphttp.c | 31 +++++++++++++++++++++++++++----
libavformat/rtmpproto.c | 27 +++++++++++++++++++++++++--
libavformat/version.h | 2 +-
9 files changed, 66 insertions(+), 7 deletions(-)
diff --git a/Changelog b/Changelog
index de54213..5388fec 100644
--- a/Changelog
+++ b/Changelog
@@ -35,6 +35,7 @@ version <next>:
- TechSmith Screen Codec 2 decoder
- AAC encoding via libfdk-aac
- Microsoft Expression Encoder Screen decoder
+- RTMPTS protocol support
version 0.8:
diff --git a/configure b/configure
index 9639147..8c00a5e 100755
--- a/configure
+++ b/configure
@@ -1545,6 +1545,7 @@ rtmp_protocol_deps="!librtmp_protocol"
rtmp_protocol_select="tcp_protocol"
rtmpt_protocol_deps="!librtmp_protocol"
rtmpt_protocol_select="ffrtmphttp_protocol"
+rtmpts_protocol_select="ffrtmphttp_protocol"
rtp_protocol_select="udp_protocol"
sctp_protocol_deps="network netinet_sctp_h"
tcp_protocol_deps="network"
diff --git a/doc/general.texi b/doc/general.texi
index 49a6b80..34825d9 100644
--- a/doc/general.texi
+++ b/doc/general.texi
@@ -847,6 +847,7 @@ performance on systems without hardware floating point
support).
@item RTMPS @tab E
@item RTMPT @tab X
@item RTMPTE @tab E
+@item RTMPTS @tab X
@item RTP @tab X
@item SCTP @tab X
@item TCP @tab X
diff --git a/doc/protocols.texi b/doc/protocols.texi
index 943287a..8ecd6d9 100644
--- a/doc/protocols.texi
+++ b/doc/protocols.texi
@@ -247,6 +247,14 @@ For example to read with @command{avplay} a multimedia
resource named
avplay rtmp://myserver/vod/sample
@end example
+@section rtmpts
+
+Real-Time Messaging Protocol tunneled through HTTPS.
+
+The Real-Time Messaging Protocol tunneled through HTTP (RTMPTS) is used
+for streaming multimedia content within HTTPS requests to traverse
+firewalls.
+
@section rtmpt
Real-Time Messaging Protocol tunneled through HTTP.
diff --git a/libavformat/Makefile b/libavformat/Makefile
index ae057f2..c5fa421 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -353,6 +353,7 @@ OBJS-$(CONFIG_MD5_PROTOCOL) += md5proto.o
OBJS-$(CONFIG_PIPE_PROTOCOL) += file.o
OBJS-$(CONFIG_RTMP_PROTOCOL) += rtmpproto.o rtmppkt.o
OBJS-$(CONFIG_RTMPT_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
OBJS-$(CONFIG_TCP_PROTOCOL) += tcp.o
diff --git a/libavformat/allformats.c b/libavformat/allformats.c
index 34d8359..c6a49a2 100644
--- a/libavformat/allformats.c
+++ b/libavformat/allformats.c
@@ -259,6 +259,7 @@ void av_register_all(void)
REGISTER_PROTOCOL (PIPE, pipe);
REGISTER_PROTOCOL (RTMP, rtmp);
REGISTER_PROTOCOL (RTMPT, rtmpt);
+ REGISTER_PROTOCOL (RTMPTS, rtmpts);
REGISTER_PROTOCOL (RTP, rtp);
REGISTER_PROTOCOL (SCTP, sctp);
REGISTER_PROTOCOL (TCP, tcp);
diff --git a/libavformat/rtmphttp.c b/libavformat/rtmphttp.c
index febe4b3..6ee7707 100644
--- a/libavformat/rtmphttp.c
+++ b/libavformat/rtmphttp.c
@@ -32,6 +32,7 @@
#include "http.h"
#define RTMPT_DEFAULT_PORT 80
+#define RTMPS_DEFAULT_PORT 443
/* protocol handler context */
typedef struct RTMP_HTTPContext {
@@ -46,6 +47,7 @@ typedef struct RTMP_HTTPContext {
int initialized; ///< flag indicating when the http context
is initialized
int finishing; ///< flag indicating when the client
closes the connection
int nb_bytes_read; ///< number of bytes read since the last
request
+ int tls; ///< use Transport Security Layer (RTMPTS)
} RTMP_HTTPContext;
static int rtmp_http_send_cmd(URLContext *h, const char *cmd)
@@ -185,9 +187,6 @@ static int rtmp_http_open(URLContext *h, const char *uri,
int flags)
av_url_split(NULL, 0, NULL, 0, rt->host, sizeof(rt->host), &rt->port,
NULL, 0, uri);
- if (rt->port < 0)
- rt->port = RTMPT_DEFAULT_PORT;
-
/* This is the first request that is sent to the server in order to
* register a client on the server and start a new session. The server
* replies with a unique id (usually a number) that is used by the client
@@ -195,7 +194,15 @@ static int rtmp_http_open(URLContext *h, const char *uri,
int flags)
* Note: the reply doesn't contain a value for the polling interval.
* A successful connect resets the consecutive index that is used
* in the URLs. */
- ff_url_join(url, sizeof(url), "http", NULL, rt->host, rt->port, "/open/1");
+ if (rt->tls) {
+ if (rt->port < 0)
+ rt->port = RTMPS_DEFAULT_PORT;
+ ff_url_join(url, sizeof(url), "https", NULL, rt->host, rt->port,
"/open/1");
+ } else {
+ if (rt->port < 0)
+ rt->port = RTMPT_DEFAULT_PORT;
+ ff_url_join(url, sizeof(url), "http", NULL, rt->host, rt->port,
"/open/1");
+ }
/* alloc the http context */
if ((ret = ffurl_alloc(&rt->stream, url, AVIO_FLAG_READ_WRITE, NULL)) < 0)
@@ -240,6 +247,21 @@ fail:
return ret;
}
+#define OFFSET(x) offsetof(RTMP_HTTPContext, x)
+#define DEC AV_OPT_FLAG_DECODING_PARAM
+
+static const AVOption ffrtmphttp_options[] = {
+ {"ffrtmphttp_tls", "Use a HTTPS tunneling connection (RTMPTS).",
OFFSET(tls), AV_OPT_TYPE_INT, {0}, 0, 1, DEC},
+ { NULL },
+};
+
+static const AVClass ffrtmphttp_class = {
+ .class_name = "ffrtmphttp",
+ .item_name = av_default_item_name,
+ .option = ffrtmphttp_options,
+ .version = LIBAVUTIL_VERSION_INT,
+};
+
URLProtocol ff_ffrtmphttp_protocol = {
.name = "ffrtmphttp",
.url_open = rtmp_http_open,
@@ -248,4 +270,5 @@ URLProtocol ff_ffrtmphttp_protocol = {
.url_close = rtmp_http_close,
.priv_data_size = sizeof(RTMP_HTTPContext),
.flags = URL_PROTOCOL_FLAG_NETWORK,
+ .priv_data_class= &ffrtmphttp_class,
};
diff --git a/libavformat/rtmpproto.c b/libavformat/rtmpproto.c
index f8ec894..12eb3ee 100644
--- a/libavformat/rtmpproto.c
+++ b/libavformat/rtmpproto.c
@@ -1111,6 +1111,7 @@ static int rtmp_open(URLContext *s, const char *uri, int
flags)
char *old_app;
uint8_t buf[2048];
int port;
+ AVDictionary *opts = NULL;
int ret;
rt->is_input = !(flags & AVIO_FLAG_WRITE);
@@ -1118,7 +1119,10 @@ static int rtmp_open(URLContext *s, const char *uri, int
flags)
av_url_split(proto, sizeof(proto), NULL, 0, hostname, sizeof(hostname),
&port,
path, sizeof(path), s->filename);
- if (!strcmp(proto, "rtmpt")) {
+ if (!strcmp(proto, "rtmpt") || !strcmp(proto, "rtmpts")) {
+ if (!strcmp(proto, "rtmpts"))
+ av_dict_set(&opts, "ffrtmphttp_tls", "1", 1);
+
/* open the http tunneling connection */
ff_url_join(buf, sizeof(buf), "ffrtmphttp", NULL, hostname, port,
NULL);
} else {
@@ -1129,7 +1133,7 @@ static int rtmp_open(URLContext *s, const char *uri, int
flags)
}
if ((ret = ffurl_open(&rt->stream, buf, AVIO_FLAG_READ_WRITE,
- &s->interrupt_callback, NULL)) < 0) {
+ &s->interrupt_callback, &opts)) < 0) {
av_log(s , AV_LOG_ERROR, "Cannot open connection %s\n", buf);
goto fail;
}
@@ -1261,6 +1265,7 @@ static int rtmp_open(URLContext *s, const char *uri, int
flags)
return 0;
fail:
+ av_dict_free(&opts);
rtmp_close(s);
return ret;
}
@@ -1461,3 +1466,21 @@ URLProtocol ff_rtmpt_protocol = {
.flags = URL_PROTOCOL_FLAG_NETWORK,
.priv_data_class = &rtmpt_class,
};
+
+static const AVClass rtmpts_class = {
+ .class_name = "rtmpts",
+ .item_name = av_default_item_name,
+ .option = rtmp_options,
+ .version = LIBAVUTIL_VERSION_INT,
+};
+
+URLProtocol ff_rtmpts_protocol = {
+ .name = "rtmpts",
+ .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 = &rtmpts_class,
+};
diff --git a/libavformat/version.h b/libavformat/version.h
index 9547bd0..a06a7e5 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 7
+#define LIBAVFORMAT_VERSION_MINOR 8
#define LIBAVFORMAT_VERSION_MICRO 0
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
--
1.7.11.1
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
