Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
小白菜888
Ffmpeg
提交
6aedabc9
F
Ffmpeg
项目概览
小白菜888
/
Ffmpeg
通知
3
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
F
Ffmpeg
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
6aedabc9
编写于
7月 17, 2012
作者:
S
Samuel Pitoiset
提交者:
Martin Storsjö
7月 17, 2012
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
RTMPS protocol support
Signed-off-by:
N
Martin Storsjö
<
martin@martin.st
>
上级
5417efbb
变更
9
隐藏空白更改
内联
并排
Showing
9 changed file
with
38 addition
and
2 deletion
+38
-2
Changelog
Changelog
+1
-0
configure
configure
+2
-0
doc/general.texi
doc/general.texi
+1
-1
doc/protocols.texi
doc/protocols.texi
+7
-0
libavformat/Makefile
libavformat/Makefile
+1
-0
libavformat/allformats.c
libavformat/allformats.c
+1
-0
libavformat/rtmp.h
libavformat/rtmp.h
+1
-0
libavformat/rtmpproto.c
libavformat/rtmpproto.c
+23
-0
libavformat/version.h
libavformat/version.h
+1
-1
未找到文件。
Changelog
浏览文件 @
6aedabc9
...
...
@@ -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:
...
...
configure
浏览文件 @
6aedabc9
...
...
@@ -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"
...
...
doc/general.texi
浏览文件 @
6aedabc9
...
...
@@ -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
...
...
doc/protocols.texi
浏览文件 @
6aedabc9
...
...
@@ -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.
...
...
libavformat/Makefile
浏览文件 @
6aedabc9
...
...
@@ -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
...
...
libavformat/allformats.c
浏览文件 @
6aedabc9
...
...
@@ -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
);
...
...
libavformat/rtmp.h
浏览文件 @
6aedabc9
...
...
@@ -25,6 +25,7 @@
#include "avformat.h"
#define RTMP_DEFAULT_PORT 1935
#define RTMPS_DEFAULT_PORT 443
#define RTMP_HANDSHAKE_PACKET_SIZE 1536
...
...
libavformat/rtmpproto.c
浏览文件 @
6aedabc9
...
...
@@ -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
,
...
...
libavformat/version.h
浏览文件 @
6aedabc9
...
...
@@ -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, \
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录