Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Sign in / Register
Toggle navigation
J
jami-daemon
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Insights
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Locked Files
Issues
118
Issues
118
List
Boards
Labels
Milestones
Security & Compliance
Security & Compliance
Dependency List
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
savoirfairelinux
jami-daemon
Commits
a948e1f9
Commit
a948e1f9
authored
Mar 23, 2015
by
Adrien Béraud
Committed by
Guillaume Roguez
Mar 23, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
use a common camera:// prefix for video input
Refs #69017 Change-Id: Iab0a6d49221d1a14e5e563e1747ea5a1dd5aff22
parent
8507024c
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
8 deletions
+3
-8
bin/dbus/videomanager-introspec.xml
bin/dbus/videomanager-introspec.xml
+1
-1
src/media/video/video_device_monitor.cpp
src/media/video/video_device_monitor.cpp
+1
-3
src/media/video/video_input.cpp
src/media/video/video_input.cpp
+1
-4
No files found.
bin/dbus/videomanager-introspec.xml
View file @
a948e1f9
...
...
@@ -60,7 +60,7 @@
A media resource locator (MRL).
Currently, the following are supported:
<ul>
<li>
v4l2
://DEVICE
</li>
<li>
camera
://DEVICE
</li>
<li>
display://DISPLAY_NAME[ WIDTHxHEIGHT]
</li>
<li>
file://IMAGE_PATH
</li>
</ul>
...
...
src/media/video/video_device_monitor.cpp
View file @
a948e1f9
...
...
@@ -108,9 +108,7 @@ VideoDeviceMonitor::getMRLForDefaultDevice() const
const
auto
it
=
findDeviceByName
(
defaultDevice_
);
if
(
it
==
std
::
end
(
devices_
))
return
{};
auto
prefix
=
it
->
getDeviceParams
().
format
;
return
prefix
+
"://"
+
it
->
getSettings
().
name
;
return
"camera://"
+
it
->
getSettings
().
name
;
}
void
...
...
src/media/video/video_input.cpp
View file @
a948e1f9
...
...
@@ -317,7 +317,7 @@ VideoInput::switchInput(const std::string& resource)
bool
valid
=
false
;
if
(
prefix
==
"
video4linux2
"
)
{
if
(
prefix
==
"
camera
"
)
{
/* Video4Linux2 */
valid
=
initCamera
(
suffix
);
}
else
if
(
prefix
==
"display"
)
{
...
...
@@ -326,9 +326,6 @@ VideoInput::switchInput(const std::string& resource)
}
else
if
(
prefix
==
"file"
)
{
/* Pathname */
valid
=
initFile
(
suffix
);
}
else
if
(
prefix
==
"avfoundation"
)
{
/* AVFoundation */
valid
=
initCamera
(
suffix
);
}
// Unsupported MRL or failed initialization
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment