Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jami-daemon
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-daemon
Commits
5e345065
Commit
5e345065
authored
5 years ago
by
Kateryna Kostiuk
Committed by
Andreas Traczyk
5 years ago
Browse files
Options
Downloads
Patches
Plain Diff
video macOS: use device id
Change-Id: I341fcfda799bc9bda2f3683a4cf3e59d24bda269
parent
17436766
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/media/media_decoder.cpp
+8
-2
8 additions, 2 deletions
src/media/media_decoder.cpp
src/media/video/osxvideo/video_device_impl.mm
+1
-1
1 addition, 1 deletion
src/media/video/osxvideo/video_device_impl.mm
with
9 additions
and
3 deletions
src/media/media_decoder.cpp
+
8
−
2
View file @
5e345065
...
...
@@ -119,13 +119,19 @@ MediaDemuxer::openInput(const DeviceParams& params)
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
());
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
(
&
inputCtx_
,
params
.
input
.
c_str
(),
input
.
c_str
(),
iformat
,
options_
?
&
options_
:
NULL
);
...
...
This diff is collapsed.
Click to expand it.
src/media/video/osxvideo/video_device_impl.mm
+
1
−
1
View file @
5e345065
...
...
@@ -112,7 +112,7 @@ VideoDeviceImpl::getDeviceParams() const
{
DeviceParams
params
;
params
.
name
=
[[
avDevice_
localizedName
]
UTF8String
];
params
.
input
=
[[
avDevice_
localizedName
]
UTF8String
]
;
params
.
input
=
id
;
params
.
framerate
=
rate_
;
params
.
format
=
"avfoundation"
;
params
.
pixel_format
=
"nv12"
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment