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
2017-01-16 16:20:34 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
f4c0af8bfcad3508d09e7949647404c6789eae47
f4c0af8b
1 parent
1ed51182
refine code remove dup api for #742
隐藏空白字符变更
内嵌
并排对比
正在显示
6 个修改的文件
包含
8 行增加
和
20 行删除
trunk/src/app/srs_app_caster_flv.cpp
trunk/src/app/srs_app_mpegts_udp.cpp
trunk/src/app/srs_app_rtmp_conn.cpp
trunk/src/app/srs_app_rtmp_conn.hpp
trunk/src/app/srs_app_rtsp.cpp
trunk/src/main/srs_main_ingest_hls.cpp
trunk/src/app/srs_app_caster_flv.cpp
查看文件 @
f4c0af8
...
...
@@ -43,6 +43,7 @@ using namespace std;
#include <srs_protocol_amf0.hpp>
#include <srs_kernel_utility.hpp>
#include <srs_app_rtmp_conn.hpp>
#include <srs_protocol_utility.hpp>
#define SRS_HTTP_FLV_STREAM_BUFFER 4096
...
...
@@ -216,7 +217,7 @@ int SrsDynamicHttpConn::do_proxy(ISrsHttpResponseReader* rr, SrsFlvDecoder* dec)
}
SrsSharedPtrMessage
*
msg
=
NULL
;
if
((
ret
=
s
dk
->
rtmp_create_msg
(
type
,
time
,
data
,
size
,
&
msg
))
!=
ERROR_SUCCESS
)
{
if
((
ret
=
s
rs_rtmp_create_msg
(
type
,
time
,
data
,
size
,
sdk
->
sid
()
,
&
msg
))
!=
ERROR_SUCCESS
)
{
return
ret
;
}
...
...
trunk/src/app/srs_app_mpegts_udp.cpp
查看文件 @
f4c0af8
...
...
@@ -50,6 +50,7 @@ using namespace std;
#include <srs_raw_avc.hpp>
#include <srs_app_pithy_print.hpp>
#include <srs_app_rtmp_conn.hpp>
#include <srs_protocol_utility.hpp>
SrsMpegtsQueue
::
SrsMpegtsQueue
()
{
...
...
@@ -571,7 +572,7 @@ int SrsMpegtsOverUdp::rtmp_write_packet(char type, u_int32_t timestamp, char* da
SrsSharedPtrMessage
*
msg
=
NULL
;
if
((
ret
=
s
dk
->
rtmp_create_msg
(
type
,
timestamp
,
data
,
size
,
&
msg
))
!=
ERROR_SUCCESS
)
{
if
((
ret
=
s
rs_rtmp_create_msg
(
type
,
timestamp
,
data
,
size
,
sdk
->
sid
()
,
&
msg
))
!=
ERROR_SUCCESS
)
{
srs_error
(
"mpegts: create shared ptr msg failed. ret=%d"
,
ret
);
return
ret
;
}
...
...
trunk/src/app/srs_app_rtmp_conn.cpp
查看文件 @
f4c0af8
...
...
@@ -270,20 +270,6 @@ int SrsSimpleRtmpClient::sid()
return
stream_id
;
}
int
SrsSimpleRtmpClient
::
rtmp_create_msg
(
char
type
,
u_int32_t
timestamp
,
char
*
data
,
int
size
,
SrsSharedPtrMessage
**
pmsg
)
{
*
pmsg
=
NULL
;
int
ret
=
ERROR_SUCCESS
;
if
((
ret
=
srs_rtmp_create_msg
(
type
,
timestamp
,
data
,
size
,
stream_id
,
pmsg
))
!=
ERROR_SUCCESS
)
{
srs_error
(
"sdk: create shared ptr msg failed. ret=%d"
,
ret
);
return
ret
;
}
return
ret
;
}
int
SrsSimpleRtmpClient
::
recv_message
(
SrsCommonMessage
**
pmsg
)
{
return
client
->
recv_message
(
pmsg
);
...
...
trunk/src/app/srs_app_rtmp_conn.hpp
查看文件 @
f4c0af8
...
...
@@ -90,8 +90,6 @@ public:
virtual
void
kbps_sample
(
const
char
*
label
,
int64_t
age
,
int
msgs
);
virtual
int
sid
();
public
:
virtual
int
rtmp_create_msg
(
char
type
,
u_int32_t
timestamp
,
char
*
data
,
int
size
,
SrsSharedPtrMessage
**
pmsg
);
public
:
virtual
int
recv_message
(
SrsCommonMessage
**
pmsg
);
virtual
int
decode_message
(
SrsCommonMessage
*
msg
,
SrsPacket
**
ppacket
);
virtual
int
send_and_free_messages
(
SrsSharedPtrMessage
**
msgs
,
int
nb_msgs
);
...
...
trunk/src/app/srs_app_rtsp.cpp
查看文件 @
f4c0af8
...
...
@@ -43,6 +43,7 @@ using namespace std;
#include <srs_kernel_codec.hpp>
#include <srs_app_pithy_print.hpp>
#include <srs_app_rtmp_conn.hpp>
#include <srs_protocol_utility.hpp>
#ifdef SRS_AUTO_STREAM_CASTER
...
...
@@ -624,7 +625,7 @@ int SrsRtspConn::rtmp_write_packet(char type, u_int32_t timestamp, char* data, i
SrsSharedPtrMessage
*
msg
=
NULL
;
if
((
ret
=
s
dk
->
rtmp_create_msg
(
type
,
timestamp
,
data
,
size
,
&
msg
))
!=
ERROR_SUCCESS
)
{
if
((
ret
=
s
rs_rtmp_create_msg
(
type
,
timestamp
,
data
,
size
,
sdk
->
sid
()
,
&
msg
))
!=
ERROR_SUCCESS
)
{
srs_error
(
"rtsp: create shared ptr msg failed. ret=%d"
,
ret
);
return
ret
;
}
...
...
trunk/src/main/srs_main_ingest_hls.cpp
查看文件 @
f4c0af8
...
...
@@ -48,6 +48,7 @@ using namespace std;
#include <srs_raw_avc.hpp>
#include <srs_app_http_conn.hpp>
#include <srs_app_rtmp_conn.hpp>
#include <srs_protocol_utility.hpp>
// pre-declare
int
proxy_hls2rtmp
(
std
::
string
hls
,
std
::
string
rtmp
);
...
...
@@ -1185,7 +1186,7 @@ int SrsIngestSrsOutput::rtmp_write_packet(char type, u_int32_t timestamp, char*
SrsSharedPtrMessage
*
msg
=
NULL
;
if
((
ret
=
s
dk
->
rtmp_create_msg
(
type
,
timestamp
,
data
,
size
,
&
msg
))
!=
ERROR_SUCCESS
)
{
if
((
ret
=
s
rs_rtmp_create_msg
(
type
,
timestamp
,
data
,
size
,
sdk
->
sid
()
,
&
msg
))
!=
ERROR_SUCCESS
)
{
srs_error
(
"mpegts: create shared ptr msg failed. ret=%d"
,
ret
);
return
ret
;
}
...
...
请
注册
或
登录
后发表评论