Commit 07554dab authored by Éloi Bail's avatar Éloi Bail Committed by Guillaume Roguez

daemon: replace SFL references by Ring in src/

Refs #69286

Change-Id: I2784a505434c97ea7b4c50f2a0da61559e0cbfde
parent de0678b0
......@@ -339,7 +339,7 @@ sendTextMessage(const std::string& callID, const std::string& message)
#if HAVE_INSTANT_MESSAGING
ring::Manager::instance().sendTextMessage(callID, message, "Me");
#else
RING_ERR("Could not send \"%s\" text message to %s since SFLphone daemon does not support it, please recompile with instant messaging support", message.c_str(), callID.c_str());
RING_ERR("Could not send \"%s\" text message to %s since Ring daemon does not support it, please recompile with instant messaging support", message.c_str(), callID.c_str());
#endif
}
......
......@@ -214,7 +214,7 @@ ManagerImpl::ManagerImpl() :
std::seed_seq seed {rdev(), rdev()};
rand_.seed(seed);
ring::libav_utils::sfl_avcodec_init();
ring::libav_utils::ring_avcodec_init();
}
ManagerImpl::~ManagerImpl()
......
......@@ -238,7 +238,7 @@ class AudioLayer {
bool isStarted_;
/**
* Sample Rate SFLphone should send sound data to the sound card
* Sample Rate Ring should send sound data to the sound card
*/
AudioFormat audioFormat_;
......
......@@ -486,7 +486,7 @@ void CoreLayer::read(AudioUnitRenderActionFlags* ioActionFlags,
&size));
// Add them to sflphone ringbuffer.
// Add them to Ring ringbuffer.
const AudioFormat mainBufferFormat = Manager::instance().getRingBufferPool().getInternalAudioFormat();
bool resample = info.mSampleRate != mainBufferFormat.sample_rate;
......
......@@ -268,7 +268,7 @@ JackLayer::ringbuffer_worker()
// wait until process() signals more data
// FIXME: this checks for spurious wakes, but the predicate
// is rather arbitrary. We should wait until sflphone has/needs data
// is rather arbitrary. We should wait until ring has/needs data
// and jack has/needs data.
data_ready_.wait(lock, [&] {
// Note: lock is released while waiting, and held when woken
......
......@@ -97,7 +97,7 @@ static void init_once()
static std::once_flag already_called;
void sfl_avcodec_init()
void ring_avcodec_init()
{
std::call_once(already_called, init_once);
}
......@@ -112,7 +112,7 @@ int libav_pixel_format(int fmt)
return fmt;
}
int sfl_pixel_format(int fmt)
int ring_pixel_format(int fmt)
{
switch (fmt) {
case PIXEL_FORMAT(YUV420P): return video::VIDEO_PIXFMT_YUV420P;
......@@ -120,7 +120,7 @@ int sfl_pixel_format(int fmt)
return fmt;
}
void sfl_url_split(const char *url,
void ring_url_split(const char *url,
char *hostname, size_t hostname_size, int *port,
char *path, size_t path_size)
{
......
......@@ -37,15 +37,15 @@
namespace ring { namespace libav_utils {
void sfl_avcodec_init();
void ring_avcodec_init();
int libav_pixel_format(int fmt);
int sfl_pixel_format(int fmt);
int ring_pixel_format(int fmt);
const char *const DEFAULT_H264_PROFILE_LEVEL_ID = "profile-level-id=428014";
const char *const MAX_H264_PROFILE_LEVEL_ID = "profile-level-id=640034";
void sfl_url_split(const char *url,
void ring_url_split(const char *url,
char *hostname, size_t hostname_size, int *port,
char *path, size_t path_size);
......
......@@ -70,7 +70,7 @@ VideoFrame::size() const noexcept
int
VideoFrame::format() const noexcept
{
return libav_utils::sfl_pixel_format(frame_->format);
return libav_utils::ring_pixel_format(frame_->format);
}
int
......
......@@ -429,7 +429,7 @@ int MediaDecoder::getHeight() const
{ return decoderCtx_->height; }
int MediaDecoder::getPixelFormat() const
{ return libav_utils::sfl_pixel_format(decoderCtx_->pix_fmt); }
{ return libav_utils::ring_pixel_format(decoderCtx_->pix_fmt); }
void
MediaDecoder::writeToRingBuffer(const AudioFrame& decodedFrame,
......
......@@ -168,7 +168,7 @@ MediaEncoder::openOutput(const char *filename,
// allocate buffers for both scaled (pre-encoder) and encoded frames
const int width = encoderCtx_->width;
const int height = encoderCtx_->height;
const int format = libav_utils::sfl_pixel_format((int)encoderCtx_->pix_fmt);
const int format = libav_utils::ring_pixel_format((int)encoderCtx_->pix_fmt);
scaledFrameBufferSize_ = videoFrameSize(format, width, height);
if (scaledFrameBufferSize_ <= FF_MIN_BUFFER_SIZE)
throw MediaEncoderException("buffer too small");
......
......@@ -246,7 +246,7 @@ void SocketPair::openSockets(const char *uri, int local_rtp_port)
char path[1024];
int rtp_port;
libav_utils::sfl_url_split(uri, hostname, sizeof(hostname), &rtp_port, path,
libav_utils::ring_url_split(uri, hostname, sizeof(hostname), &rtp_port, path,
sizeof(path));
const int rtcp_port = rtp_port + 1;
......
......@@ -247,7 +247,7 @@ HookPreference::HookPreference() :
, numberEnabled_(false)
, sipEnabled_(false)
, urlCommand_("x-www-browser")
, urlSipField_("X-sflphone-url")
, urlSipField_("X-ring-url")
{}
HookPreference::HookPreference(const std::map<std::string, std::string> &settings) :
......
......@@ -148,7 +148,7 @@ class RingAccount : public SIPAccountBase {
std::string getToUri(const std::string& username) const;
/**
* In the current version of SFLPhone, "srv" uri is obtained in the preformated
* In the current version of Ring, "srv" uri is obtained in the preformated
* way: hostname:port. This method adds the correct scheme and append
* the ;transport= parameter at the end of the uri, in accordance with RFC3261.
*
......
......@@ -383,7 +383,7 @@ class SIPAccount : public SIPAccountBase {
std::string getToUri(const std::string& username) const;
/**
* In the current version of SFLPhone, "srv" uri is obtained in the preformated
* In the current version of Ring, "srv" uri is obtained in the preformated
* way: hostname:port. This method adds the correct scheme and append
* the ;transport= parameter at the end of the uri, in accordance with RFC3261.
*
......@@ -628,7 +628,7 @@ class SIPAccount : public SIPAccountBase {
* If username is not provided, as it happens for Direct ip calls,
* fetch the Real Name field of the user that is currently
* running this program.
* @return std::string The login name under which SFLPhone is running.
* @return std::string The login name under which Ring is running.
*/
static std::string getLoginName();
......
......@@ -916,7 +916,7 @@ TlsValidator::CheckResult TlsValidator::authorityMatch()
*/
TlsValidator::CheckResult TlsValidator::knownAuthority()
{
// TODO SFLphone need a new boolean account setting "require trusted authority" or something defaulting to true
// TODO Ring need a new boolean account setting "require trusted authority" or something defaulting to true
// using GNUTLS_CERT_SIGNER_NOT_FOUND is a temporary placeholder as it is close enough
return TlsValidator::CheckResult(compareToCa() & GNUTLS_CERT_SIGNER_NOT_FOUND
? CheckValues::FAILED : CheckValues::PASSED, "");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment