jami/jami-daemon
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-daemon.git synced 2025-08-12 22:09:25 +08:00
Code Issues Projects Releases Wiki Activity

sipvoiplink: cleanup

Browse Source 
Change-Id: I7d266d9d82d76715f8f88807e4944821a04aee20
This commit is contained in:
Adrien Béraud
2019-08-15 16:23:32 -04:00
parent a427a151a6
commit 21f81fc6e2
2 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/media/video/video_receive_thread.cpp
View File

@ -87,7 +87,7 @@ bool VideoReceiveThread::setup()
dstWidth_ = args_.width;
dstHeight_ = args_.height;
const std::string SDP_FILENAME = "dummyFilename";
static const std::string SDP_FILENAME = "dummyFilename";
if (args_.input.empty()) {
args_.format = "sdp";
args_.input = SDP_FILENAME;

17
src/sip/sipvoiplink.cpp
View File

@ -952,26 +952,23 @@ handleMediaControl(SIPCall& call, pjsip_msg_body* body)
/* Apply and answer the INFO request */
pj_strset(&control_st, (char *) body->data, body->len);
constexpr pj_str_t PICT_FAST_UPDATE = CONST_PJ_STR("picture_fast_update");
constexpr pj_str_t DEVICE_ORIENTATION = CONST_PJ_STR("device_orientation");
static constexpr pj_str_t PICT_FAST_UPDATE = CONST_PJ_STR("picture_fast_update");
static constexpr pj_str_t DEVICE_ORIENTATION = CONST_PJ_STR("device_orientation");
if (pj_strstr(&control_st, &PICT_FAST_UPDATE)) {
call.sendKeyframe();
return true;
} else if (pj_strstr(&control_st, &DEVICE_ORIENTATION)) {
int rotation = 0;
std::string body_msg = control_st.ptr;
static const std::regex ORIENTATION_REGEX("device_orientation=([-+]?[0-9]+)");
std::string body_msg(control_st.ptr, control_st.slen);
std::smatch matched_pattern;
std::regex str_pattern("device_orientation=([-+]?[0-9]+)");
std::regex_search(body_msg, matched_pattern, ORIENTATION_REGEX);
std::regex_search(body_msg, matched_pattern, str_pattern);
if (matched_pattern.ready() && !matched_pattern.empty() && matched_pattern[1].matched) {
rotation = std::stoi(matched_pattern[1]);
int rotation = std::stoi(matched_pattern[1]);
JAMI_WARN("Rotate video %d deg.", rotation);
call.getVideoRtp().setRotation(rotation);
return true;
}
}