Toggle navigation
Toggle navigation
此项目
正在载入...
Sign in
胡斌
/
srs
转到一个项目
Toggle navigation
项目
群组
代码片段
帮助
Toggle navigation pinning
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
Authored by
winlin
2014-06-30 22:13:42 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
ba2e7bbf7649f589517c516ae7de64affc3dfd85
ba2e7bbf
1 parent
fb70602f
support create stream twice. 0.9.145
隐藏空白字符变更
内嵌
并排对比
正在显示
2 个修改的文件
包含
20 行增加
和
1 行删除
trunk/src/core/srs_core.hpp
trunk/src/rtmp/srs_protocol_rtmp.cpp
trunk/src/core/srs_core.hpp
查看文件 @
ba2e7bb
...
...
@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
// current release version
#define VERSION_MAJOR "0"
#define VERSION_MINOR "9"
#define VERSION_REVISION "14
3
"
#define VERSION_REVISION "14
5
"
#define RTMP_SIG_SRS_VERSION VERSION_MAJOR"."VERSION_MINOR"."VERSION_REVISION
// server info.
#define RTMP_SIG_SRS_KEY "SRS"
...
...
trunk/src/rtmp/srs_protocol_rtmp.cpp
查看文件 @
ba2e7bb
...
...
@@ -996,6 +996,21 @@ int SrsRtmpServer::identify_client(int stream_id, SrsRtmpConnType& type, string&
srs_info
(
"level0 identify client by play."
);
return
identify_play_client
(
dynamic_cast
<
SrsPlayPacket
*>
(
pkt
),
type
,
stream_name
,
duration
);
}
// call msg,
// support response null first,
// @see https://github.com/winlinvip/simple-rtmp-server/issues/106
// TODO: FIXME: response in right way, or forward in edge mode.
SrsCallPacket
*
call
=
dynamic_cast
<
SrsCallPacket
*>
(
pkt
);
if
(
call
)
{
SrsCallResPacket
*
res
=
new
SrsCallResPacket
(
call
->
transaction_id
);
res
->
command_object
=
SrsAmf0Any
::
null
();
res
->
response
=
SrsAmf0Any
::
null
();
if
((
ret
=
protocol
->
send_and_free_packet
(
res
,
0
))
!=
ERROR_SUCCESS
)
{
srs_warn
(
"response call failed. ret=%d"
,
ret
);
return
ret
;
}
continue
;
}
srs_trace
(
"ignore AMF0/AMF3 command message."
);
}
...
...
@@ -1387,6 +1402,10 @@ int SrsRtmpServer::identify_create_stream_client(SrsCreateStreamPacket* req, int
srs_info
(
"identify client by publish, falsh publish."
);
return
identify_flash_publish_client
(
dynamic_cast
<
SrsPublishPacket
*>
(
pkt
),
type
,
stream_name
);
}
if
(
dynamic_cast
<
SrsCreateStreamPacket
*>
(
pkt
))
{
srs_info
(
"identify client by create stream, play or flash publish."
);
return
identify_create_stream_client
(
dynamic_cast
<
SrsCreateStreamPacket
*>
(
pkt
),
stream_id
,
type
,
stream_name
,
duration
);
}
srs_trace
(
"ignore AMF0/AMF3 command message."
);
}
...
...
请
注册
或
登录
后发表评论