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

call: support screen sharing for macOS

Browse Source 
Change-Id: I6737763f9920fbc1b32ee558980b4ef1daadaff8
This commit is contained in:
Kateryna Kostiuk
2018-09-11 12:44:06 -04:00
committed by Adrien Béraud
parent 3e542c1f29
commit ec376a0174
2 changed files with 31 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/media/video/video_input.cpp
View File

@ -430,6 +430,31 @@ VideoInput::initX11(std::string display)
return true;
}
bool
VideoInput::initAVFoundation(const std::string& display)
{
size_t space = display.find(' ');
clearOptions();
decOpts_.format = "avfoundation";
decOpts_.input = "Capture screen 0";
decOpts_.framerate = 30;
if (space != std::string::npos) {
std::istringstream iss(display.substr(space + 1));
char sep;
unsigned w, h;
iss >> w >> sep >> h;
decOpts_.width = round2pow(w, 3);
decOpts_.height = round2pow(h, 3);
} else {
decOpts_.width = default_grab_width;
decOpts_.height = default_grab_height;
}
return true;
}
bool
VideoInput::initGdiGrab(std::string params)
{
@ -535,10 +560,12 @@ VideoInput::switchInput(const std::string& resource)
ready = initCamera(suffix);
} else if (prefix == DRing::Media::VideoProtocolPrefix::DISPLAY) {
/* X11 display name */
#ifndef _WIN32
ready = initX11(suffix);
#else
#ifdef __APPLE__
ready = initAVFoundation(suffix);
#elif defined(_WIN32)
ready = initGdiGrab(suffix);
#else
ready = initX11(suffix);
#endif
} else if (prefix == DRing::Media::VideoProtocolPrefix::FILE) {
/* Pathname */

1
src/media/video/video_input.h
View File

@ -118,6 +118,7 @@ private:
// true if decOpts_ is ready to use, false if using promise/future
bool initCamera(const std::string& device);
bool initX11(std::string display);
bool initAVFoundation(const std::string& display);
bool initFile(std::string path);
bool initGdiGrab(std::string params);