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-09-28 11:08:30 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
bc6616bd1f24044ccf67bb3fa9cb48a779fae4ac
bc6616bd
1 parent
e0b1e044
refine code according to inspect of clion. 0.9.219
隐藏空白字符变更
内嵌
并排对比
正在显示
30 个修改的文件
包含
21 行增加
和
92 行删除
trunk/src/app/srs_app_avc_aac.cpp
trunk/src/app/srs_app_bandwidth.cpp
trunk/src/app/srs_app_conn.cpp
trunk/src/app/srs_app_dvr.cpp
trunk/src/app/srs_app_edge.cpp
trunk/src/app/srs_app_encoder.cpp
trunk/src/app/srs_app_ffmpeg.cpp
trunk/src/app/srs_app_forward.cpp
trunk/src/app/srs_app_hls.cpp
trunk/src/app/srs_app_http_api.cpp
trunk/src/app/srs_app_http_conn.cpp
trunk/src/app/srs_app_http_hooks.cpp
trunk/src/app/srs_app_ingest.cpp
trunk/src/app/srs_app_json.cpp
trunk/src/app/srs_app_kbps.cpp
trunk/src/app/srs_app_pithy_print.cpp
trunk/src/app/srs_app_rtmp_conn.cpp
trunk/src/app/srs_app_rtmp_conn.hpp
trunk/src/app/srs_app_server.cpp
trunk/src/app/srs_app_source.cpp
trunk/src/app/srs_app_st_socket.cpp
trunk/src/app/srs_app_thread.cpp
trunk/src/app/srs_app_utility.cpp
trunk/src/core/srs_core.hpp
trunk/src/kernel/srs_kernel_codec.cpp
trunk/src/kernel/srs_kernel_flv.cpp
trunk/src/rtmp/srs_protocol_amf0.cpp
trunk/src/rtmp/srs_protocol_amf0.hpp
trunk/src/rtmp/srs_protocol_rtmp.cpp
trunk/src/rtmp/srs_protocol_stack.cpp
trunk/src/app/srs_app_avc_aac.cpp
查看文件 @
bc6616b
...
...
@@ -23,11 +23,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <srs_app_avc_aac.hpp>
#include <stdlib.h>
#include <srs_kernel_error.hpp>
#include <srs_kernel_log.hpp>
#include <srs_kernel_codec.hpp>
#include <srs_kernel_stream.hpp>
#include <srs_protocol_amf0.hpp>
...
...
trunk/src/app/srs_app_bandwidth.cpp
查看文件 @
bc6616b
...
...
@@ -30,9 +30,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
using
namespace
std
;
#include <srs_protocol_rtmp.hpp>
#include <srs_kernel_error.hpp>
#include <srs_protocol_amf0.hpp>
#include <srs_protocol_stack.hpp>
#include <srs_app_config.hpp>
#include <srs_core_autofree.hpp>
#include <srs_kernel_utility.hpp>
...
...
@@ -319,7 +317,7 @@ int SrsBandwidth::play_checking(SrsBandwidthSample* sample, SrsKbpsLimit* limit)
return
ret
;
}
int
SrsBandwidth
::
play_stop
(
SrsBandwidthSample
*
sample
,
SrsKbpsLimit
*
limit
)
int
SrsBandwidth
::
play_stop
(
SrsBandwidthSample
*
sample
,
SrsKbpsLimit
*
/*limit*/
)
{
int
ret
=
ERROR_SUCCESS
;
...
...
@@ -405,7 +403,7 @@ int SrsBandwidth::publish_checking(SrsBandwidthSample* sample, SrsKbpsLimit* lim
return
ret
;
}
int
SrsBandwidth
::
publish_stop
(
SrsBandwidthSample
*
sample
,
SrsKbpsLimit
*
limit
)
int
SrsBandwidth
::
publish_stop
(
SrsBandwidthSample
*
sample
,
SrsKbpsLimit
*
/*limit*/
)
{
int
ret
=
ERROR_SUCCESS
;
...
...
trunk/src/app/srs_app_conn.cpp
查看文件 @
bc6616b
...
...
@@ -23,8 +23,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <srs_app_conn.hpp>
#include <arpa/inet.h>
#include <srs_kernel_log.hpp>
#include <srs_kernel_error.hpp>
#include <srs_app_server.hpp>
...
...
trunk/src/app/srs_app_dvr.cpp
查看文件 @
bc6616b
...
...
@@ -30,12 +30,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
using
namespace
std
;
#include <srs_app_config.hpp>
#include <srs_kernel_error.hpp>
#include <srs_protocol_rtmp.hpp>
#include <srs_protocol_stack.hpp>
#include <srs_app_source.hpp>
#include <srs_core_autofree.hpp>
#include <srs_kernel_stream.hpp>
#include <srs_kernel_utility.hpp>
#include <srs_app_http_hooks.hpp>
#include <srs_kernel_codec.hpp>
...
...
@@ -268,7 +264,7 @@ int SrsDvrPlan::on_video(SrsSharedPtrMessage* video)
return
ret
;
}
int
SrsDvrPlan
::
on_reload_vhost_dvr
(
std
::
string
vhost
)
int
SrsDvrPlan
::
on_reload_vhost_dvr
(
std
::
string
/*vhost*/
)
{
int
ret
=
ERROR_SUCCESS
;
...
...
trunk/src/app/srs_app_edge.cpp
查看文件 @
bc6616b
...
...
@@ -32,20 +32,14 @@ using namespace std;
#include <srs_kernel_error.hpp>
#include <srs_protocol_rtmp.hpp>
#include <srs_kernel_log.hpp>
#include <srs_protocol_rtmp.hpp>
#include <srs_protocol_io.hpp>
#include <srs_app_config.hpp>
#include <srs_protocol_utility.hpp>
#include <srs_protocol_rtmp.hpp>
#include <srs_app_st_socket.hpp>
#include <srs_protocol_stack.hpp>
#include <srs_app_source.hpp>
#include <srs_app_pithy_print.hpp>
#include <srs_core_autofree.hpp>
#include <srs_app_st_socket.hpp>
#include <srs_app_kbps.hpp>
#include <srs_kernel_utility.hpp>
#include <srs_protocol_msg_array.hpp>
#include <srs_app_utility.hpp>
#include <srs_protocol_amf0.hpp>
...
...
trunk/src/app/srs_app_encoder.cpp
查看文件 @
bc6616b
...
...
@@ -31,10 +31,8 @@ using namespace std;
#include <srs_app_config.hpp>
#include <srs_protocol_rtmp.hpp>
#include <srs_app_pithy_print.hpp>
#include <srs_protocol_stack.hpp>
#include <srs_app_ffmpeg.hpp>
#include <srs_kernel_utility.hpp>
#include <srs_kernel_consts.hpp>
#ifdef SRS_AUTO_TRANSCODE
...
...
trunk/src/app/srs_app_ffmpeg.cpp
查看文件 @
bc6616b
...
...
@@ -35,9 +35,6 @@ using namespace std;
#include <srs_kernel_error.hpp>
#include <srs_kernel_log.hpp>
#include <srs_app_config.hpp>
#include <srs_protocol_rtmp.hpp>
#include <srs_app_pithy_print.hpp>
#include <srs_protocol_stack.hpp>
#ifdef SRS_AUTO_FFMPEG
...
...
trunk/src/app/srs_app_forward.cpp
查看文件 @
bc6616b
...
...
@@ -31,18 +31,14 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
using
namespace
std
;
#include <srs_app_source.hpp>
#include <srs_core_autofree.hpp>
#include <srs_app_st_socket.hpp>
#include <srs_kernel_error.hpp>
#include <srs_kernel_log.hpp>
#include <srs_app_config.hpp>
#include <srs_app_pithy_print.hpp>
#include <srs_protocol_rtmp.hpp>
#include <srs_protocol_stack.hpp>
#include <srs_protocol_utility.hpp>
#include <srs_protocol_rtmp.hpp>
#include <srs_app_kbps.hpp>
#include <srs_kernel_utility.hpp>
#include <srs_protocol_msg_array.hpp>
#include <srs_app_utility.hpp>
#include <srs_protocol_amf0.hpp>
...
...
trunk/src/app/srs_app_hls.cpp
查看文件 @
bc6616b
...
...
@@ -679,7 +679,7 @@ int SrsHlsMuxer::flush_audio(SrsMpegtsFrame* af, SrsBuffer* ab)
return
ret
;
}
int
SrsHlsMuxer
::
flush_video
(
SrsMpegtsFrame
*
af
,
SrsBuffer
*
ab
,
SrsMpegtsFrame
*
vf
,
SrsBuffer
*
vb
)
int
SrsHlsMuxer
::
flush_video
(
SrsMpegtsFrame
*
/*af*/
,
SrsBuffer
*
/*ab*/
,
SrsMpegtsFrame
*
vf
,
SrsBuffer
*
vb
)
{
int
ret
=
ERROR_SUCCESS
;
...
...
trunk/src/app/srs_app_http_api.cpp
查看文件 @
bc6616b
...
...
@@ -30,11 +30,9 @@ using namespace std;
#include <srs_kernel_log.hpp>
#include <srs_kernel_error.hpp>
#include <srs_app_http.hpp>
#include <srs_app_st_socket.hpp>
#include <srs_core_autofree.hpp>
#include <srs_app_json.hpp>
#include <srs_app_config.hpp>
#include <srs_kernel_utility.hpp>
#include <srs_app_utility.hpp>
...
...
@@ -62,7 +60,7 @@ bool SrsApiRoot::is_handler_valid(SrsHttpMessage* req, int& status_code, std::st
return
true
;
}
bool
SrsApiRoot
::
can_handle
(
const
char
*
path
,
int
length
,
const
char
**
pchild
)
bool
SrsApiRoot
::
can_handle
(
const
char
*
path
,
int
/*length*/
,
const
char
**
pchild
)
{
// reset the child path to path,
// for child to reparse the path.
...
...
trunk/src/app/srs_app_http_conn.cpp
查看文件 @
bc6616b
...
...
@@ -36,9 +36,7 @@ using namespace std;
#include <srs_kernel_log.hpp>
#include <srs_kernel_error.hpp>
#include <srs_app_st_socket.hpp>
#include <srs_app_http.hpp>
#include <srs_core_autofree.hpp>
#include <srs_app_json.hpp>
#include <srs_app_config.hpp>
#include <srs_kernel_flv.hpp>
#include <srs_kernel_utility.hpp>
...
...
@@ -116,7 +114,7 @@ int SrsHttpRoot::best_match(const char* path, int length, SrsHttpHandlerMatch**
return
ERROR_HTTP_HANDLER_MATCH_URL
;
}
bool
SrsHttpRoot
::
is_handler_valid
(
SrsHttpMessage
*
req
,
int
&
status_code
,
std
::
string
&
reason_phrase
)
bool
SrsHttpRoot
::
is_handler_valid
(
SrsHttpMessage
*
/*req*/
,
int
&
status_code
,
std
::
string
&
reason_phrase
)
{
status_code
=
SRS_CONSTS_HTTP_InternalServerError
;
reason_phrase
=
SRS_CONSTS_HTTP_InternalServerError_str
;
...
...
@@ -124,7 +122,7 @@ bool SrsHttpRoot::is_handler_valid(SrsHttpMessage* req, int& status_code, std::s
return
false
;
}
int
SrsHttpRoot
::
do_process_request
(
SrsStSocket
*
skt
,
SrsHttpMessage
*
req
)
int
SrsHttpRoot
::
do_process_request
(
SrsStSocket
*
/*skt*/
,
SrsHttpMessage
*
/*req*/
)
{
int
ret
=
ERROR_SUCCESS
;
return
ret
;
...
...
trunk/src/app/srs_app_http_hooks.cpp
查看文件 @
bc6616b
...
...
@@ -30,12 +30,10 @@ using namespace std;
#include <srs_kernel_error.hpp>
#include <srs_protocol_rtmp.hpp>
#include <srs_kernel_log.hpp>
#include <srs_app_st_socket.hpp>
#include <srs_app_http.hpp>
#include <srs_app_json.hpp>
#include <srs_app_dvr.hpp>
#include <srs_app_config.hpp>
#include <srs_app_http_client.hpp>
#define SRS_HTTP_RESPONSE_OK "0"
...
...
trunk/src/app/srs_app_ingest.cpp
查看文件 @
bc6616b
...
...
@@ -33,7 +33,6 @@ using namespace std;
#include <srs_app_ffmpeg.hpp>
#include <srs_app_pithy_print.hpp>
#include <srs_kernel_utility.hpp>
#include <srs_kernel_consts.hpp>
// when error, ingester sleep for a while and retry.
// ingest never sleep a long time, for we must start the stream ASAP.
...
...
trunk/src/app/srs_app_json.cpp
查看文件 @
bc6616b
...
...
@@ -26,7 +26,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
using
namespace
std
;
#include <srs_kernel_log.hpp>
#include <srs_kernel_error.hpp>
#ifdef __SRS_JSON_USE_NXJSON
...
...
trunk/src/app/srs_app_kbps.cpp
查看文件 @
bc6616b
...
...
@@ -23,9 +23,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <srs_app_kbps.hpp>
#include <srs_kernel_error.hpp>
#include <srs_kernel_log.hpp>
#include <srs_protocol_io.hpp>
#include <srs_kernel_utility.hpp>
#include <srs_app_st.hpp>
...
...
trunk/src/app/srs_app_pithy_print.cpp
查看文件 @
bc6616b
...
...
@@ -28,7 +28,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <srs_kernel_log.hpp>
#include <srs_app_config.hpp>
#include <srs_app_reload.hpp>
#include <srs_kernel_error.hpp>
#include <srs_kernel_utility.hpp>
...
...
trunk/src/app/srs_app_rtmp_conn.cpp
查看文件 @
bc6616b
...
...
@@ -33,7 +33,6 @@ using namespace std;
#include <srs_kernel_error.hpp>
#include <srs_kernel_log.hpp>
#include <srs_protocol_rtmp.hpp>
#include <srs_protocol_stack.hpp>
#include <srs_core_autofree.hpp>
#include <srs_app_source.hpp>
#include <srs_app_server.hpp>
...
...
@@ -46,13 +45,9 @@ using namespace std;
#include <srs_app_st_socket.hpp>
#include <srs_app_http_hooks.hpp>
#include <srs_app_edge.hpp>
#include <srs_app_kbps.hpp>
#include <srs_app_utility.hpp>
#include <srs_protocol_utility.hpp>
#include <srs_kernel_utility.hpp>
#include <srs_protocol_msg_array.hpp>
#include <srs_protocol_amf0.hpp>
#include <srs_app_utility.hpp>
// when stream is busy, for example, streaming is already
// publishing, when a new client to request to publish,
...
...
@@ -987,7 +982,7 @@ int SrsRtmpConn::check_edge_token_traverse_auth()
SrsStSocket
*
io
=
new
SrsStSocket
(
stsock
);
SrsRtmpClient
*
client
=
new
SrsRtmpClient
(
io
);
ret
=
do_token_traverse_auth
(
io
,
client
);
ret
=
do_token_traverse_auth
(
client
);
srs_freep
(
client
);
srs_freep
(
io
);
...
...
@@ -1030,7 +1025,7 @@ int SrsRtmpConn::connect_server(int origin_index, st_netfd_t* pstsock)
return
ret
;
}
int
SrsRtmpConn
::
do_token_traverse_auth
(
Srs
StSocket
*
io
,
Srs
RtmpClient
*
client
)
int
SrsRtmpConn
::
do_token_traverse_auth
(
SrsRtmpClient
*
client
)
{
int
ret
=
ERROR_SUCCESS
;
...
...
trunk/src/app/srs_app_rtmp_conn.hpp
查看文件 @
bc6616b
...
...
@@ -97,7 +97,7 @@ private:
private
:
virtual
int
check_edge_token_traverse_auth
();
virtual
int
connect_server
(
int
origin_index
,
st_netfd_t
*
pstsock
);
virtual
int
do_token_traverse_auth
(
Srs
StSocket
*
io
,
Srs
RtmpClient
*
client
);
virtual
int
do_token_traverse_auth
(
SrsRtmpClient
*
client
);
private
:
virtual
int
http_hooks_on_connect
();
virtual
void
http_hooks_on_close
();
...
...
trunk/src/app/srs_app_server.cpp
查看文件 @
bc6616b
...
...
@@ -40,12 +40,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <srs_kernel_utility.hpp>
#include <srs_app_http_api.hpp>
#include <srs_app_http_conn.hpp>
#include <srs_app_http.hpp>
#include <srs_app_ingest.hpp>
#include <srs_app_source.hpp>
#include <srs_app_utility.hpp>
#include <srs_app_heartbeat.hpp>
#include <srs_app_kbps.hpp>
// signal defines.
#define SIGNAL_RELOAD SIGHUP
...
...
@@ -971,7 +969,7 @@ int SrsServer::on_reload_vhost_added(std::string vhost)
return
ret
;
}
int
SrsServer
::
on_reload_vhost_removed
(
std
::
string
vhost
)
int
SrsServer
::
on_reload_vhost_removed
(
std
::
string
/*vhost*/
)
{
int
ret
=
ERROR_SUCCESS
;
...
...
trunk/src/app/srs_app_source.cpp
查看文件 @
bc6616b
...
...
@@ -29,7 +29,6 @@ using namespace std;
#include <srs_kernel_log.hpp>
#include <srs_protocol_stack.hpp>
#include <srs_core_autofree.hpp>
#include <srs_protocol_amf0.hpp>
#include <srs_kernel_codec.hpp>
#include <srs_app_hls.hpp>
...
...
trunk/src/app/srs_app_st_socket.cpp
查看文件 @
bc6616b
...
...
@@ -24,7 +24,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <srs_app_st_socket.hpp>
#include <srs_kernel_error.hpp>
#include <srs_kernel_utility.hpp>
SrsStSocket
::
SrsStSocket
(
st_netfd_t
client_stfd
)
{
...
...
trunk/src/app/srs_app_thread.cpp
查看文件 @
bc6616b
...
...
@@ -26,10 +26,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <srs_kernel_error.hpp>
#include <srs_kernel_log.hpp>
// const time for st to convert to us
#define SRS_TIME_MILLISECONDS 1000
#define SRS_TIME_SECONDS 1000000
ISrsThreadHandler
::
ISrsThreadHandler
()
{
}
...
...
@@ -105,7 +101,7 @@ int SrsThread::start()
// wait for cid to ready, for parent thread to get the cid.
while
(
_cid
<
0
&&
loop
)
{
st_usleep
(
10
*
SRS_TIME_MILLISECONDS
);
st_usleep
(
10
*
1000
);
}
// now, cycle thread can run.
...
...
@@ -154,7 +150,7 @@ void SrsThread::thread_cycle()
// wait for cid to ready, for parent thread to get the cid.
while
(
!
can_run
&&
loop
)
{
st_usleep
(
10
*
SRS_TIME_MILLISECONDS
);
st_usleep
(
10
*
1000
);
}
while
(
loop
)
{
...
...
trunk/src/app/srs_app_utility.cpp
查看文件 @
bc6616b
...
...
@@ -36,7 +36,6 @@ using namespace std;
#include <srs_kernel_error.hpp>
#include <srs_app_kbps.hpp>
#include <srs_app_json.hpp>
#include <srs_kernel_consts.hpp>
int
srs_socket_connect
(
std
::
string
server
,
int
port
,
int64_t
timeout
,
st_netfd_t
*
pstfd
)
{
...
...
@@ -92,18 +91,18 @@ failed:
int
srs_get_log_level
(
std
::
string
level
)
{
if
(
"verbose"
==
_srs_config
->
get_log_level
()
)
{
if
(
"verbose"
==
level
)
{
return
SrsLogLevel
::
Verbose
;
}
else
if
(
"info"
==
_srs_config
->
get_log_level
()
)
{
}
else
if
(
"info"
==
level
)
{
return
SrsLogLevel
::
Info
;
}
else
if
(
"trace"
==
_srs_config
->
get_log_level
()
)
{
}
else
if
(
"trace"
==
level
)
{
return
SrsLogLevel
::
Trace
;
}
else
if
(
"warn"
==
_srs_config
->
get_log_level
()
)
{
}
else
if
(
"warn"
==
level
)
{
return
SrsLogLevel
::
Warn
;
}
else
if
(
"error"
==
_srs_config
->
get_log_level
()
)
{
}
else
if
(
"error"
==
level
)
{
return
SrsLogLevel
::
Error
;
}
else
{
return
SrsLogLevel
::
Trace
;
return
SrsLogLevel
::
Disabled
;
}
}
...
...
@@ -995,8 +994,6 @@ string srs_get_local_ip(int fd)
int
srs_get_local_port
(
int
fd
)
{
std
::
string
ip
;
// discovery client information
sockaddr_in
addr
;
socklen_t
addrlen
=
sizeof
(
addr
);
...
...
trunk/src/core/srs_core.hpp
查看文件 @
bc6616b
...
...
@@ -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 "21
8
"
#define VERSION_REVISION "21
9
"
#define RTMP_SIG_SRS_VERSION VERSION_MAJOR"."VERSION_MINOR"."VERSION_REVISION
// server info.
#define RTMP_SIG_SRS_KEY "SRS"
...
...
trunk/src/kernel/srs_kernel_codec.cpp
查看文件 @
bc6616b
...
...
@@ -26,11 +26,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <string.h>
#include <stdlib.h>
#include <srs_kernel_error.hpp>
#include <srs_kernel_stream.hpp>
#include <srs_kernel_log.hpp>
#include <srs_core_autofree.hpp>
SrsFlvCodec
::
SrsFlvCodec
()
{
}
...
...
trunk/src/kernel/srs_kernel_flv.cpp
查看文件 @
bc6616b
...
...
@@ -30,9 +30,7 @@ using namespace std;
#include <srs_kernel_log.hpp>
#include <srs_kernel_error.hpp>
#include <srs_core_autofree.hpp>
#include <srs_kernel_stream.hpp>
#include <srs_kernel_utility.hpp>
#include <srs_kernel_file.hpp>
#define SRS_FLV_TAG_HEADER_SIZE 11
...
...
trunk/src/rtmp/srs_protocol_amf0.cpp
查看文件 @
bc6616b
...
...
@@ -499,7 +499,6 @@ void SrsUnSortedHashtable::copy(SrsUnSortedHashtable* src)
SrsAmf0ObjectEOF
::
SrsAmf0ObjectEOF
()
{
marker
=
RTMP_AMF0_ObjectEnd
;
utf8_empty
=
0x00
;
}
SrsAmf0ObjectEOF
::~
SrsAmf0ObjectEOF
()
...
...
trunk/src/rtmp/srs_protocol_amf0.hpp
查看文件 @
bc6616b
...
...
@@ -756,8 +756,6 @@ namespace _srs_internal
class
SrsAmf0ObjectEOF
:
public
SrsAmf0Any
{
public
:
int16_t
utf8_empty
;
public
:
SrsAmf0ObjectEOF
();
virtual
~
SrsAmf0ObjectEOF
();
public
:
...
...
trunk/src/rtmp/srs_protocol_rtmp.cpp
查看文件 @
bc6616b
...
...
@@ -24,12 +24,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <srs_protocol_rtmp.hpp>
#include <srs_core_autofree.hpp>
#include <srs_kernel_log.hpp>
#include <srs_kernel_error.hpp>
#include <srs_protocol_io.hpp>
#include <srs_protocol_amf0.hpp>
#include <srs_protocol_handshake.hpp>
#include <srs_protocol_stack.hpp>
#include <srs_protocol_utility.hpp>
#include <srs_kernel_stream.hpp>
#include <srs_kernel_utility.hpp>
...
...
@@ -929,7 +926,7 @@ int SrsRtmpServer::response_connect_app(SrsRequest *req, const char* server_ip)
return
ret
;
}
void
SrsRtmpServer
::
response_connect_reject
(
SrsRequest
*
req
,
const
char
*
desc
)
void
SrsRtmpServer
::
response_connect_reject
(
SrsRequest
*
/*req*/
,
const
char
*
desc
)
{
int
ret
=
ERROR_SUCCESS
;
...
...
trunk/src/rtmp/srs_protocol_stack.cpp
查看文件 @
bc6616b
...
...
@@ -23,15 +23,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <srs_protocol_stack.hpp>
#include <srs_kernel_log.hpp>
#include <srs_protocol_amf0.hpp>
#include <srs_kernel_error.hpp>
#include <srs_protocol_io.hpp>
#include <srs_kernel_buffer.hpp>
#include <srs_kernel_stream.hpp>
#include <srs_core_autofree.hpp>
#include <srs_kernel_utility.hpp>
#include <srs_kernel_consts.hpp>
using
namespace
std
;
...
...
请
注册
或
登录
后发表评论