Commit 5e345065 authored by Kateryna Kostiuk's avatar Kateryna Kostiuk Committed by Andreas Traczyk

video macOS: use device id

Change-Id: I341fcfda799bc9bda2f3683a4cf3e59d24bda269
parent 17436766
...@@ -119,13 +119,19 @@ MediaDemuxer::openInput(const DeviceParams& params) ...@@ -119,13 +119,19 @@ MediaDemuxer::openInput(const DeviceParams& params)
av_dict_set(&options_, "pixel_format", params.pixel_format.c_str(), 0); av_dict_set(&options_, "pixel_format", params.pixel_format.c_str(), 0);
} }
JAMI_DBG("Trying to open device %s with format %s, pixel format %s, size %dx%d, rate %lf", params.input.c_str(), #if defined(__APPLE__) && TARGET_OS_MAC
std::string input = params.name;
#else
std::string input = params.input;
#endif
JAMI_DBG("Trying to open device %s with format %s, pixel format %s, size %dx%d, rate %lf", input.c_str(),
params.format.c_str(), params.pixel_format.c_str(), params.width, params.height, params.framerate.real()); params.format.c_str(), params.pixel_format.c_str(), params.width, params.height, params.framerate.real());
av_opt_set_int(inputCtx_, "fpsprobesize", 1, AV_OPT_SEARCH_CHILDREN); // Don't waste time fetching framerate when finding stream info av_opt_set_int(inputCtx_, "fpsprobesize", 1, AV_OPT_SEARCH_CHILDREN); // Don't waste time fetching framerate when finding stream info
int ret = avformat_open_input( int ret = avformat_open_input(
&inputCtx_, &inputCtx_,
params.input.c_str(), input.c_str(),
iformat, iformat,
options_ ? &options_ : NULL); options_ ? &options_ : NULL);
......
...@@ -112,7 +112,7 @@ VideoDeviceImpl::getDeviceParams() const ...@@ -112,7 +112,7 @@ VideoDeviceImpl::getDeviceParams() const
{ {
DeviceParams params; DeviceParams params;
params.name = [[avDevice_ localizedName] UTF8String]; params.name = [[avDevice_ localizedName] UTF8String];
params.input = [[avDevice_ localizedName] UTF8String]; params.input = id;
params.framerate = rate_; params.framerate = rate_;
params.format = "avfoundation"; params.format = "avfoundation";
params.pixel_format = "nv12"; params.pixel_format = "nv12";
......
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