From d2df0bb4cf7df7d04b08a4221bfe4505aa311825 Mon Sep 17 00:00:00 2001 From: Kateryna Kostiuk <kateryna.kostiuk@savoirfairelinux.com> Date: Mon, 11 Nov 2019 15:52:45 -0500 Subject: [PATCH] media input: set up device name For macOS for open video/audio input device name is used. This patch adds device name in addition to input when initializing screen capture or file streaming. Change-Id: Ibf580028049a1d81872b026c12c01cf7a5346a7c --- src/media/audio/audio_input.cpp | 1 + src/media/video/video_input.cpp | 3 +++ 2 files changed, 4 insertions(+) diff --git a/src/media/audio/audio_input.cpp b/src/media/audio/audio_input.cpp index fcfe1874c5..336c0f14ce 100644 --- a/src/media/audio/audio_input.cpp +++ b/src/media/audio/audio_input.cpp @@ -149,6 +149,7 @@ AudioInput::initFile(const std::string& path) devOpts_ = {}; devOpts_.input = path; + devOpts_.name = path; devOpts_.loop = "1"; // sets devOpts_'s sample rate and number of channels if (!createDecoder()) { diff --git a/src/media/video/video_input.cpp b/src/media/video/video_input.cpp index a2e807f36b..0ebefcca88 100644 --- a/src/media/video/video_input.cpp +++ b/src/media/video/video_input.cpp @@ -332,6 +332,7 @@ VideoInput::initAVFoundation(const std::string& display) clearOptions(); decOpts_.format = "avfoundation"; decOpts_.pixel_format = "nv12"; + decOpts_.name = "Capture screen 0"; decOpts_.input = "Capture screen 0"; decOpts_.framerate = 30; @@ -394,6 +395,7 @@ VideoInput::initFile(std::string path) // would break the promise returned in switchInput DeviceParams p; p.input = path; + p.name = path; auto dec = std::make_unique<MediaDecoder>(); if (dec->openInput(p) < 0 || dec->setupVideo() < 0) { return initCamera(jami::getVideoDeviceMonitor().getDefaultDevice()); @@ -402,6 +404,7 @@ VideoInput::initFile(std::string path) clearOptions(); emulateRate_ = true; decOpts_.input = path; + decOpts_.name = path; decOpts_.loop = "1"; // Force 1fps for static image -- GitLab