jami/jami-daemon
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-daemon.git synced 2025-08-12 22:09:25 +08:00
Code Issues Projects Releases Wiki Activity

* #16724: video: fix regression in preview

Browse Source 
Introduced by commit 9f8be04d85,
we should only override the read function in VideoReceiveThread
if we are using SDP.
This commit is contained in:
Tristan Matthews
2012-11-06 14:08:58 -05:00
parent fae5b5a474
commit 2f90ca305c
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
daemon/src/video/video_receive_thread.cpp
View File

@ -119,11 +119,12 @@ void VideoReceiveThread::setup()
dstWidth_ = atoi(args_["width"].c_str());
dstHeight_ = atoi(args_["height"].c_str());
const std::string SDP_FILENAME = "dummyFilename";
std::string format_str;
std::string input;
if (args_["input"].empty()) {
format_str = "sdp";
input = "dummyFilename";
input = SDP_FILENAME;
} else if (args_["input"].substr(0, strlen("/dev/video")) == "/dev/video") {
// it's a v4l device if starting with /dev/video
// FIXME: This is not a robust way of checking if we mean to use a
@ -147,7 +148,10 @@ void VideoReceiveThread::setup()
// Open video file
inputCtx_ = avformat_alloc_context();
inputCtx_->interrupt_callback = interruptCb_;
inputCtx_->pb = avioContext_.get();
if (input == SDP_FILENAME) {
EXIT_IF_FAIL(not stream_.str().empty(), "No SDP loaded");
inputCtx_->pb = avioContext_.get();
}
int ret = avformat_open_input(&inputCtx_, input.c_str(), file_iformat, options ? &options : NULL);
if (ret < 0) {