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
124
Issues
124
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
d26ff1ff
Commit
d26ff1ff
authored
Aug 08, 2012
by
Tristan Matthews
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* #14490: video: remove unused sdpEvent
parent
33874733
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
14 deletions
+1
-14
daemon/src/video/video_send_thread.cpp
daemon/src/video/video_send_thread.cpp
+1
-11
daemon/src/video/video_send_thread.h
daemon/src/video/video_send_thread.h
+0
-3
No files found.
daemon/src/video/video_send_thread.cpp
View file @
d26ff1ff
...
...
@@ -65,13 +65,6 @@ void VideoSendThread::print_sdp()
sdp_
+=
line
+
"
\n
"
;
}
DEBUG
(
"sending
\n
%s"
,
sdp_
.
c_str
());
sdpReady_
.
signal
();
}
// NOT called from this (the run() ) thread
void
VideoSendThread
::
waitForSDP
()
{
sdpReady_
.
wait
();
}
void
VideoSendThread
::
forcePresetX264
()
...
...
@@ -328,7 +321,7 @@ int VideoSendThread::interruptCb(void *ctx)
}
VideoSendThread
::
VideoSendThread
(
const
std
::
map
<
string
,
string
>
&
args
)
:
sdpReady_
(),
args_
(
args
),
scaledPictureBuf_
(
0
),
outbuf_
(
0
),
args_
(
args
),
scaledPictureBuf_
(
0
),
outbuf_
(
0
),
inputDecoderCtx_
(
0
),
rawFrame_
(
0
),
scaledPicture_
(
0
),
streamIndex_
(
-
1
),
outbufSize_
(
0
),
encoderCtx_
(
0
),
stream_
(
0
),
inputCtx_
(
0
),
outputCtx_
(
0
),
imgConvertCtx_
(
0
),
sdp_
(),
interruptCb_
(),
...
...
@@ -431,9 +424,6 @@ VideoSendThread::~VideoSendThread()
// FIXME
sending_
=
false
;
ost
::
Thread
::
terminate
();
// make sure no one is waiting for the SDP which will never come if we've
// error'd out
sdpReady_
.
signal
();
sws_freeContext
(
imgConvertCtx_
);
imgConvertCtx_
=
0
;
...
...
daemon/src/video/video_send_thread.h
View file @
d26ff1ff
...
...
@@ -58,7 +58,6 @@ class VideoSendThread : public ost::Thread {
void
prepareEncoderContext
(
AVCodec
*
encoder
);
void
createScalingContext
();
static
int
interruptCb
(
void
*
ctx
);
ost
::
Event
sdpReady_
;
std
::
map
<
std
::
string
,
std
::
string
>
args_
;
/*-------------------------------------------------------------*/
...
...
@@ -87,8 +86,6 @@ class VideoSendThread : public ost::Thread {
public:
explicit
VideoSendThread
(
const
std
::
map
<
std
::
string
,
std
::
string
>
&
args
);
virtual
~
VideoSendThread
();
// called from main thread
void
waitForSDP
();
virtual
void
run
();
std
::
string
getSDP
()
const
{
return
sdp_
;
}
void
forceKeyFrame
();
...
...
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