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-08-02 22:18:39 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
7b24788445031dba778c01ef0610985caffb78ea
7b247884
1 parent
84450e15
for bug #143, build on centos5.
隐藏空白字符变更
内嵌
并排对比
正在显示
100 个修改的文件
包含
105 行增加
和
24 行删除
trunk/src/app/srs_app_avc_aac.cpp
trunk/src/app/srs_app_avc_aac.hpp
trunk/src/app/srs_app_bandwidth.cpp
trunk/src/app/srs_app_bandwidth.hpp
trunk/src/app/srs_app_config.cpp
trunk/src/app/srs_app_config.hpp
trunk/src/app/srs_app_conn.cpp
trunk/src/app/srs_app_conn.hpp
trunk/src/app/srs_app_dvr.cpp
trunk/src/app/srs_app_dvr.hpp
trunk/src/app/srs_app_edge.cpp
trunk/src/app/srs_app_edge.hpp
trunk/src/app/srs_app_empty.cpp
trunk/src/app/srs_app_empty.hpp
trunk/src/app/srs_app_encoder.cpp
trunk/src/app/srs_app_encoder.hpp
trunk/src/app/srs_app_ffmpeg.cpp
trunk/src/app/srs_app_ffmpeg.hpp
trunk/src/app/srs_app_forward.cpp
trunk/src/app/srs_app_forward.hpp
trunk/src/app/srs_app_heartbeat.cpp
trunk/src/app/srs_app_heartbeat.hpp
trunk/src/app/srs_app_hls.cpp
trunk/src/app/srs_app_hls.hpp
trunk/src/app/srs_app_http.cpp
trunk/src/app/srs_app_http.hpp
trunk/src/app/srs_app_http_api.cpp
trunk/src/app/srs_app_http_api.hpp
trunk/src/app/srs_app_http_client.cpp
trunk/src/app/srs_app_http_client.hpp
trunk/src/app/srs_app_http_conn.cpp
trunk/src/app/srs_app_http_conn.hpp
trunk/src/app/srs_app_http_hooks.cpp
trunk/src/app/srs_app_http_hooks.hpp
trunk/src/app/srs_app_ingest.cpp
trunk/src/app/srs_app_ingest.hpp
trunk/src/app/srs_app_json.cpp
trunk/src/app/srs_app_json.hpp
trunk/src/app/srs_app_kbps.cpp
trunk/src/app/srs_app_kbps.hpp
trunk/src/app/srs_app_log.cpp
trunk/src/app/srs_app_log.hpp
trunk/src/app/srs_app_pithy_print.cpp
trunk/src/app/srs_app_pithy_print.hpp
trunk/src/app/srs_app_refer.cpp
trunk/src/app/srs_app_refer.hpp
trunk/src/app/srs_app_reload.cpp
trunk/src/app/srs_app_reload.hpp
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_server.hpp
trunk/src/app/srs_app_source.cpp
trunk/src/app/srs_app_source.hpp
trunk/src/app/srs_app_st.cpp
trunk/src/app/srs_app_st.hpp
trunk/src/app/srs_app_st_socket.cpp
trunk/src/app/srs_app_st_socket.hpp
trunk/src/app/srs_app_thread.cpp
trunk/src/app/srs_app_thread.hpp
trunk/src/app/srs_app_utility.cpp
trunk/src/app/srs_app_utility.hpp
trunk/src/core/srs_core.cpp
trunk/src/core/srs_core.hpp
trunk/src/core/srs_core_autofree.cpp
trunk/src/core/srs_core_autofree.hpp
trunk/src/kernel/srs_kernel_buffer.cpp
trunk/src/kernel/srs_kernel_buffer.hpp
trunk/src/kernel/srs_kernel_codec.cpp
trunk/src/kernel/srs_kernel_codec.hpp
trunk/src/kernel/srs_kernel_consts.cpp
trunk/src/kernel/srs_kernel_consts.hpp
trunk/src/kernel/srs_kernel_error.cpp
trunk/src/kernel/srs_kernel_error.hpp
trunk/src/kernel/srs_kernel_file.cpp
trunk/src/kernel/srs_kernel_file.hpp
trunk/src/kernel/srs_kernel_flv.cpp
trunk/src/kernel/srs_kernel_flv.hpp
trunk/src/kernel/srs_kernel_log.cpp
trunk/src/kernel/srs_kernel_log.hpp
trunk/src/kernel/srs_kernel_stream.cpp
trunk/src/kernel/srs_kernel_stream.hpp
trunk/src/kernel/srs_kernel_utility.cpp
trunk/src/kernel/srs_kernel_utility.hpp
trunk/src/libs/srs_lib_bandwidth.cpp
trunk/src/libs/srs_lib_bandwidth.hpp
trunk/src/libs/srs_lib_simple_socket.cpp
trunk/src/libs/srs_lib_simple_socket.hpp
trunk/src/libs/srs_librtmp.cpp
trunk/src/libs/srs_librtmp.hpp
trunk/src/main/srs_main_server.cpp
trunk/src/rtmp/srs_protocol_amf0.cpp
trunk/src/rtmp/srs_protocol_amf0.hpp
trunk/src/rtmp/srs_protocol_handshake.cpp
trunk/src/rtmp/srs_protocol_handshake.hpp
trunk/src/rtmp/srs_protocol_io.cpp
trunk/src/rtmp/srs_protocol_io.hpp
trunk/src/rtmp/srs_protocol_msg_array.cpp
trunk/src/rtmp/srs_protocol_msg_array.hpp
trunk/src/rtmp/srs_protocol_rtmp.cpp
要显示太多修改。
重新载入完整差异
差异文件
邮件补丁
为保证性能只显示
100 of 100+
个文件。
trunk/src/app/srs_app_avc_aac.cpp
查看文件 @
7b24788
...
...
@@ -498,3 +498,4 @@ int SrsAvcAacCodec::video_avc_demux(char* data, int size, SrsCodecSample* sample
return
ret
;
}
...
...
trunk/src/app/srs_app_avc_aac.hpp
查看文件 @
7b24788
...
...
@@ -281,3 +281,4 @@ public:
};
#endif
...
...
trunk/src/app/srs_app_bandwidth.cpp
查看文件 @
7b24788
...
...
@@ -476,3 +476,4 @@ int SrsBandwidth::finial(SrsBandwidthSample& play_sample, SrsBandwidthSample& pu
return
ret
;
}
...
...
trunk/src/app/srs_app_bandwidth.hpp
查看文件 @
7b24788
...
...
@@ -199,4 +199,4 @@ private:
virtual
int
finial
(
SrsBandwidthSample
&
play_sample
,
SrsBandwidthSample
&
publish_sample
,
int64_t
start_time
,
int64_t
&
end_time
);
};
#endif
\ No newline at end of file
#endif
...
...
trunk/src/app/srs_app_config.cpp
查看文件 @
7b24788
...
...
@@ -2156,7 +2156,7 @@ int SrsConfig::get_bw_check_interval_ms(string vhost)
return
SRS_CONF_DEFAULT_BANDWIDTH_INTERVAL
*
1000
;
}
return
::
atof
(
conf
->
arg0
().
c_str
())
*
1000
;
return
(
int
)(
::
atof
(
conf
->
arg0
().
c_str
())
*
1000
)
;
}
int
SrsConfig
::
get_bw_check_limit_kbps
(
string
vhost
)
...
...
@@ -3316,3 +3316,4 @@ bool srs_directive_equals(SrsConfDirective* a, SrsConfDirective* b)
return
true
;
}
...
...
trunk/src/app/srs_app_config.hpp
查看文件 @
7b24788
...
...
@@ -986,4 +986,4 @@ bool srs_directive_equals(SrsConfDirective* a, SrsConfDirective* b);
// global config
extern
SrsConfig
*
_srs_config
;
#endif
\ No newline at end of file
#endif
...
...
trunk/src/app/srs_app_conn.cpp
查看文件 @
7b24788
...
...
@@ -94,3 +94,4 @@ void SrsConnection::stop()
srs_freep
(
pthread
);
}
...
...
trunk/src/app/srs_app_conn.hpp
查看文件 @
7b24788
...
...
@@ -112,4 +112,4 @@ private:
virtual
void
stop
();
};
#endif
\ No newline at end of file
#endif
...
...
trunk/src/app/srs_app_dvr.cpp
查看文件 @
7b24788
...
...
@@ -551,3 +551,4 @@ int SrsDvr::on_video(SrsSharedPtrMessage* video)
#endif
...
...
trunk/src/app/srs_app_dvr.hpp
查看文件 @
7b24788
...
...
@@ -219,3 +219,4 @@ public:
#endif
#endif
...
...
trunk/src/app/srs_app_edge.cpp
查看文件 @
7b24788
...
...
@@ -722,3 +722,4 @@ void SrsPublishEdge::on_proxy_unpublish()
state
=
SrsEdgeStateInit
;
srs_trace
(
"edge change from %d to state %d (init)."
,
pstate
,
state
);
}
...
...
trunk/src/app/srs_app_edge.hpp
查看文件 @
7b24788
...
...
@@ -218,3 +218,4 @@ public:
};
#endif
...
...
trunk/src/app/srs_app_empty.cpp
查看文件 @
7b24788
...
...
@@ -23,3 +23,4 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <srs_app_empty.hpp>
...
...
trunk/src/app/srs_app_empty.hpp
查看文件 @
7b24788
...
...
@@ -30,3 +30,4 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <srs_core.hpp>
#endif
...
...
trunk/src/app/srs_app_encoder.cpp
查看文件 @
7b24788
...
...
@@ -338,3 +338,4 @@ void SrsEncoder::encoder()
#endif
...
...
trunk/src/app/srs_app_encoder.hpp
查看文件 @
7b24788
...
...
@@ -75,3 +75,4 @@ private:
#endif
#endif
...
...
trunk/src/app/srs_app_ffmpeg.cpp
查看文件 @
7b24788
...
...
@@ -498,3 +498,4 @@ void SrsFFMPEG::stop()
#endif
...
...
trunk/src/app/srs_app_ffmpeg.hpp
查看文件 @
7b24788
...
...
@@ -89,3 +89,4 @@ public:
#endif
#endif
...
...
trunk/src/app/srs_app_forward.cpp
查看文件 @
7b24788
...
...
@@ -350,3 +350,4 @@ int SrsForwarder::forward()
return
ret
;
}
...
...
trunk/src/app/srs_app_forward.hpp
查看文件 @
7b24788
...
...
@@ -88,3 +88,4 @@ private:
};
#endif
...
...
trunk/src/app/srs_app_heartbeat.cpp
查看文件 @
7b24788
...
...
@@ -92,3 +92,4 @@ void SrsHttpHeartbeat::heartbeat()
}
#endif
...
...
trunk/src/app/srs_app_heartbeat.hpp
查看文件 @
7b24788
...
...
@@ -49,3 +49,4 @@ public:
#endif
#endif
...
...
trunk/src/app/srs_app_hls.cpp
查看文件 @
7b24788
...
...
@@ -993,8 +993,8 @@ int SrsHlsCache::on_publish(SrsHlsMuxer* muxer, SrsRequest* req, int64_t segment
std
::
string
stream
=
req
->
stream
;
std
::
string
app
=
req
->
app
;
int
hls_fragment
=
_srs_config
->
get_hls_fragment
(
vhost
);
int
hls_window
=
_srs_config
->
get_hls_window
(
vhost
);
int
hls_fragment
=
(
int
)
_srs_config
->
get_hls_fragment
(
vhost
);
int
hls_window
=
(
int
)
_srs_config
->
get_hls_window
(
vhost
);
// get the hls path config
std
::
string
hls_path
=
_srs_config
->
get_hls_path
(
vhost
);
...
...
@@ -1531,3 +1531,4 @@ void SrsHls::hls_mux()
#endif
...
...
trunk/src/app/srs_app_hls.hpp
查看文件 @
7b24788
...
...
@@ -346,4 +346,4 @@ private:
#endif
#endif
\ No newline at end of file
#endif
...
...
trunk/src/app/srs_app_http.cpp
查看文件 @
7b24788
...
...
@@ -1089,3 +1089,4 @@ string SrsHttpUri::get_uri_field(string uri, http_parser_url* hp_u, http_parser_
}
#endif
...
...
trunk/src/app/srs_app_http.hpp
查看文件 @
7b24788
...
...
@@ -366,4 +366,4 @@ private:
#endif
#endif
\ No newline at end of file
#endif
...
...
trunk/src/app/srs_app_http_api.cpp
查看文件 @
7b24788
...
...
@@ -615,3 +615,4 @@ int SrsHttpApi::process_request(SrsStSocket* skt, SrsHttpMessage* req)
}
#endif
...
...
trunk/src/app/srs_app_http_api.hpp
查看文件 @
7b24788
...
...
@@ -188,3 +188,4 @@ private:
#endif
#endif
...
...
trunk/src/app/srs_app_http_client.cpp
查看文件 @
7b24788
...
...
@@ -150,3 +150,4 @@ int SrsHttpClient::connect(SrsHttpUri* uri)
}
#endif
...
...
trunk/src/app/srs_app_http_client.hpp
查看文件 @
7b24788
...
...
@@ -65,3 +65,4 @@ private:
#endif
#endif
...
...
trunk/src/app/srs_app_http_conn.cpp
查看文件 @
7b24788
...
...
@@ -595,3 +595,4 @@ int SrsHttpConn::process_request(SrsStSocket* skt, SrsHttpMessage* req)
}
#endif
...
...
trunk/src/app/srs_app_http_conn.hpp
查看文件 @
7b24788
...
...
@@ -105,3 +105,4 @@ private:
#endif
#endif
...
...
trunk/src/app/srs_app_http_hooks.cpp
查看文件 @
7b24788
...
...
@@ -327,3 +327,4 @@ void SrsHttpHooks::on_stop(string url, int client_id, string ip, SrsRequest* req
}
#endif
...
...
trunk/src/app/srs_app_http_hooks.hpp
查看文件 @
7b24788
...
...
@@ -103,3 +103,4 @@ public:
#endif
#endif
...
...
trunk/src/app/srs_app_ingest.cpp
查看文件 @
7b24788
...
...
@@ -463,3 +463,4 @@ int SrsIngester::on_reload_ingest_updated(string vhost, string ingest_id)
}
#endif
...
...
trunk/src/app/srs_app_ingest.hpp
查看文件 @
7b24788
...
...
@@ -94,3 +94,4 @@ public:
#endif
#endif
...
...
trunk/src/app/srs_app_json.cpp
查看文件 @
7b24788
...
...
@@ -892,3 +892,4 @@ const nx_json* nx_json_item(const nx_json* json, int idx) {
#endif
...
...
trunk/src/app/srs_app_json.hpp
查看文件 @
7b24788
...
...
@@ -220,4 +220,4 @@ that is:
#define __SRS_JARRAY_START "["
#define __SRS_JARRAY_END "]"
#endif
\ No newline at end of file
#endif
...
...
trunk/src/app/srs_app_kbps.cpp
查看文件 @
7b24788
...
...
@@ -284,3 +284,4 @@ void SrsKbpsLimit::send_limit()
}
}
...
...
trunk/src/app/srs_app_kbps.hpp
查看文件 @
7b24788
...
...
@@ -224,4 +224,4 @@ public:
virtual
void
send_limit
();
};
#endif
\ No newline at end of file
#endif
...
...
trunk/src/app/srs_app_log.cpp
查看文件 @
7b24788
...
...
@@ -378,3 +378,4 @@ void SrsFastLog::open_log_file()
);
}
}
...
...
trunk/src/app/srs_app_log.hpp
查看文件 @
7b24788
...
...
@@ -94,3 +94,4 @@ private:
};
#endif
...
...
trunk/src/app/srs_app_pithy_print.cpp
查看文件 @
7b24788
...
...
@@ -184,3 +184,4 @@ int64_t SrsPithyPrint::age()
return
_age
;
}
...
...
trunk/src/app/srs_app_pithy_print.hpp
查看文件 @
7b24788
...
...
@@ -96,4 +96,4 @@ public:
virtual
int64_t
age
();
};
#endif
\ No newline at end of file
#endif
...
...
trunk/src/app/srs_app_refer.cpp
查看文件 @
7b24788
...
...
@@ -94,3 +94,4 @@ int SrsRefer::check_single_refer(std::string page_url, std::string refer)
return
ret
;
}
...
...
trunk/src/app/srs_app_refer.hpp
查看文件 @
7b24788
...
...
@@ -49,4 +49,4 @@ private:
virtual
int
check_single_refer
(
std
::
string
page_url
,
std
::
string
refer
);
};
#endif
\ No newline at end of file
#endif
...
...
trunk/src/app/srs_app_reload.cpp
查看文件 @
7b24788
...
...
@@ -160,3 +160,4 @@ int ISrsReloadHandler::on_reload_ingest_updated(string /*vhost*/, string /*inges
return
ERROR_SUCCESS
;
}
...
...
trunk/src/app/srs_app_reload.hpp
查看文件 @
7b24788
...
...
@@ -71,4 +71,4 @@ public:
virtual
int
on_reload_ingest_updated
(
std
::
string
vhost
,
std
::
string
ingest_id
);
};
#endif
\ No newline at end of file
#endif
...
...
trunk/src/app/srs_app_rtmp_conn.cpp
查看文件 @
7b24788
...
...
@@ -197,13 +197,13 @@ int SrsRtmpConn::service_cycle()
{
int
ret
=
ERROR_SUCCESS
;
if
((
ret
=
rtmp
->
set_window_ack_size
(
2.5
*
1000
*
1000
))
!=
ERROR_SUCCESS
)
{
if
((
ret
=
rtmp
->
set_window_ack_size
(
(
int
)(
2.5
*
1000
*
1000
)
))
!=
ERROR_SUCCESS
)
{
srs_error
(
"set window acknowledgement size failed. ret=%d"
,
ret
);
return
ret
;
}
srs_verbose
(
"set window acknowledgement size success"
);
if
((
ret
=
rtmp
->
set_peer_bandwidth
(
2.5
*
1000
*
1000
,
2
))
!=
ERROR_SUCCESS
)
{
if
((
ret
=
rtmp
->
set_peer_bandwidth
(
(
int
)(
2.5
*
1000
*
1000
)
,
2
))
!=
ERROR_SUCCESS
)
{
srs_error
(
"set peer bandwidth failed. ret=%d"
,
ret
);
return
ret
;
}
...
...
@@ -1124,3 +1124,4 @@ void SrsRtmpConn::http_hooks_on_stop()
return
;
}
...
...
trunk/src/app/srs_app_rtmp_conn.hpp
查看文件 @
7b24788
...
...
@@ -106,3 +106,4 @@ private:
};
#endif
...
...
trunk/src/app/srs_app_server.cpp
查看文件 @
7b24788
...
...
@@ -1049,3 +1049,4 @@ int SrsServer::on_reload_http_stream_updated()
return
ret
;
}
...
...
trunk/src/app/srs_app_server.hpp
查看文件 @
7b24788
...
...
@@ -243,4 +243,4 @@ public:
virtual
int
on_reload_http_stream_updated
();
};
#endif
\ No newline at end of file
#endif
...
...
trunk/src/app/srs_app_source.cpp
查看文件 @
7b24788
...
...
@@ -1555,3 +1555,4 @@ void SrsSource::destroy_forwarders()
forwarders
.
clear
();
}
...
...
trunk/src/app/srs_app_source.hpp
查看文件 @
7b24788
...
...
@@ -395,4 +395,4 @@ private:
virtual
void
destroy_forwarders
();
};
#endif
\ No newline at end of file
#endif
...
...
trunk/src/app/srs_app_st.cpp
查看文件 @
7b24788
...
...
@@ -35,3 +35,4 @@ void srs_close_stfd(st_netfd_t& stfd)
close
(
fd
);
}
}
...
...
trunk/src/app/srs_app_st.hpp
查看文件 @
7b24788
...
...
@@ -36,3 +36,4 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
extern
void
srs_close_stfd
(
st_netfd_t
&
stfd
);
#endif
...
...
trunk/src/app/srs_app_st_socket.cpp
查看文件 @
7b24788
...
...
@@ -172,3 +172,4 @@ int SrsStSocket::writev(const iovec *iov, int iov_size, ssize_t* nwrite)
return
ret
;
}
...
...
trunk/src/app/srs_app_st_socket.hpp
查看文件 @
7b24788
...
...
@@ -69,4 +69,4 @@ public:
virtual
int
writev
(
const
iovec
*
iov
,
int
iov_size
,
ssize_t
*
nwrite
);
};
#endif
\ No newline at end of file
#endif
...
...
trunk/src/app/srs_app_thread.cpp
查看文件 @
7b24788
...
...
@@ -199,3 +199,4 @@ void* SrsThread::thread_fun(void* arg)
return
NULL
;
}
...
...
trunk/src/app/srs_app_thread.hpp
查看文件 @
7b24788
...
...
@@ -147,3 +147,4 @@ private:
};
#endif
...
...
trunk/src/app/srs_app_utility.cpp
查看文件 @
7b24788
...
...
@@ -1119,3 +1119,4 @@ void srs_api_dump_summaries(std::stringstream& ss)
<<
__SRS_JOBJECT_END
<<
__SRS_JOBJECT_END
;
}
...
...
trunk/src/app/srs_app_utility.hpp
查看文件 @
7b24788
...
...
@@ -627,3 +627,4 @@ std::string srs_get_peer_ip(int fd);
void
srs_api_dump_summaries
(
std
::
stringstream
&
ss
);
#endif
...
...
trunk/src/core/srs_core.cpp
查看文件 @
7b24788
...
...
@@ -23,3 +23,4 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <srs_core.hpp>
...
...
trunk/src/core/srs_core.hpp
查看文件 @
7b24788
...
...
@@ -97,3 +97,4 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
className& operator= (const className&)
#endif
...
...
trunk/src/core/srs_core_autofree.cpp
查看文件 @
7b24788
...
...
@@ -22,3 +22,4 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
#include <srs_core_autofree.hpp>
...
...
trunk/src/core/srs_core_autofree.hpp
查看文件 @
7b24788
...
...
@@ -66,4 +66,4 @@ public:
}
};
#endif
\ No newline at end of file
#endif
...
...
trunk/src/kernel/srs_kernel_buffer.cpp
查看文件 @
7b24788
...
...
@@ -102,3 +102,4 @@ int SrsBuffer::grow(ISrsBufferReader* reader, int required_size)
return
ret
;
}
...
...
trunk/src/kernel/srs_kernel_buffer.hpp
查看文件 @
7b24788
...
...
@@ -91,4 +91,4 @@ public:
virtual
int
grow
(
ISrsBufferReader
*
reader
,
int
required_size
);
};
#endif
\ No newline at end of file
#endif
...
...
trunk/src/kernel/srs_kernel_codec.cpp
查看文件 @
7b24788
...
...
@@ -115,3 +115,4 @@ bool SrsFlvCodec::audio_is_aac(char* data, int size)
return
sound_format
==
SrsCodecAudioAAC
;
}
...
...
trunk/src/kernel/srs_kernel_codec.hpp
查看文件 @
7b24788
...
...
@@ -177,4 +177,4 @@ public:
static
bool
audio_is_aac
(
char
*
data
,
int
size
);
};
#endif
\ No newline at end of file
#endif
...
...
trunk/src/kernel/srs_kernel_consts.cpp
查看文件 @
7b24788
...
...
@@ -23,3 +23,4 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <srs_kernel_consts.hpp>
...
...
trunk/src/kernel/srs_kernel_consts.hpp
查看文件 @
7b24788
...
...
@@ -263,3 +263,4 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#define SRS_CONSTS_HTTP_HTTPVersionNotSupported_str "HTTP Version Not Supported"
#endif
...
...
trunk/src/kernel/srs_kernel_error.cpp
查看文件 @
7b24788
...
...
@@ -35,3 +35,4 @@ bool srs_is_client_gracefully_close(int error_code)
||
error_code
==
ERROR_SOCKET_READ_FULLY
||
error_code
==
ERROR_SOCKET_WRITE
;
}
...
...
trunk/src/kernel/srs_kernel_error.hpp
查看文件 @
7b24788
...
...
@@ -202,3 +202,4 @@ extern bool srs_is_client_gracefully_close(int error_code);
*/
#endif
...
...
trunk/src/kernel/srs_kernel_file.cpp
查看文件 @
7b24788
...
...
@@ -212,3 +212,4 @@ int SrsFileReader::read(void* buf, size_t count, ssize_t* pnread)
return
ret
;
}
...
...
trunk/src/kernel/srs_kernel_file.hpp
查看文件 @
7b24788
...
...
@@ -91,3 +91,4 @@ public:
};
#endif
...
...
trunk/src/kernel/srs_kernel_flv.cpp
查看文件 @
7b24788
...
...
@@ -525,3 +525,4 @@ int SrsFlvVodStreamDecoder::lseek(int64_t offset)
return
ret
;
}
...
...
trunk/src/kernel/srs_kernel_flv.hpp
查看文件 @
7b24788
...
...
@@ -175,3 +175,4 @@ public:
};
#endif
...
...
trunk/src/kernel/srs_kernel_log.cpp
查看文件 @
7b24788
...
...
@@ -75,3 +75,4 @@ int ISrsThreadContext::get_id()
return
0
;
}
...
...
trunk/src/kernel/srs_kernel_log.hpp
查看文件 @
7b24788
...
...
@@ -150,3 +150,4 @@ extern ISrsThreadContext* _srs_context;
#endif
#endif
...
...
trunk/src/kernel/srs_kernel_stream.cpp
查看文件 @
7b24788
...
...
@@ -252,3 +252,4 @@ void SrsStream::write_bytes(char* data, int size)
p
+=
size
;
}
...
...
trunk/src/kernel/srs_kernel_stream.hpp
查看文件 @
7b24788
...
...
@@ -154,4 +154,4 @@ public:
virtual
void
write_bytes
(
char
*
data
,
int
size
);
};
#endif
\ No newline at end of file
#endif
...
...
trunk/src/kernel/srs_kernel_utility.cpp
查看文件 @
7b24788
...
...
@@ -215,3 +215,4 @@ bool srs_string_ends_with(string str, string flag)
{
return
str
.
rfind
(
flag
)
==
str
.
length
()
-
flag
.
length
();
}
...
...
trunk/src/kernel/srs_kernel_utility.hpp
查看文件 @
7b24788
...
...
@@ -60,3 +60,4 @@ extern std::string srs_string_remove(std::string str, std::string remove_chars);
extern
bool
srs_string_ends_with
(
std
::
string
str
,
std
::
string
flag
);
#endif
...
...
trunk/src/libs/srs_lib_bandwidth.cpp
查看文件 @
7b24788
...
...
@@ -393,3 +393,4 @@ int SrsBandwidthClient::final(SrsBandwidthPacket** ppkt)
return
ret
;
}
...
...
trunk/src/libs/srs_lib_bandwidth.hpp
查看文件 @
7b24788
...
...
@@ -87,3 +87,4 @@ private:
};
#endif
...
...
trunk/src/libs/srs_lib_simple_socket.cpp
查看文件 @
7b24788
...
...
@@ -203,3 +203,4 @@ int SimpleSocketStream::write(void* buf, size_t size, ssize_t* nwrite)
return
ret
;
}
...
...
trunk/src/libs/srs_lib_simple_socket.hpp
查看文件 @
7b24788
...
...
@@ -72,3 +72,4 @@ public:
};
#endif
...
...
trunk/src/libs/srs_librtmp.cpp
查看文件 @
7b24788
...
...
@@ -996,3 +996,4 @@ char* srs_amf0_human_print(srs_amf0_t amf0, char** pdata, int* psize)
#ifdef __cplusplus
}
#endif
...
...
trunk/src/libs/srs_librtmp.hpp
查看文件 @
7b24788
...
...
@@ -304,3 +304,4 @@ char* srs_amf0_human_print(srs_amf0_t amf0, char** pdata, int* psize);
#endif
#endif
...
...
trunk/src/main/srs_main_server.cpp
查看文件 @
7b24788
...
...
@@ -189,3 +189,4 @@ int run_master()
return
0
;
}
...
...
trunk/src/rtmp/srs_protocol_amf0.cpp
查看文件 @
7b24788
...
...
@@ -1738,3 +1738,4 @@ namespace _srs_internal
return
value
->
write
(
stream
);
}
}
...
...
trunk/src/rtmp/srs_protocol_amf0.hpp
查看文件 @
7b24788
...
...
@@ -784,4 +784,4 @@ namespace _srs_internal
extern
int
srs_amf0_write_any
(
SrsStream
*
stream
,
SrsAmf0Any
*
value
);
};
#endif
\ No newline at end of file
#endif
...
...
trunk/src/rtmp/srs_protocol_handshake.cpp
查看文件 @
7b24788
...
...
@@ -1250,3 +1250,4 @@ int SrsComplexHandshake::handshake_with_server(SrsHandshakeBytes* hs_bytes, ISrs
}
#endif
...
...
trunk/src/rtmp/srs_protocol_handshake.hpp
查看文件 @
7b24788
...
...
@@ -362,4 +362,4 @@ public:
virtual
int
handshake_with_server
(
SrsHandshakeBytes
*
hs_bytes
,
ISrsProtocolReaderWriter
*
io
);
};
#endif
\ No newline at end of file
#endif
...
...
trunk/src/rtmp/srs_protocol_io.cpp
查看文件 @
7b24788
...
...
@@ -62,3 +62,4 @@ ISrsProtocolReaderWriter::ISrsProtocolReaderWriter()
ISrsProtocolReaderWriter
::~
ISrsProtocolReaderWriter
()
{
}
...
...
trunk/src/rtmp/srs_protocol_io.hpp
查看文件 @
7b24788
...
...
@@ -167,3 +167,4 @@ public:
};
#endif
...
...
trunk/src/rtmp/srs_protocol_msg_array.cpp
查看文件 @
7b24788
...
...
@@ -49,3 +49,4 @@ SrsSharedPtrMessageArray::~SrsSharedPtrMessageArray()
srs_freep
(
msgs
);
}
...
...
trunk/src/rtmp/srs_protocol_msg_array.hpp
查看文件 @
7b24788
...
...
@@ -61,3 +61,4 @@ public:
};
#endif
...
...
trunk/src/rtmp/srs_protocol_rtmp.cpp
查看文件 @
7b24788
...
...
@@ -1472,3 +1472,4 @@ int SrsRtmpServer::identify_play_client(SrsPlayPacket* req, SrsRtmpConnType& typ
return
ret
;
}
...
...
请
注册
或
登录
后发表评论