external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

use kernel utility int2str and float2str

Browse source
This commit is contained in:
winlin 2015-09-24 17:54:58 +08:00
parent 6efd2dd27e
commit 9ead08725d
14 changed files with 104 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

30
trunk/src/app/srs_app_edge.cpp
View file

@ -44,6 +44,7 @@ using namespace std;
#include <srs_app_utility.hpp>
#include <srs_protocol_amf0.hpp>
#include <srs_kernel_utility.hpp>
#include <srs_kernel_balance.hpp>
// when error, edge ingester sleep for a while and retry.
#define SRS_EDGE_INGESTER_SLEEP_US (int64_t)(1*1000*1000LL)
@ -67,10 +68,9 @@ SrsEdgeIngester::SrsEdgeIngester()
client = NULL;
_edge = NULL;
_req = NULL;
origin_index = 0;
stream_id = 0;
stfd = NULL;
curr_origin_server = "";
lb = new SrsLbRoundRobin();
pthread = new SrsReusableThread2("edge-igs", this, SRS_EDGE_INGESTER_SLEEP_US);
}
@ -78,6 +78,7 @@ SrsEdgeIngester::~SrsEdgeIngester()
{
stop();
srs_freep(lb);
srs_freep(pthread);
srs_freep(kbps);
}
@ -121,7 +122,7 @@ void SrsEdgeIngester::stop()
string SrsEdgeIngester::get_curr_origin()
{
return curr_origin_server;
return lb->selected();
}
int SrsEdgeIngester::cycle()
@ -130,7 +131,8 @@ int SrsEdgeIngester::cycle()
_source->on_source_id_changed(_srs_context->get_id());
std::string ep_server, ep_port;
std::string ep_server;
int ep_port;
if ((ret = connect_server(ep_server, ep_port)) != ERROR_SUCCESS) {
return ret;
}
@ -216,7 +218,7 @@ int SrsEdgeIngester::ingest()
}
// TODO: FIXME: refine the connect_app.
int SrsEdgeIngester::connect_app(string ep_server, string ep_port)
int SrsEdgeIngester::connect_app(string ep_server, int ep_port)
{
int ret = ERROR_SUCCESS;
@ -258,7 +260,7 @@ int SrsEdgeIngester::connect_app(string ep_server, string ep_port)
// generate the tcUrl
std::string param = "";
std::string tc_url = srs_generate_tc_url(ep_server, vhost, req->app, ep_port, param);
srs_trace("edge ingest from %s:%s at %s", ep_server.c_str(), ep_port.c_str(), tc_url.c_str());
srs_trace("edge ingest from %s:%d at %s", ep_server.c_str(), ep_port, tc_url.c_str());
// replace the tcUrl in request,
// which will replace the tc_url in client.connect_app().
@ -339,7 +341,7 @@ void SrsEdgeIngester::close_underlayer_socket()
srs_close_stfd(stfd);
}
int SrsEdgeIngester::connect_server(string& ep_server, string& ep_port)
int SrsEdgeIngester::connect_server(string& ep_server, int& ep_port)
{
int ret = ERROR_SUCCESS;
@ -358,21 +360,13 @@ int SrsEdgeIngester::connect_server(string& ep_server, string& ep_port)
}
// select the origin.
std::string server = curr_origin_server = conf->args.at(origin_index % conf->args.size());
origin_index = (origin_index + 1) % conf->args.size();
std::string s_port = SRS_CONSTS_RTMP_DEFAULT_PORT;
std::string server = lb->select(conf->args);
int port = ::atoi(SRS_CONSTS_RTMP_DEFAULT_PORT);
size_t pos = server.find(":");
if (pos != std::string::npos) {
s_port = server.substr(pos + 1);
server = server.substr(0, pos);
port = ::atoi(s_port.c_str());
}
srs_parse_hostport(server, server, port);
// output the connected server and port.
ep_server = server;
ep_port = s_port;
ep_port = port;
// open socket.
int64_t timeout = SRS_EDGE_INGESTER_TIMEOUT_US;

9
trunk/src/app/srs_app_edge.hpp
View file

