Skip to content
Snippets Groups Projects
Commit 79941b1c authored by Adrien Béraud's avatar Adrien Béraud
Browse files

video: fix local camera openning

Commit be732d47 introduce a regression on local camera input openning through v4l2. This patch fixes this and the fix from 33bc8cf7.

Refs #66543

Change-Id: Id727fcec5ee22be2fbee358236802e75e0c03f53
parent 33bc8cf7
No related branches found
No related tags found
No related merge requests found
...@@ -521,7 +521,7 @@ VideoDeviceImpl::getDeviceParams() const ...@@ -521,7 +521,7 @@ VideoDeviceImpl::getDeviceParams() const
{ {
DeviceParams params; DeviceParams params;
params.input = device; params.input = device;
params.format = "v4l2"; params.format = "video4linux2";
params.channel = channel_.idx; params.channel = channel_.idx;
params.width = size_.width; params.width = size_.width;
params.height = size_.height; params.height = size_.height;
......
...@@ -317,7 +317,7 @@ VideoInput::switchInput(const std::string& resource) ...@@ -317,7 +317,7 @@ VideoInput::switchInput(const std::string& resource)
bool valid = false; bool valid = false;
if (prefix == "v4l2") { if (prefix == "video4linux2") {
/* Video4Linux2 */ /* Video4Linux2 */
valid = initCamera(suffix); valid = initCamera(suffix);
} else if (prefix == "display") { } else if (prefix == "display") {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment