RTMPS protocol support

Signed-off-by: Martin Storsjö <martin@martin.st>

diff --git a/Changelog b/Changelog
index de54213..d183a38 100644 (file)
--- 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
+- RTMPS protocol support
 
 
 version 0.8:

diff --git a/configure b/configure
index 9639147..18963ee 100755 (executable)
--- a/configure
+++ b/configure
@@ -1543,6 +1543,8 @@ mmsh_protocol_select="http_protocol"
 mmst_protocol_deps="network"
 rtmp_protocol_deps="!librtmp_protocol"
 rtmp_protocol_select="tcp_protocol"
+rtmps_protocol_deps="!librtmp_protocol"
+rtmps_protocol_select="tls_protocol"
 rtmpt_protocol_deps="!librtmp_protocol"
 rtmpt_protocol_select="ffrtmphttp_protocol"
 rtp_protocol_select="udp_protocol"

diff --git a/doc/general.texi b/doc/general.texi
index 49a6b80..e0228cf 100644 (file)
--- a/doc/general.texi
+++ b/doc/general.texi
@@ -844,7 +844,7 @@ performance on systems without hardware floating point support).
 @item pipe         @tab X
 @item RTMP         @tab X
 @item RTMPE        @tab E
-@item RTMPS        @tab E
+@item RTMPS        @tab X
 @item RTMPT        @tab X
 @item RTMPTE       @tab E
 @item RTP          @tab X

diff --git a/doc/protocols.texi b/doc/protocols.texi
index 943287a..4591822 100644 (file)
--- a/doc/protocols.texi
+++ b/doc/protocols.texi
@@ -247,6 +247,13 @@ For example to read with @command{avplay} a multimedia resource named
 avplay rtmp://myserver/vod/sample
 @end example
 
+@section rtmps
+
+Real-Time Messaging Protocol over a secure SSL connection.
+
+The Real-Time Messaging Protocol (RTMPS) is used for streaming
+multimedia content across an encrypted connection.
+
 @section rtmpt
 
 Real-Time Messaging Protocol tunneled through HTTP.

diff --git a/libavformat/Makefile b/libavformat/Makefile
index ae057f2..abde7d8 100644 (file)
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -352,6 +352,7 @@ OBJS-$(CONFIG_MMST_PROTOCOL)             += mmst.o mms.o asf.o
 OBJS-$(CONFIG_MD5_PROTOCOL)              += md5proto.o
 OBJS-$(CONFIG_PIPE_PROTOCOL)             += file.o
 OBJS-$(CONFIG_RTMP_PROTOCOL)             += rtmpproto.o rtmppkt.o
+OBJS-$(CONFIG_RTMPS_PROTOCOL)            += rtmpproto.o rtmppkt.o
 OBJS-$(CONFIG_RTMPT_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 34d8359..6ded203 100644 (file)
--- a/libavformat/allformats.c
+++ b/libavformat/allformats.c
@@ -258,6 +258,7 @@ void av_register_all(void)
     REGISTER_PROTOCOL (MD5,  md5);
     REGISTER_PROTOCOL (PIPE, pipe);
     REGISTER_PROTOCOL (RTMP, rtmp);
+    REGISTER_PROTOCOL (RTMPS, rtmps);
     REGISTER_PROTOCOL (RTMPT, rtmpt);
     REGISTER_PROTOCOL (RTP, rtp);
     REGISTER_PROTOCOL (SCTP, sctp);

diff --git a/libavformat/rtmp.h b/libavformat/rtmp.h
index 45de73e..f9d9900 100644 (file)
--- a/libavformat/rtmp.h
+++ b/libavformat/rtmp.h
@@ -25,6 +25,7 @@
 #include "avformat.h"
 
 #define RTMP_DEFAULT_PORT 1935
+#define RTMPS_DEFAULT_PORT 443
 
 #define RTMP_HANDSHAKE_PACKET_SIZE 1536
 

diff --git a/libavformat/rtmpproto.c b/libavformat/rtmpproto.c
index f8ec894..07af403 100644 (file)
--- a/libavformat/rtmpproto.c
+++ b/libavformat/rtmpproto.c
@@ -1121,6 +1121,11 @@ static int rtmp_open(URLContext *s, const char *uri, int flags)
     if (!strcmp(proto, "rtmpt")) {
         /* open the http tunneling connection */
         ff_url_join(buf, sizeof(buf), "ffrtmphttp", NULL, hostname, port, NULL);
+    } else if (!strcmp(proto, "rtmps")) {
+        /* open the tls connection */
+        if (port < 0)
+            port = RTMPS_DEFAULT_PORT;
+        ff_url_join(buf, sizeof(buf), "tls", NULL, hostname, port, NULL);
     } else {
         /* open the tcp connection */
         if (port < 0)
@@ -1444,6 +1449,24 @@ URLProtocol ff_rtmp_protocol = {
     .priv_data_class= &rtmp_class,
 };
 
+static const AVClass rtmps_class = {
+    .class_name = "rtmps",
+    .item_name  = av_default_item_name,
+    .option     = rtmp_options,
+    .version    = LIBAVUTIL_VERSION_INT,
+};
+
+URLProtocol ff_rtmps_protocol = {
+    .name            = "rtmps",
+    .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 = &rtmps_class,
+};
+
 static const AVClass rtmpt_class = {
     .class_name = "rtmpt",
     .item_name  = av_default_item_name,

diff --git a/libavformat/version.h b/libavformat/version.h
index 9547bd0..a06a7e5 100644 (file)
--- 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, \