@ -46,6 +46,7 @@ class SrsCommonMessage;
class SrsMessageQueue;
class ISrsProtocolReaderWriter;
class SrsKbps;
class SrsLbRoundRobin;
/**
* the state of edge, auto machine
@ -88,9 +89,7 @@ private:
ISrsProtocolReaderWriter* io;
SrsKbps* kbps;
SrsRtmpClient* client;
int origin_index;
// current origin server of current source.
std::string curr_origin_server;
SrsLbRoundRobin* lb;
public:
SrsEdgeIngester();
virtual ~SrsEdgeIngester();
@ -105,8 +104,8 @@ public:
private:
virtual int ingest();
virtual void close_underlayer_socket();
virtual int connect_server(std::string& ep_server, std::string& ep_port);
virtual int connect_app(std::string ep_server, std::string ep_port);
virtual int connect_server(std::string& ep_server, int& ep_port);
virtual int connect_app(std::string ep_server, int ep_port);
virtual int process_publish_message(SrsCommonMessage* msg);
};

31
trunk/src/app/srs_app_ffmpeg.cpp
View file

@ -43,6 +43,7 @@ using namespace std;
#include <srs_app_utility.hpp>
#include <srs_app_process.hpp>
#include <srs_core_autofree.hpp>
#include <srs_kernel_utility.hpp>
#ifdef SRS_AUTO_FFMPEG_STUB
@ -248,12 +249,6 @@ int SrsFFMPEG::start()
return ret;
}
// prepare exec params
// @remark we should never use stack variable, use heap to alloc to make lldb happy.
#define SRS_TMP_SIZE 512
char* tmp = new char[SRS_TMP_SIZE];
SrsAutoFree(char, tmp);
// the argv for process.
params.clear();
@ -300,33 +295,28 @@ int SrsFFMPEG::start()
if (vcodec != SRS_RTMP_ENCODER_COPY && vcodec != SRS_RTMP_ENCODER_NO_VIDEO) {
if (vbitrate > 0) {
params.push_back("-b:v");
snprintf(tmp, SRS_TMP_SIZE, "%d", vbitrate * 1000);
params.push_back(tmp);
params.push_back(srs_int2str(vbitrate * 1000));
}
if (vfps > 0) {
params.push_back("-r");
snprintf(tmp, SRS_TMP_SIZE, "%.2f", vfps);
params.push_back(tmp);
params.push_back(srs_float2str(vfps));
}
if (vwidth > 0 && vheight > 0) {
params.push_back("-s");
snprintf(tmp, SRS_TMP_SIZE, "%dx%d", vwidth, vheight);
params.push_back(tmp);
params.push_back(srs_int2str(vwidth) + "x" + srs_int2str(vheight));
}
// TODO: add aspect if needed.
if (vwidth > 0 && vheight > 0) {
params.push_back("-aspect");
snprintf(tmp, SRS_TMP_SIZE, "%d:%d", vwidth, vheight);
params.push_back(tmp);
params.push_back(srs_int2str(vwidth) + ":" + srs_int2str(vheight));
}
if (vthreads > 0) {
params.push_back("-threads");
snprintf(tmp, SRS_TMP_SIZE, "%d", vthreads);
params.push_back(tmp);
params.push_back(srs_int2str(vthreads));
}
params.push_back("-profile:v");
@ -360,20 +350,17 @@ int SrsFFMPEG::start()
if (acodec != SRS_RTMP_ENCODER_COPY) {
if (abitrate > 0) {
params.push_back("-b:a");
snprintf(tmp, SRS_TMP_SIZE, "%d", abitrate * 1000);
params.push_back(tmp);
params.push_back(srs_int2str(abitrate * 1000));
}
if (asample_rate > 0) {
params.push_back("-ar");
snprintf(tmp, SRS_TMP_SIZE, "%d", asample_rate);
params.push_back(tmp);
params.push_back(srs_int2str(asample_rate));
}
if (achannels > 0) {
params.push_back("-ac");
snprintf(tmp, SRS_TMP_SIZE, "%d", achannels);
params.push_back(tmp);
params.push_back(srs_int2str(achannels));
}
// aparams

2
trunk/src/app/srs_app_kafka.cpp
View file

@ -98,7 +98,7 @@ int SrsKafkaProducer::request_metadata()
}
srs_assert(!brokers->args.empty());
std::string broker = lb->select<string>(brokers->args);
std::string broker = lb->select(brokers->args);
if (true) {
std::string senabled = srs_bool2switch(enabled);

11
trunk/src/app/srs_app_server.cpp
View file

@ -720,15 +720,12 @@ int SrsServer::acquire_pid_file()
srs_error("truncate pid file %s error! ret=%#x", pid_file.c_str(), ret);
return ret;
}
int pid = (int)getpid();
// write the pid
char buf[512];
snprintf(buf, sizeof(buf), "%d", pid);
if (write(fd, buf, strlen(buf)) != (int)strlen(buf)) {
string pid = srs_int2str(getpid());
if (write(fd, pid.c_str(), pid.length()) != pid.length()) {
ret = ERROR_SYSTEM_PID_WRITE_FILE;
srs_error("write our pid error! pid=%d file=%s ret=%#x", pid, pid_file.c_str(), ret);
srs_error("write our pid error! pid=%s file=%s ret=%#x", pid.c_str(), pid_file.c_str(), ret);
return ret;
}
@ -746,7 +743,7 @@ int SrsServer::acquire_pid_file()
return ret;
}
srs_trace("write pid=%d to %s success!", pid, pid_file.c_str());
srs_trace("write pid=%s to %s success!", pid.c_str(), pid_file.c_str());
pid_fd = fd;
return ret;

3
trunk/src/app/srs_app_utility.cpp
View file

@ -204,8 +204,7 @@ string srs_path_build_timestamp(string template_path)
// [timestamp],replace this const to current UNIX timestamp in ms.
if (true) {
int64_t now_us = ((int64_t)tv.tv_sec) * 1000 * 1000 + (int64_t)tv.tv_usec;
snprintf(buf, sizeof(buf), "%"PRId64, now_us / 1000);
path = srs_string_replace(path, "[timestamp]", buf);
path = srs_string_replace(path, "[timestamp]", srs_int2str(now_us / 1000));
}
return path;