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
0e36d0b3
Commit
0e36d0b3
authored
4 years ago
by
Aline Gondim Santos
Committed by
Adrien Béraud
4 years ago
Browse files
Options
Downloads
Patches
Plain Diff
plugin: modify preview source
Change-Id: I26660bccd3ab150687c118e22edc27d9e9f9e333
parent
3b7ecd22
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/media/video/video_input.cpp
+21
-0
21 additions, 0 deletions
src/media/video/video_input.cpp
src/media/video/video_input.h
+4
-1
4 additions, 1 deletion
src/media/video/video_input.h
src/media/video/video_rtp_session.cpp
+7
-0
7 additions, 0 deletions
src/media/video/video_rtp_session.cpp
with
32 additions
and
1 deletion
src/media/video/video_input.cpp
+
21
−
0
View file @
0e36d0b3
...
...
@@ -68,9 +68,13 @@ VideoInput::VideoInput(VideoInputMode inputMode, const std::string& id_)
inputMode_
=
VideoInputMode
::
ManagedByDaemon
;
#endif
}
#ifdef __ANDROID__
sink_
=
Manager
::
instance
().
createSinkClient
(
id_
);
#else
if
(
inputMode_
==
VideoInputMode
::
ManagedByDaemon
)
{
sink_
=
Manager
::
instance
().
createSinkClient
(
id_
);
}
#endif
}
VideoInput
::~
VideoInput
()
...
...
@@ -591,6 +595,23 @@ VideoInput::setSink(const std::string& sinkId)
sink_
=
Manager
::
instance
().
createSinkClient
(
sinkId
);
}
void
VideoInput
::
setFrameSize
(
const
int
width
,
const
int
height
)
{
/* Signal the client about readable sink */
sink_
->
setFrameSize
(
width
,
height
);
}
void
VideoInput
::
setupSink
()
{
setup
();
}
void
VideoInput
::
stopSink
()
{
detach
(
sink_
.
get
());
sink_
->
stop
();
}
void
VideoInput
::
updateStartTime
(
int64_t
startTime
)
{
...
...
This diff is collapsed.
Click to expand it.
src/media/video/video_input.h
+
4
−
1
View file @
0e36d0b3
...
...
@@ -74,7 +74,10 @@ public:
void
setPaused
(
bool
paused
)
{
paused_
=
paused
;
}
void
setSeekTime
(
int64_t
time
);
void
setSeekTime
(
int64_t
time
);
void
setFrameSize
(
const
int
width
,
const
int
height
);
void
setupSink
();
void
stopSink
();
std
::
shared_future
<
DeviceParams
>
switchInput
(
const
std
::
string
&
resource
);
#if VIDEO_CLIENT_INPUT
...
...
This diff is collapsed.
Click to expand it.
src/media/video/video_rtp_session.cpp
+
7
−
0
View file @
0e36d0b3
...
...
@@ -120,6 +120,13 @@ void VideoRtpSession::startSender()
JAMI_WARN
(
"Can't lock video input"
);
return
;
}
#ifdef __ANDROID__
if
(
auto
input1
=
std
::
static_pointer_cast
<
VideoInput
>
(
videoLocal_
))
{
input1
->
setupSink
();
input1
->
setFrameSize
(
localVideoParams_
.
width
,
localVideoParams_
.
height
);
}
#endif
}
...
...
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