winlin

for bug #143, build on centos5.

正在显示 100 个修改的文件 包含 105 行增加24 行删除

要显示太多修改。

为保证性能只显示 100 of 100+ 个文件。

... ... @@ -498,3 +498,4 @@ int SrsAvcAacCodec::video_avc_demux(char* data, int size, SrsCodecSample* sample
return ret;
}
... ...
... ... @@ -281,3 +281,4 @@ public:
};
#endif
... ...
... ... @@ -476,3 +476,4 @@ int SrsBandwidth::finial(SrsBandwidthSample& play_sample, SrsBandwidthSample& pu
return ret;
}
... ...
... ... @@ -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
... ...
... ... @@ -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;
}
... ...
... ... @@ -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
... ...
... ... @@ -94,3 +94,4 @@ void SrsConnection::stop()
srs_freep(pthread);
}
... ...
... ... @@ -112,4 +112,4 @@ private:
virtual void stop();
};
#endif
\ No newline at end of file
#endif
... ...
... ... @@ -551,3 +551,4 @@ int SrsDvr::on_video(SrsSharedPtrMessage* video)
#endif
... ...
... ... @@ -219,3 +219,4 @@ public:
#endif
#endif
... ...
... ... @@ -722,3 +722,4 @@ void SrsPublishEdge::on_proxy_unpublish()
state = SrsEdgeStateInit;
srs_trace("edge change from %d to state %d (init).", pstate, state);
}
... ...
... ... @@ -218,3 +218,4 @@ public:
};
#endif
... ...
... ... @@ -23,3 +23,4 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <srs_app_empty.hpp>
... ...
... ... @@ -30,3 +30,4 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <srs_core.hpp>
#endif
... ...
... ... @@ -338,3 +338,4 @@ void SrsEncoder::encoder()
#endif
... ...
... ... @@ -75,3 +75,4 @@ private:
#endif
#endif
... ...
... ... @@ -498,3 +498,4 @@ void SrsFFMPEG::stop()
#endif
... ...
... ... @@ -89,3 +89,4 @@ public:
#endif
#endif
... ...
... ... @@ -350,3 +350,4 @@ int SrsForwarder::forward()
return ret;
}
... ...
... ... @@ -88,3 +88,4 @@ private:
};
#endif
... ...
... ... @@ -92,3 +92,4 @@ void SrsHttpHeartbeat::heartbeat()
}
#endif
... ...
... ... @@ -49,3 +49,4 @@ public:
#endif
#endif
... ...
... ... @@ -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
... ...
... ... @@ -346,4 +346,4 @@ private:
#endif
#endif
\ No newline at end of file
#endif
... ...
... ... @@ -1089,3 +1089,4 @@ string SrsHttpUri::get_uri_field(string uri, http_parser_url* hp_u, http_parser_
}
#endif
... ...
... ... @@ -366,4 +366,4 @@ private:
#endif
#endif
\ No newline at end of file
#endif
... ...
... ... @@ -615,3 +615,4 @@ int SrsHttpApi::process_request(SrsStSocket* skt, SrsHttpMessage* req)
}
#endif
... ...
... ... @@ -188,3 +188,4 @@ private:
#endif
#endif
... ...
... ... @@ -150,3 +150,4 @@ int SrsHttpClient::connect(SrsHttpUri* uri)
}
#endif
... ...
... ... @@ -65,3 +65,4 @@ private:
#endif
#endif
... ...
... ... @@ -595,3 +595,4 @@ int SrsHttpConn::process_request(SrsStSocket* skt, SrsHttpMessage* req)
}
#endif
... ...
... ... @@ -105,3 +105,4 @@ private:
#endif
#endif
... ...
... ... @@ -327,3 +327,4 @@ void SrsHttpHooks::on_stop(string url, int client_id, string ip, SrsRequest* req
}
#endif
... ...
... ... @@ -103,3 +103,4 @@ public:
#endif
#endif
... ...
... ... @@ -463,3 +463,4 @@ int SrsIngester::on_reload_ingest_updated(string vhost, string ingest_id)
}
#endif
... ...
... ... @@ -94,3 +94,4 @@ public:
#endif
#endif
... ...
... ... @@ -892,3 +892,4 @@ const nx_json* nx_json_item(const nx_json* json, int idx) {
#endif
... ...
... ... @@ -220,4 +220,4 @@ that is:
#define __SRS_JARRAY_START "["
#define __SRS_JARRAY_END "]"
#endif
\ No newline at end of file
#endif
... ...
... ... @@ -284,3 +284,4 @@ void SrsKbpsLimit::send_limit()
}
}
... ...
... ... @@ -224,4 +224,4 @@ public:
virtual void send_limit();
};
#endif
\ No newline at end of file
#endif
... ...
... ... @@ -378,3 +378,4 @@ void SrsFastLog::open_log_file()
);
}
}
... ...
... ... @@ -94,3 +94,4 @@ private:
};
#endif
... ...
... ... @@ -184,3 +184,4 @@ int64_t SrsPithyPrint::age()
return _age;
}
... ...
... ... @@ -96,4 +96,4 @@ public:
virtual int64_t age();
};
#endif
\ No newline at end of file
#endif
... ...
... ... @@ -94,3 +94,4 @@ int SrsRefer::check_single_refer(std::string page_url, std::string refer)
return ret;
}
... ...
... ... @@ -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
... ...
... ... @@ -160,3 +160,4 @@ int ISrsReloadHandler::on_reload_ingest_updated(string /*vhost*/, string /*inges
return ERROR_SUCCESS;
}
... ...
... ... @@ -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
... ...
... ... @@ -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;
}
... ...
... ... @@ -106,3 +106,4 @@ private:
};
#endif
... ...
... ... @@ -1049,3 +1049,4 @@ int SrsServer::on_reload_http_stream_updated()
return ret;
}
... ...
... ... @@ -243,4 +243,4 @@ public:
virtual int on_reload_http_stream_updated();
};
#endif
\ No newline at end of file
#endif
... ...
... ... @@ -1555,3 +1555,4 @@ void SrsSource::destroy_forwarders()
forwarders.clear();
}
... ...
... ... @@ -395,4 +395,4 @@ private:
virtual void destroy_forwarders();
};
#endif
\ No newline at end of file
#endif
... ...
... ... @@ -35,3 +35,4 @@ void srs_close_stfd(st_netfd_t& stfd)
close(fd);
}
}
... ...
... ... @@ -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
... ...
... ... @@ -172,3 +172,4 @@ int SrsStSocket::writev(const iovec *iov, int iov_size, ssize_t* nwrite)
return ret;
}
... ...
... ... @@ -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
... ...
... ... @@ -199,3 +199,4 @@ void* SrsThread::thread_fun(void* arg)
return NULL;
}
... ...
... ... @@ -147,3 +147,4 @@ private:
};
#endif
... ...
... ... @@ -1119,3 +1119,4 @@ void srs_api_dump_summaries(std::stringstream& ss)
<< __SRS_JOBJECT_END
<< __SRS_JOBJECT_END;
}
... ...
... ... @@ -627,3 +627,4 @@ std::string srs_get_peer_ip(int fd);
void srs_api_dump_summaries(std::stringstream& ss);
#endif
... ...
... ... @@ -23,3 +23,4 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <srs_core.hpp>
... ...
... ... @@ -97,3 +97,4 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
className& operator= (const className&)
#endif
... ...
... ... @@ -22,3 +22,4 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
#include <srs_core_autofree.hpp>
... ...
... ... @@ -66,4 +66,4 @@ public:
}
};
#endif
\ No newline at end of file
#endif
... ...
... ... @@ -102,3 +102,4 @@ int SrsBuffer::grow(ISrsBufferReader* reader, int required_size)
return ret;
}
... ...
... ... @@ -91,4 +91,4 @@ public:
virtual int grow(ISrsBufferReader* reader, int required_size);
};
#endif
\ No newline at end of file
#endif
... ...
... ... @@ -115,3 +115,4 @@ bool SrsFlvCodec::audio_is_aac(char* data, int size)
return sound_format == SrsCodecAudioAAC;
}
... ...
... ... @@ -177,4 +177,4 @@ public:
static bool audio_is_aac(char* data, int size);
};
#endif
\ No newline at end of file
#endif
... ...
... ... @@ -23,3 +23,4 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <srs_kernel_consts.hpp>
... ...
... ... @@ -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
... ...
... ... @@ -35,3 +35,4 @@ bool srs_is_client_gracefully_close(int error_code)
|| error_code == ERROR_SOCKET_READ_FULLY
|| error_code == ERROR_SOCKET_WRITE;
}
... ...
... ... @@ -202,3 +202,4 @@ extern bool srs_is_client_gracefully_close(int error_code);
*/
#endif
... ...
... ... @@ -212,3 +212,4 @@ int SrsFileReader::read(void* buf, size_t count, ssize_t* pnread)
return ret;
}
... ...
... ... @@ -91,3 +91,4 @@ public:
};
#endif
... ...
... ... @@ -525,3 +525,4 @@ int SrsFlvVodStreamDecoder::lseek(int64_t offset)
return ret;
}
... ...
... ... @@ -175,3 +175,4 @@ public:
};
#endif
... ...
... ... @@ -75,3 +75,4 @@ int ISrsThreadContext::get_id()
return 0;
}
... ...
... ... @@ -150,3 +150,4 @@ extern ISrsThreadContext* _srs_context;
#endif
#endif
... ...
... ... @@ -252,3 +252,4 @@ void SrsStream::write_bytes(char* data, int size)
p += size;
}
... ...
... ... @@ -154,4 +154,4 @@ public:
virtual void write_bytes(char* data, int size);
};
#endif
\ No newline at end of file
#endif
... ...
... ... @@ -215,3 +215,4 @@ bool srs_string_ends_with(string str, string flag)
{
return str.rfind(flag) == str.length() - flag.length();
}
... ...
... ... @@ -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
... ...
... ... @@ -393,3 +393,4 @@ int SrsBandwidthClient::final(SrsBandwidthPacket** ppkt)
return ret;
}
... ...
... ... @@ -87,3 +87,4 @@ private:
};
#endif
... ...
... ... @@ -203,3 +203,4 @@ int SimpleSocketStream::write(void* buf, size_t size, ssize_t* nwrite)
return ret;
}
... ...
... ... @@ -72,3 +72,4 @@ public:
};
#endif
... ...
... ... @@ -996,3 +996,4 @@ char* srs_amf0_human_print(srs_amf0_t amf0, char** pdata, int* psize)
#ifdef __cplusplus
}
#endif
... ...
... ... @@ -304,3 +304,4 @@ char* srs_amf0_human_print(srs_amf0_t amf0, char** pdata, int* psize);
#endif
#endif
... ...
... ... @@ -189,3 +189,4 @@ int run_master()
return 0;
}
... ...
... ... @@ -1738,3 +1738,4 @@ namespace _srs_internal
return value->write(stream);
}
}
... ...
... ... @@ -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
... ...
... ... @@ -1250,3 +1250,4 @@ int SrsComplexHandshake::handshake_with_server(SrsHandshakeBytes* hs_bytes, ISrs
}
#endif
... ...
... ... @@ -362,4 +362,4 @@ public:
virtual int handshake_with_server(SrsHandshakeBytes* hs_bytes, ISrsProtocolReaderWriter* io);
};
#endif
\ No newline at end of file
#endif
... ...
... ... @@ -62,3 +62,4 @@ ISrsProtocolReaderWriter::ISrsProtocolReaderWriter()
ISrsProtocolReaderWriter::~ISrsProtocolReaderWriter()
{
}
... ...
... ... @@ -167,3 +167,4 @@ public:
};
#endif
... ...
... ... @@ -49,3 +49,4 @@ SrsSharedPtrMessageArray::~SrsSharedPtrMessageArray()
srs_freep(msgs);
}
... ...
... ... @@ -61,3 +61,4 @@ public:
};
#endif
... ...
... ... @@ -1472,3 +1472,4 @@ int SrsRtmpServer::identify_play_client(SrsPlayPacket* req, SrsRtmpConnType& typ
return ret;
}
... ...