Commit d26ff1ff authored by Tristan Matthews's avatar Tristan Matthews

* #14490: video: remove unused sdpEvent

parent 33874733
...@@ -65,13 +65,6 @@ void VideoSendThread::print_sdp() ...@@ -65,13 +65,6 @@ void VideoSendThread::print_sdp()
sdp_ += line + "\n"; sdp_ += line + "\n";
} }
DEBUG("sending\n%s", sdp_.c_str()); DEBUG("sending\n%s", sdp_.c_str());
sdpReady_.signal();
}
// NOT called from this (the run() ) thread
void VideoSendThread::waitForSDP()
{
sdpReady_.wait();
} }
void VideoSendThread::forcePresetX264() void VideoSendThread::forcePresetX264()
...@@ -328,7 +321,7 @@ int VideoSendThread::interruptCb(void *ctx) ...@@ -328,7 +321,7 @@ int VideoSendThread::interruptCb(void *ctx)
} }
VideoSendThread::VideoSendThread(const std::map<string, string> &args) : 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), inputDecoderCtx_(0), rawFrame_(0), scaledPicture_(0),
streamIndex_(-1), outbufSize_(0), encoderCtx_(0), stream_(0), streamIndex_(-1), outbufSize_(0), encoderCtx_(0), stream_(0),
inputCtx_(0), outputCtx_(0), imgConvertCtx_(0), sdp_(), interruptCb_(), inputCtx_(0), outputCtx_(0), imgConvertCtx_(0), sdp_(), interruptCb_(),
...@@ -431,9 +424,6 @@ VideoSendThread::~VideoSendThread() ...@@ -431,9 +424,6 @@ VideoSendThread::~VideoSendThread()
// FIXME // FIXME
sending_ = false; sending_ = false;
ost::Thread::terminate(); 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_); sws_freeContext(imgConvertCtx_);
imgConvertCtx_ = 0; imgConvertCtx_ = 0;
......
...@@ -58,7 +58,6 @@ class VideoSendThread : public ost::Thread { ...@@ -58,7 +58,6 @@ class VideoSendThread : public ost::Thread {
void prepareEncoderContext(AVCodec *encoder); void prepareEncoderContext(AVCodec *encoder);
void createScalingContext(); void createScalingContext();
static int interruptCb(void *ctx); static int interruptCb(void *ctx);
ost::Event sdpReady_;
std::map<std::string, std::string> args_; std::map<std::string, std::string> args_;
/*-------------------------------------------------------------*/ /*-------------------------------------------------------------*/
...@@ -87,8 +86,6 @@ class VideoSendThread : public ost::Thread { ...@@ -87,8 +86,6 @@ class VideoSendThread : public ost::Thread {
public: public:
explicit VideoSendThread(const std::map<std::string, std::string> &args); explicit VideoSendThread(const std::map<std::string, std::string> &args);
virtual ~VideoSendThread(); virtual ~VideoSendThread();
// called from main thread
void waitForSDP();
virtual void run(); virtual void run();
std::string getSDP() const { return sdp_; } std::string getSDP() const { return sdp_; }
void forceKeyFrame(); void forceKeyFrame();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment