From 081b9028e4dfda2968b1d4744b9bf3db322b4f24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joni=20R=C3=A4s=C3=A4nen?= <joni.rasanen@tut.fi>
Date: Fri, 12 Apr 2019 16:14:11 +0300
Subject: [PATCH 01/24] [Settings] (bug_fix) Fixed crashing when no camera is
 attached.

---
 src/video/camerafilter.cpp |  4 +--
 src/video/camerainfo.cpp   | 56 ++++++++++++++++++++++----------------
 2 files changed, 34 insertions(+), 26 deletions(-)

diff --git a/src/video/camerafilter.cpp b/src/video/camerafilter.cpp
index 55afd5be..4497de71 100644
--- a/src/video/camerafilter.cpp
+++ b/src/video/camerafilter.cpp
@@ -13,7 +13,7 @@
 
 CameraFilter::CameraFilter(QString id, StatisticsInterface *stats):
   Filter(id, "Camera", stats, NONE, RGB32VIDEO),
-  camera_(),
+  camera_(nullptr),
   cameraFrameGrabber_(),
   framerate_(0)
 {}
@@ -176,7 +176,7 @@ bool CameraFilter::cameraSetup()
 
 void CameraFilter::stop()
 {
-  if(camera_->state() == QCamera::ActiveState)
+  if(camera_ && camera_->state() == QCamera::ActiveState)
   {
     camera_->stop();
   }
diff --git a/src/video/camerainfo.cpp b/src/video/camerainfo.cpp
index 7c00eadd..3d3895e7 100644
--- a/src/video/camerainfo.cpp
+++ b/src/video/camerainfo.cpp
@@ -66,13 +66,15 @@ void CameraInfo::getVideoFormats(int deviceID, QStringList& formats)
   formats.clear();
 
   std::unique_ptr<QCamera> camera = loadCamera(deviceID);
-
-  QList<QVideoFrame::PixelFormat> p_formats = camera->supportedViewfinderPixelFormats();
-  qDebug() << "Settings, CameraInfo : Found" << p_formats.size() <<  "formats for deviceID:" << deviceID;
-
-  for(int i = 0; i < p_formats.size() ; ++i)
+  if (camera != nullptr)
   {
-    formats.push_back(pixelFormatStrings.at(p_formats.at(i)));
+    QList<QVideoFrame::PixelFormat> p_formats = camera->supportedViewfinderPixelFormats();
+    qDebug() << "Settings, CameraInfo : Found" << p_formats.size() <<  "formats for deviceID:" << deviceID;
+
+    for(int i = 0; i < p_formats.size() ; ++i)
+    {
+      formats.push_back(pixelFormatStrings.at(p_formats.at(i)));
+    }
   }
 }
 
@@ -86,13 +88,16 @@ void CameraInfo::getFormatResolutions(int deviceID, QString format, QStringList
 
   std::unique_ptr<QCamera> camera = loadCamera(deviceID);
 
-  QList<QSize> supporteResolutions = camera->supportedViewfinderResolutions(viewSettings);
-  qDebug() << "Settings, CameraInfo : Found" << supporteResolutions.size() <<  "resolutions for deviceID:" << deviceID;
-
-  for (int i = 0; i < supporteResolutions.size(); ++i)
+  if (camera != nullptr)
   {
-    resolutions.push_back(QString::number(supporteResolutions[i].width()) + "x" +
-                          QString::number(supporteResolutions[i].height()));
+    QList<QSize> supporteResolutions = camera->supportedViewfinderResolutions(viewSettings);
+    qDebug() << "Settings, CameraInfo : Found" << supporteResolutions.size() <<  "resolutions for deviceID:" << deviceID;
+
+    for (int i = 0; i < supporteResolutions.size(); ++i)
+    {
+      resolutions.push_back(QString::number(supporteResolutions[i].width()) + "x" +
+                            QString::number(supporteResolutions[i].height()));
+    }
   }
 }
 
@@ -131,6 +136,7 @@ std::unique_ptr<QCamera> CameraInfo::loadCamera(int deviceID)
   if(deviceID == -1 || deviceID >= cameras.size())
   {
     qDebug() << "ERROR: Invalid deviceID for getVideoCapabilities";
+    return std::unique_ptr<QCamera> (nullptr);
   }
 
   std::unique_ptr<QCamera> camera
@@ -163,19 +169,21 @@ QVideoFrame::PixelFormat CameraInfo::stringToPixelFormat(QString format)
 QSize CameraInfo::getResolution(int deviceID, int formatID, int resolutionID)
 {
   std::unique_ptr<QCamera> camera = loadCamera(deviceID);
-
-  QString format = getFormat(deviceID, formatID);
-  QCameraViewfinderSettings viewSettings;
-  viewSettings.setPixelFormat(stringToPixelFormat(format));
-  QList<QSize> supporteResolutions = camera->supportedViewfinderResolutions(viewSettings);
-
-  if(supporteResolutions.size() > resolutionID)
-  {
-    return supporteResolutions.at(resolutionID);
-  }
-  else if(!supporteResolutions.empty())
+  if (camera != nullptr)
   {
-    supporteResolutions.at(0);
+    QString format = getFormat(deviceID, formatID);
+    QCameraViewfinderSettings viewSettings;
+    viewSettings.setPixelFormat(stringToPixelFormat(format));
+    QList<QSize> supporteResolutions = camera->supportedViewfinderResolutions(viewSettings);
+
+    if(supporteResolutions.size() > resolutionID)
+    {
+      return supporteResolutions.at(resolutionID);
+    }
+    else if(!supporteResolutions.empty())
+    {
+      supporteResolutions.at(0);
+    }
   }
 
   return QSize(0,0);

From 7484608fb7ed840fa5fefb8909bb78cd52002fc9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joni=20R=C3=A4s=C3=A4nen?= <joni.rasanen@tut.fi>
Date: Tue, 16 Apr 2019 15:11:13 +0300
Subject: [PATCH 02/24] [Settings] (bug_fix) Linux compatible ui filepath.

---
 src/gui/customsettings.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/gui/customsettings.cpp b/src/gui/customsettings.cpp
index 7dfbbe11..1dcbce83 100644
--- a/src/gui/customsettings.cpp
+++ b/src/gui/customsettings.cpp
@@ -1,6 +1,6 @@
 #include "customsettings.h"
 
-#include "ui_customsettings.h"
+#include "ui_customSettings.h"
 
 #include <video/camerainfo.h>
 #include "settingshelper.h"
@@ -355,6 +355,7 @@ void CustomSettings::initializeResolutions(QString format)
   }
 }
 
+
 void CustomSettings::initializeFramerates(QString format, int resolutionID)
 {
   qDebug() << "Settings,"  << metaObject()->className() << ": Initializing resolutions for format:" << format;

From ac38c45c28ddebc39b715109bce2839772681598 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joni=20R=C3=A4s=C3=A4nen?= <joni.rasanen@tut.fi>
Date: Tue, 16 Apr 2019 16:09:03 +0300
Subject: [PATCH 03/24] [Settings] (bug_fix) Set the framerate for
 KvazaarFilter. Unsure if fractional framerates work.

---
 src/gui/customsettings.cpp  | 3 +++
 src/video/kvazaarfilter.cpp | 5 +++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/gui/customsettings.cpp b/src/gui/customsettings.cpp
index 1dcbce83..107df65c 100644
--- a/src/gui/customsettings.cpp
+++ b/src/gui/customsettings.cpp
@@ -182,6 +182,9 @@ void CustomSettings::saveCameraCapabilities(int deviceIndex)
   settings_.setValue("video/ResolutionHeight",     res.height() - res.height()%8);
   settings_.setValue("video/ResolutionID",         resolutionIndex);
   settings_.setValue("video/FramerateID",          customUI_->framerate_box->currentIndex());
+
+  // TODO: does not work if minimum and maximum framerates differ or if framerate is fractional
+  settings_.setValue("video/Framerate",            customUI_->framerate_box->currentText());
   settings_.setValue("video/InputFormat",          format);
 
   qDebug() << "Settings," << metaObject()->className() << ": Recorded the following video settings: Resolution:"
diff --git a/src/video/kvazaarfilter.cpp b/src/video/kvazaarfilter.cpp
index b2e7bd3d..5fd89fec 100644
--- a/src/video/kvazaarfilter.cpp
+++ b/src/video/kvazaarfilter.cpp
@@ -82,7 +82,7 @@ bool KvazaarFilter::init()
   config_->wpp = settings.value("video/WPP").toInt();
   config_->vps_period = settings.value("video/VPS").toInt();
   config_->intra_period = settings.value("video/Intra").toInt();
-  config_->framerate_num = 30;
+  config_->framerate_num = settings.value("video/Framerate").toInt();
   config_->framerate_denom = framerate_denom_;
   config_->hash = KVZ_HASH_NONE;
 #endif
@@ -211,7 +211,7 @@ void KvazaarFilter::feedInput(std::unique_ptr<Data> input)
      || config_->framerate_num != input->framerate)
   {
     // This should not happen.
-    qDebug() << getName() << "WARNING: Input resolution differs:"
+    qDebug() << getName() << "WARNING: Input resolution or framerate differs:"
              << config_->width << "x" << config_->height << "input:"
              << input->width << "x" << input->height;
 
@@ -224,6 +224,7 @@ void KvazaarFilter::feedInput(std::unique_ptr<Data> input)
     updateSettings();
   }
 
+
   // copy input to kvazaar picture
   memcpy(input_pic_->y,
          input->data.get(),

From 091161719636813658a9fd06c68f279db36a4814 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joni=20R=C3=A4s=C3=A4nen?= <joni.rasanen@tut.fi>
Date: Tue, 16 Apr 2019 16:15:19 +0300
Subject: [PATCH 04/24] [SIP] (bug_fix) Do not ask conneciton status from
 TCPConnection that does not exist.

---
 src/sip/siptransport.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/sip/siptransport.cpp b/src/sip/siptransport.cpp
index 40b36ecf..6356826c 100644
--- a/src/sip/siptransport.cpp
+++ b/src/sip/siptransport.cpp
@@ -41,7 +41,7 @@ const std::map<QString, std::function<bool(SIPField& field, std::shared_ptr<SIPM
 
 SIPTransport::SIPTransport(quint32 transportID):
   partialMessage_(""),
-  connection_(),
+  connection_(nullptr),
   transportID_(transportID)
 {}
 
@@ -55,7 +55,7 @@ void SIPTransport::cleanup()
 
 bool SIPTransport::isConnected()
 {
-  return connection_->isConnected();
+  return connection_ && connection_->isConnected();
 }
 
 QHostAddress SIPTransport::getLocalAddress()

From 1c08eec0e4277ad1a3f30cb14ebd6edc47a1c640 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joni=20R=C3=A4s=C3=A4nen?= <joni.rasanen@tut.fi>
Date: Thu, 18 Apr 2019 12:55:38 +0300
Subject: [PATCH 05/24] [Media] (bug_fix) The Ipv6 addresses that are actually
 Ipv4 address are now supported.

---
 src/mediamanager.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/mediamanager.cpp b/src/mediamanager.cpp
index 1e0470af..4f856c0f 100644
--- a/src/mediamanager.cpp
+++ b/src/mediamanager.cpp
@@ -94,7 +94,8 @@ void MediaManager::addParticipant(uint32_t sessionID, std::shared_ptr<SDPMessage
       stats_->addParticipant(peerInfo->connection_address, "0", "0");
     }
 
-    if(peerInfo->connection_addrtype == "IP4")
+    if(peerInfo->connection_addrtype == "IP4"
+       || (peerInfo->connection_addrtype == "IP6" && address.toString().left(7) == "::ffff:"))
     {
       in_addr ip;
 #ifdef _WIN32
@@ -110,9 +111,8 @@ void MediaManager::addParticipant(uint32_t sessionID, std::shared_ptr<SDPMessage
         return;
       }
     }
-    else if(peerInfo->connection_addrtype == "IP6")
-    {
-      qDebug() << "ERROR: IPv6 not supported in media creation";
+    else {
+      qDebug() << "ERROR:" << peerInfo->connection_addrtype << "not supported in media creation:" << address;
       return;
     }
   }

From 5e631a7023e9a3d8512cf0fcce5a26440251f7b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joni=20R=C3=A4s=C3=A4nen?= <joni.rasanen@tut.fi>
Date: Thu, 18 Apr 2019 14:51:21 +0300
Subject: [PATCH 06/24] [SIP] (bug_fix) A small attempt at fixing a bug related
 to call stopping at processSIPResponses first mutex. Also renamed the mutex
 to dialogMutex, because that reflects the purpose of the mutex much better.

---
 src/sip/siptransactions.cpp | 27 +++++++++++++++------------
 src/sip/siptransactions.h   |  2 +-
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/src/sip/siptransactions.cpp b/src/sip/siptransactions.cpp
index 2665a90d..b6d93d28 100644
--- a/src/sip/siptransactions.cpp
+++ b/src/sip/siptransactions.cpp
@@ -214,7 +214,7 @@ void SIPTransactions::createBaseDialog( quint32 transportID, std::shared_ptr<SIP
   Q_ASSERT(transportID <= transports_.size());
 
   dialog = std::shared_ptr<SIPDialogData> (new SIPDialogData);
-  connectionMutex_.lock();
+  dialogMutex_.lock();
   dialog->transportID = transportID;
 
   dialog->state = std::shared_ptr<SIPDialogState> (new SIPDialogState());
@@ -228,34 +228,36 @@ void SIPTransactions::createBaseDialog( quint32 transportID, std::shared_ptr<SIP
 
   dialog->localSdp_ = nullptr;
   dialog->remoteSdp_ = nullptr;
+
+  dialogs_.push_back(dialog);
+  dialogMutex_.unlock();
+
   QObject::connect(dialog->client.get(), &SIPDialogClient::sendDialogRequest,
                    this, &SIPTransactions::sendDialogRequest);
 
   QObject::connect(dialog->server.get(), &SIPServerTransaction::sendResponse,
                    this, &SIPTransactions::sendResponse);
 
-  dialogs_.push_back(dialog);
-  connectionMutex_.unlock();
 }
 
 void SIPTransactions::acceptCall(uint32_t sessionID)
 {
-  connectionMutex_.lock();
+  dialogMutex_.lock();
   std::shared_ptr<SIPDialogData> dialog = dialogs_.at(sessionID - 1);
+  dialogMutex_.unlock();
 
   // start candiate nomination. This function won't block, negotiation happens in the background
   // remoteFinalSDP() makes sure that a connection was in fact nominated
   sdp_.startICECandidateNegotiation(dialog->localSdp_->candidates, dialog->remoteSdp_->candidates, sessionID);
 
-  connectionMutex_.unlock();
   dialog->server->acceptCall();
 }
 
 void SIPTransactions::rejectCall(uint32_t sessionID)
 {
-  connectionMutex_.lock();
+  dialogMutex_.lock();
   std::shared_ptr<SIPDialogData> dialog = dialogs_.at(sessionID - 1);
-  connectionMutex_.unlock();
+  dialogMutex_.unlock();
   dialog->server->rejectCall();
   destroyDialog(sessionID);
 }
@@ -355,7 +357,7 @@ void SIPTransactions::processSIPRequest(SIPRequest request,
 
   // TODO: sessionID is now tranportID
   // TODO: separate non-dialog and dialog requests!
-  connectionMutex_.lock();
+  dialogMutex_.lock();
 
   uint32_t foundSessionID = 0;
   for(unsigned int sessionID = 1; sessionID - 1 < dialogs_.size(); ++sessionID)
@@ -372,10 +374,10 @@ void SIPTransactions::processSIPRequest(SIPRequest request,
 
   // find the dialog which corresponds to the callID and tags received in request
   std::shared_ptr<SIPDialogData> foundDialog;
-  connectionMutex_.unlock();
 
   if(foundSessionID == 0)
   {
+    dialogMutex_.unlock();
     qDebug() << "Could not find the dialog of the request.";
 
     // TODO: there is a problem if the sequence number did not match and the request type is INVITE
@@ -406,6 +408,7 @@ void SIPTransactions::processSIPRequest(SIPRequest request,
   {
     Q_ASSERT(foundSessionID <= dialogs_.size());
     foundDialog = dialogs_.at(foundSessionID - 1);
+    dialogMutex_.unlock();
   }
 
   // check correct initialization
@@ -475,7 +478,7 @@ void SIPTransactions::processSIPResponse(SIPResponse response,
   // TODO: sessionID is now tranportID
   // TODO: separate nondialog and dialog requests!
   qDebug() << "Starting to process received SIP Response:" << response.type;
-  connectionMutex_.lock();
+  dialogMutex_.lock();
 
   // find the dialog which corresponds to the callID and tags received in response
   uint32_t foundSessionID = 0;
@@ -484,7 +487,7 @@ void SIPTransactions::processSIPResponse(SIPResponse response,
   {
     if(dialogs_.at(sessionID - 1) != nullptr &&
        dialogs_.at(sessionID - 1)->state->correctResponseDialog(response.message->dialog,
-                                             response.message->cSeq))
+                                                                response.message->cSeq))
     {
       // TODO: we should check that every single detail is as specified in rfc.
       if(dialogs_.at(sessionID - 1)->client->waitingResponse(response.message->transactionRequest))
@@ -510,7 +513,7 @@ void SIPTransactions::processSIPResponse(SIPResponse response,
   // check correct initialization
   Q_ASSERT(dialogs_.at(foundSessionID - 1)->state);
 
-  connectionMutex_.unlock();
+  dialogMutex_.unlock();
 
   // TODO: if our request was INVITE and response is 2xx or 101-199, create dialog
   // TODO: prechecks that the response is ok, then modify program state.
diff --git a/src/sip/siptransactions.h b/src/sip/siptransactions.h
index c03fa9bb..dccde64e 100644
--- a/src/sip/siptransactions.h
+++ b/src/sip/siptransactions.h
@@ -131,7 +131,7 @@ private slots:
 
   // This mutex makes sure that the dialog has been added to the dialogs_ list
   // before we are accessing it when receiving messages
-  QMutex connectionMutex_;
+  QMutex dialogMutex_;
 
   struct DialogRequest
   {

From 70101fcbffa2501c531329a2a483653ebbde74c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joni=20R=C3=A4s=C3=A4nen?= <joni.rasanen@tut.fi>
Date: Wed, 24 Apr 2019 14:36:07 +0300
Subject: [PATCH 07/24] [SIP](architecture)(bug_fix) Moved dialogdata from
 QList to QMap. Should eliminate all bugs related to wrong sessionID in
 SIPTransaction.

---
 src/sip/siptransactions.cpp | 170 +++++++++++++++++++-----------------
 src/sip/siptransactions.h   |   9 +-
 2 files changed, 95 insertions(+), 84 deletions(-)

diff --git a/src/sip/siptransactions.cpp b/src/sip/siptransactions.cpp
index b6d93d28..3b63afe6 100644
--- a/src/sip/siptransactions.cpp
+++ b/src/sip/siptransactions.cpp
@@ -11,6 +11,7 @@ SIPTransactions::SIPTransactions():
   pendingConnectionMutex_(),
   pendingDialogRequests_(),
   pendingNonDialogRequests_(),
+  nextSessionID_(1),
   dialogs_(),
   registrations_(),
   transports_(),
@@ -55,12 +56,13 @@ void SIPTransactions::init(SIPTransactionUser *callControl)
 void SIPTransactions::uninit()
 {
   //TODO: delete all dialogs
-  for(uint32_t sessionID = 1; sessionID - 1 < dialogs_.size(); ++sessionID)
+  for(auto i = dialogs_.begin(); i != dialogs_.end(); ++i)
   {
-    destroyDialog(sessionID);
+    destroyDialog(i.value());
   }
 
   dialogs_.clear();
+  nextSessionID_ = 1;
 
   for(std::shared_ptr<SIPTransport> transport : transports_)
   {
@@ -129,17 +131,17 @@ void SIPTransactions::getSDPs(uint32_t sessionID,
                               std::shared_ptr<SDPMessageInfo>& localSDP,
                               std::shared_ptr<SDPMessageInfo>& remoteSDP)
 {
-  Q_ASSERT(sessionID != 0);
+  Q_ASSERT(dialogs_.find(sessionID) != dialogs_.end());
 
-  if(dialogs_.at(sessionID - 1)->localSdp_ == nullptr ||
-     dialogs_.at(sessionID - 1)->remoteSdp_ == nullptr)
+  if(dialogs_[sessionID]->localSdp_ == nullptr ||
+     dialogs_[sessionID]->remoteSdp_ == nullptr)
   {
     qDebug() << "getSDP: Both SDP:s are not present for some reason."
              << "Maybe the call has ended before starting?";
   }
 
-  localSDP = dialogs_.at(sessionID - 1)->localSdp_;
-  remoteSDP = dialogs_.at(sessionID - 1)->remoteSdp_;
+  localSDP = dialogs_[sessionID]->localSdp_;
+  remoteSDP = dialogs_[sessionID]->remoteSdp_;
 }
 
 
@@ -221,15 +223,16 @@ void SIPTransactions::createBaseDialog( quint32 transportID, std::shared_ptr<SIP
 
   dialog->client = std::shared_ptr<SIPDialogClient> (new SIPDialogClient(transactionUser_));
   dialog->client->init();
-  dialog->client->setSessionID(dialogs_.size() + 1);
+  dialog->client->setSessionID(nextSessionID_);
 
   dialog->server = std::shared_ptr<SIPServerTransaction> (new SIPServerTransaction);
-  dialog->server->init(transactionUser_, dialogs_.size() + 1);
+  dialog->server->init(transactionUser_, nextSessionID_);
 
   dialog->localSdp_ = nullptr;
   dialog->remoteSdp_ = nullptr;
 
-  dialogs_.push_back(dialog);
+  dialogs_[nextSessionID_] = dialog;
+  ++nextSessionID_;
   dialogMutex_.unlock();
 
   QObject::connect(dialog->client.get(), &SIPDialogClient::sendDialogRequest,
@@ -242,8 +245,10 @@ void SIPTransactions::createBaseDialog( quint32 transportID, std::shared_ptr<SIP
 
 void SIPTransactions::acceptCall(uint32_t sessionID)
 {
+  Q_ASSERT(dialogs_.find(sessionID) != dialogs_.end());
+
   dialogMutex_.lock();
-  std::shared_ptr<SIPDialogData> dialog = dialogs_.at(sessionID - 1);
+  std::shared_ptr<SIPDialogData> dialog = dialogs_[sessionID];
   dialogMutex_.unlock();
 
   // start candiate nomination. This function won't block, negotiation happens in the background
@@ -255,25 +260,39 @@ void SIPTransactions::acceptCall(uint32_t sessionID)
 
 void SIPTransactions::rejectCall(uint32_t sessionID)
 {
+  Q_ASSERT(dialogs_.find(sessionID) != dialogs_.end());
+
   dialogMutex_.lock();
-  std::shared_ptr<SIPDialogData> dialog = dialogs_.at(sessionID - 1);
+  std::shared_ptr<SIPDialogData> dialog = dialogs_[sessionID];
   dialogMutex_.unlock();
   dialog->server->rejectCall();
-  destroyDialog(sessionID);
+  destroyDialog(dialog);
+  dialogs_.erase(dialogs_.find(sessionID));
 }
 
 void SIPTransactions::endCall(uint32_t sessionID)
 {
-  std::shared_ptr<SIPDialogData> dialog = dialogs_.at(sessionID - 1);
+  Q_ASSERT(dialogs_.find(sessionID) != dialogs_.end());
+
+  std::shared_ptr<SIPDialogData> dialog = dialogs_[sessionID];
   dialog->client->endCall();
-  destroyDialog(sessionID);
+  destroyDialog(dialog);
+  dialogs_.erase(dialogs_.find(sessionID));
+
+  if (dialogs_.empty())
+  {
+    nextSessionID_ = 1;
+  }
 }
 
 void SIPTransactions::cancelCall(uint32_t sessionID)
 {
-  std::shared_ptr<SIPDialogData> dialog = dialogs_.at(sessionID - 1);
+  Q_ASSERT(dialogs_.find(sessionID) != dialogs_.end());
+
+  std::shared_ptr<SIPDialogData> dialog = dialogs_[sessionID];
   dialog->client->cancelCall();
-  destroyDialog(sessionID);
+  destroyDialog(dialog);
+  dialogs_.erase(dialogs_.find(sessionID));
 }
 
 
@@ -287,13 +306,12 @@ void SIPTransactions::endAllCalls()
     }
   }
 
-  for(int i = 0; i < dialogs_.size(); ++i)
+  for(auto i = dialogs_.begin(); i != dialogs_.end(); ++i)
   {
-    if(dialogs_.at(i) != nullptr)
-    {
-      destroyDialog(i + 1);
-    }
+    destroyDialog(i.value());
   }
+  dialogs_.clear();
+  nextSessionID_ = 1;
 }
 
 std::shared_ptr<SIPTransport> SIPTransactions::createSIPTransport()
@@ -320,7 +338,7 @@ void SIPTransactions::receiveTCPConnection(TCPConnection *con)
   std::shared_ptr<SIPTransport> transport = createSIPTransport();
   transport->incomingTCPConnection(std::shared_ptr<TCPConnection> (con));
 
-  qDebug() << "Dialog with ID:" << dialogs_.size() << "created for received connection.";
+  qDebug() << "Dialog with ID:" << nextSessionID_ - 1 << "created for received connection.";
 }
 
 void SIPTransactions::connectionEstablished(quint32 transportID)
@@ -360,15 +378,15 @@ void SIPTransactions::processSIPRequest(SIPRequest request,
   dialogMutex_.lock();
 
   uint32_t foundSessionID = 0;
-  for(unsigned int sessionID = 1; sessionID - 1 < dialogs_.size(); ++sessionID)
+
+  for (auto i = dialogs_.begin(); i != dialogs_.end(); ++i)
   {
-    if(dialogs_.at(sessionID - 1) != nullptr &&
-       dialogs_.at(sessionID - 1)->state->correctRequestDialog(request.message->dialog,
-                                                                request.type,
-                                                                request.message->cSeq))
+    if(i.value() != nullptr &&
+       i.value()->state->correctRequestDialog(request.message->dialog,
+                                              request.type, request.message->cSeq))
     {
       qDebug() << "Found dialog matching for incoming request.";
-      foundSessionID = sessionID;
+      foundSessionID = i.key();
     }
   }
 
@@ -392,7 +410,7 @@ void SIPTransactions::processSIPRequest(SIPRequest request,
       }
 
       createDialogFromINVITE(transportID, request.message, foundDialog);
-      foundSessionID = dialogs_.size();
+      foundSessionID = nextSessionID_ - 1;
 
       // Proxy TODO: somehow distinguish if this is a proxy connection
       foundDialog->proxyConnection_ = false;
@@ -406,8 +424,8 @@ void SIPTransactions::processSIPRequest(SIPRequest request,
   }
   else
   {
-    Q_ASSERT(foundSessionID <= dialogs_.size());
-    foundDialog = dialogs_.at(foundSessionID - 1);
+    Q_ASSERT(dialogs_.find(foundSessionID) != dialogs_.end());
+    foundDialog = dialogs_[foundSessionID];
     dialogMutex_.unlock();
   }
 
@@ -483,17 +501,17 @@ void SIPTransactions::processSIPResponse(SIPResponse response,
   // find the dialog which corresponds to the callID and tags received in response
   uint32_t foundSessionID = 0;
 
-  for(unsigned int sessionID = 1; sessionID - 1 < dialogs_.size(); ++sessionID)
+  for (auto i = dialogs_.begin(); i != dialogs_.end(); ++i)
   {
-    if(dialogs_.at(sessionID - 1) != nullptr &&
-       dialogs_.at(sessionID - 1)->state->correctResponseDialog(response.message->dialog,
+    if(i.value() != nullptr &&
+       i.value()->state->correctResponseDialog(response.message->dialog,
                                                                 response.message->cSeq))
     {
       // TODO: we should check that every single detail is as specified in rfc.
-      if(dialogs_.at(sessionID - 1)->client->waitingResponse(response.message->transactionRequest))
+      if(i.value()->client->waitingResponse(response.message->transactionRequest))
       {
         qDebug() << "Found dialog matching the response";
-        foundSessionID = sessionID;
+        foundSessionID = i.key();
         break;
       }
       else
@@ -511,7 +529,7 @@ void SIPTransactions::processSIPResponse(SIPResponse response,
   }
 
   // check correct initialization
-  Q_ASSERT(dialogs_.at(foundSessionID - 1)->state);
+  Q_ASSERT(dialogs_[foundSessionID]->state);
 
   dialogMutex_.unlock();
 
@@ -530,17 +548,18 @@ void SIPTransactions::processSIPResponse(SIPResponse response,
     }
   }
 
-  if(!dialogs_.at(foundSessionID - 1)->client->processResponse(response))
+  if(!dialogs_[foundSessionID]->client->processResponse(response))
   {
     // destroy dialog
-    destroyDialog(foundSessionID);
+    destroyDialog(dialogs_[foundSessionID]);
+    dialogs_.erase(dialogs_.find(foundSessionID));
   }
   qDebug() << "Response processing finished:" << response.type << "Dialog:" << foundSessionID;
 }
 
 bool SIPTransactions::processSDP(uint32_t sessionID, QVariant& content, QHostAddress localAddress)
 {
-  if(!content.isValid())
+  if(!content.isValid() || dialogs_.find(sessionID) == dialogs_.end())
   {
     qWarning() << "ERROR: The SDP content is not valid at processing. Should be detected earlier.";
     return false;
@@ -548,36 +567,37 @@ bool SIPTransactions::processSDP(uint32_t sessionID, QVariant& content, QHostAdd
 
   SDPMessageInfo retrieved = content.value<SDPMessageInfo>();
 
-  dialogs_.at(sessionID - 1)->localSdp_
-      = sdp_.localFinalSDP(retrieved, localAddress, dialogs_.at(sessionID - 1)->localSdp_, sessionID);
+  dialogs_[sessionID]->localSdp_
+      = sdp_.localFinalSDP(retrieved, localAddress, dialogs_[sessionID]->localSdp_, sessionID);
 
-  if(dialogs_.at(sessionID - 1)->localSdp_ == nullptr)
+  if(dialogs_[sessionID]->localSdp_ == nullptr)
   {
     qDebug() << "Remote SDP not suitable or we have no ports to assign";
-    destroyDialog(sessionID);
+    destroyDialog(dialogs_[sessionID]);
+    dialogs_.erase(dialogs_.find(sessionID));
     return false;
   }
-  dialogs_.at(sessionID - 1)->remoteSdp_ = std::shared_ptr<SDPMessageInfo> (new SDPMessageInfo);
-  *dialogs_.at(sessionID - 1)->remoteSdp_ = retrieved;
+  dialogs_[sessionID]->remoteSdp_ = std::shared_ptr<SDPMessageInfo> (new SDPMessageInfo);
+  *dialogs_[sessionID]->remoteSdp_ = retrieved;
   return true;
 }
 
 void SIPTransactions::sendDialogRequest(uint32_t sessionID, RequestType type)
 {
   qDebug() << "---- Iniated sending of a dialog request:" << type << "----";
-  Q_ASSERT(sessionID != 0 && sessionID <= dialogs_.size());
-  Q_ASSERT(dialogs_.at(sessionID - 1)->transportID != 0);
+  Q_ASSERT(sessionID != 0 && dialogs_.find(sessionID) != dialogs_.end());
+  Q_ASSERT(dialogs_[sessionID]->transportID != 0);
   // Get all the necessary information from different components.
 
   std::shared_ptr<SIPTransport> transport
-      = transports_.at(dialogs_.at(sessionID - 1)->transportID - 1);
+      = transports_.at(dialogs_[sessionID]->transportID - 1);
 
   pendingConnectionMutex_.lock();
   if(!transport->isConnected())
   {
     qDebug() << "SIP," << metaObject()->className() << "The connection has not yet been established. Delaying sending of request.";
 
-    pendingDialogRequests_[dialogs_.at(sessionID - 1)->transportID] = (DialogRequest{sessionID, type});
+    pendingDialogRequests_[dialogs_[sessionID]->transportID] = (DialogRequest{sessionID, type});
     pendingConnectionMutex_.unlock();
     return;
   }
@@ -587,17 +607,17 @@ void SIPTransactions::sendDialogRequest(uint32_t sessionID, RequestType type)
   request.type = type;
 
   // if this is the session creation INVITE. Proxy sessions should be created earlier.
-  if(request.type == SIP_INVITE && !dialogs_.at(sessionID - 1)->proxyConnection_)
+  if(request.type == SIP_INVITE && !dialogs_[sessionID]->proxyConnection_)
   {
-    dialogs_.at(sessionID - 1)->state->setPeerToPeerHostname(transport->getLocalAddress().toString());
+    dialogs_[sessionID]->state->setPeerToPeerHostname(transport->getLocalAddress().toString());
   }
 
   // Get message info
-  dialogs_.at(sessionID - 1)->client->getRequestMessageInfo(type, request.message);
-  dialogs_.at(sessionID - 1)->client->startTimer(type);
+  dialogs_[sessionID]->client->getRequestMessageInfo(type, request.message);
+  dialogs_[sessionID]->client->startTimer(type);
 
-  dialogs_.at(sessionID - 1)->state->getRequestDialogInfo(request,
-                                                          transport->getLocalAddress().toString());
+  dialogs_[sessionID]->state->getRequestDialogInfo(request,
+                                                   transport->getLocalAddress().toString());
 
   Q_ASSERT(request.message != nullptr);
   Q_ASSERT(request.message->dialog != nullptr);
@@ -611,12 +631,12 @@ void SIPTransactions::sendDialogRequest(uint32_t sessionID, RequestType type)
     SDPMessageInfo sdp;
     if(type == SIP_INVITE)
     {
-      dialogs_.at(sessionID - 1)->localSdp_
+      dialogs_[sessionID]->localSdp_
           = sdp_.localSDPSuggestion(transport->getLocalAddress());
 
-      if(dialogs_.at(sessionID - 1)->localSdp_ != nullptr)
+      if(dialogs_[sessionID]->localSdp_ != nullptr)
       {
-        sdp = *dialogs_.at(sessionID - 1)->localSdp_.get();
+        sdp = *dialogs_[sessionID]->localSdp_.get();
       }
       else
       {
@@ -628,14 +648,14 @@ void SIPTransactions::sendDialogRequest(uint32_t sessionID, RequestType type)
     }
     else
     {
-      if(dialogs_.at(sessionID - 1)->localSdp_ == nullptr)
+      if(dialogs_[sessionID]->localSdp_ == nullptr)
       {
         qDebug() << "ERROR: Missing local final SDP when its supposed to be sent.";
         // TODO: send client error.
         return;
       }
 
-      sdp = *dialogs_.at(sessionID - 1)->localSdp_.get();
+      sdp = *dialogs_[sessionID]->localSdp_.get();
     }
     content.setValue(sdp);
   }
@@ -695,32 +715,31 @@ void SIPTransactions::sendResponse(uint32_t sessionID, ResponseType type, Reques
   // Get all the necessary information from different components.
   SIPResponse response;
   response.type = type;
-  dialogs_.at(sessionID - 1)->server->getResponseMessage(response.message, type);
+  dialogs_[sessionID]->server->getResponseMessage(response.message, type);
   response.message->transactionRequest = originalRequest;
 
   QVariant content;
   if(response.message->transactionRequest == SIP_INVITE && type == SIP_OK) // TODO: SDP in progress...
   {
     response.message->content.type = APPLICATION_SDP;
-    SDPMessageInfo sdp = *dialogs_.at(sessionID - 1)->localSdp_.get();
+    SDPMessageInfo sdp = *dialogs_[sessionID]->localSdp_.get();
     content.setValue(sdp);
   }
 
-  transports_.at(dialogs_.at(sessionID - 1)->transportID - 1)->sendResponse(response, content);
+  transports_.at(dialogs_[sessionID]->transportID - 1)->sendResponse(response, content);
   qDebug() << "---- Finished sending of a response ---";
 }
 
-void SIPTransactions::destroyDialog(uint32_t sessionID)
+void SIPTransactions::destroyDialog(std::shared_ptr<SIPDialogData> dialog)
 {
-  Q_ASSERT(sessionID != 0 && sessionID <= dialogs_.size());
-  if(sessionID == 0 || sessionID > dialogs_.size())
+  Q_ASSERT(dialog != nullptr);
+  if(dialog == nullptr)
   {
     qCritical() << "ERROR: Bad sessionID for destruction: ";
     return;
   }
-  qDebug() << "Destroying dialog:" << sessionID;
+  qDebug() << "Destroying dialog:";
 
-  std::shared_ptr<SIPDialogData> dialog = dialogs_.at(sessionID - 1);
   sdp_.endSession(dialog->localSdp_);
   dialog->state.reset();
   dialog->server.reset();
@@ -733,15 +752,4 @@ void SIPTransactions::destroyDialog(uint32_t sessionID)
 
   dialog->localSdp_.reset();
   dialog->remoteSdp_.reset();
-  dialogs_[sessionID - 1].reset();
-
-  // empty all deleted dialogs from end of the list.
-  // This does not guarantee that the list wont be filled, but should suffice in most cases.
-  while(sessionID == dialogs_.size()
-        && sessionID != 0
-        && dialogs_.at(sessionID - 1) == nullptr)
-  {
-    dialogs_.pop_back();
-    --sessionID;
-  }
 }
diff --git a/src/sip/siptransactions.h b/src/sip/siptransactions.h
index dccde64e..5b18bf2c 100644
--- a/src/sip/siptransactions.h
+++ b/src/sip/siptransactions.h
@@ -7,6 +7,9 @@
 
 #include "common.h"
 
+#include <QMap>
+
+
 /* This class manages the interactions between different components in
  * a SIP transaction. This class should implement as little functionality
  * as possible and only focus on interractions.
@@ -121,7 +124,7 @@ private slots:
   void createDialogFromINVITE(quint32 transportID,  std::shared_ptr<SIPMessageInfo> &invite,
                               std::shared_ptr<SIPDialogData>& dialog);
   void createBaseDialog(quint32 transportID, std::shared_ptr<SIPDialogData>& dialog);
-  void destroyDialog(uint32_t sessionID);
+  void destroyDialog(std::shared_ptr<SIPDialogData> dialog);
 
   bool areWeTheDestination();
 
@@ -155,8 +158,8 @@ private slots:
   // keep track of dialogs. The CallID is not used because we could be calling ourselves
   // and using uint32_t is simpler than keeping track of tags
 
-  // TODO: separate dialog forming from dialog
-  QList<std::shared_ptr<SIPDialogData>> dialogs_;
+  uint32_t nextSessionID_;
+  QMap<uint32_t, std::shared_ptr<SIPDialogData>> dialogs_;
   std::map<QString, SIPRegistrationData> registrations_;
   QList<std::shared_ptr<SIPTransport>> transports_;
 

From 8394ee3d39083a4e36a20d7e38b8414e5b2e12a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joni=20R=C3=A4s=C3=A4nen?= <joni.rasanen@tut.fi>
Date: Wed, 24 Apr 2019 15:21:34 +0300
Subject: [PATCH 08/24] [Settings] (improvement) Settings now use the same
 logic as custom/advanced settings so they close instead of cancel and save,
 but don't close with save.

---
 src/gui/advancedsettings.cpp |  2 --
 src/gui/settings.cpp         | 17 ++++++++++-------
 src/gui/settings.h           |  4 ++--
 ui/settings.ui               | 10 +++++-----
 4 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/src/gui/advancedsettings.cpp b/src/gui/advancedsettings.cpp
index 56f6f4cd..696a6689 100644
--- a/src/gui/advancedsettings.cpp
+++ b/src/gui/advancedsettings.cpp
@@ -67,8 +67,6 @@ void AdvancedSettings::on_advanced_ok_clicked()
   qDebug() << "Settings," << metaObject()->className() << ": Saving advanced settings";
   saveAdvancedSettings();
   emit advancedSettingsChanged();
-  //emit hidden();
-  //hide();
 }
 
 
diff --git a/src/gui/settings.cpp b/src/gui/settings.cpp
index d1978fd4..1f6fa2a1 100644
--- a/src/gui/settings.cpp
+++ b/src/gui/settings.cpp
@@ -23,8 +23,8 @@ Settings::Settings(QWidget *parent) :
   custom_.init(getVideoDeviceID());
   advanced_.init();
 
-  QObject::connect(basicUI_->ok, &QPushButton::clicked, this, &Settings::on_ok_clicked);
-  QObject::connect(basicUI_->cancel, &QPushButton::clicked, this, &Settings::on_cancel_clicked);
+  //QObject::connect(basicUI_->save, &QPushButton::clicked, this, &Settings::on_ok_clicked);
+  //QObject::connect(basicUI_->close, &QPushButton::clicked, this, &Settings::on_cancel_clicked);
 
   QObject::connect(&custom_, &CustomSettings::customSettingsChanged, this, &Settings::settingsChanged);
   QObject::connect(&custom_, &CustomSettings::hidden, this, &Settings::show);
@@ -44,16 +44,15 @@ void Settings::show()
   QWidget::show();
 }
 
-void Settings::on_ok_clicked()
+void Settings::on_save_clicked()
 {
   qDebug() << "Settings," << metaObject()->className() << ": Saving basic settings";
   // The UI values are saved to settings.
   saveSettings();
   emit settingsChanged(); // TODO: check have the settings actually been changed
-  hide();
 }
 
-void Settings::on_cancel_clicked()
+void Settings::on_close_clicked()
 {
   qDebug() << "Settings," << metaObject()->className()
            << ": Cancel clicked. Getting settings from system";
@@ -65,14 +64,18 @@ void Settings::on_cancel_clicked()
 
 void Settings::on_advanced_settings_button_clicked()
 {
-  on_ok_clicked(); // treat this the same as ok
+  //on_ok_clicked(); // treat this the same as ok
+  saveSettings();
+  hide();
   advanced_.show();
 }
 
 
 void Settings::on_custom_settings_button_clicked()
 {
-  on_ok_clicked(); // treat this the same as ok
+  //on_ok_clicked(); // treat this the same as ok
+  saveSettings();
+  hide();
   custom_.show();
 }
 
diff --git a/src/gui/settings.h b/src/gui/settings.h
index 4aa82bcf..1d73a1ae 100644
--- a/src/gui/settings.h
+++ b/src/gui/settings.h
@@ -46,8 +46,8 @@ public slots:
   virtual void show();
 
   // button slots, called automatically by Qt
-  void on_ok_clicked();
-  void on_cancel_clicked();
+  void on_save_clicked();
+  void on_close_clicked();
   void on_advanced_settings_button_clicked();
   void on_custom_settings_button_clicked();
 
diff --git a/ui/settings.ui b/ui/settings.ui
index f350df25..604ddddd 100644
--- a/ui/settings.ui
+++ b/ui/settings.ui
@@ -15,9 +15,9 @@
   </property>
   <layout class="QGridLayout" name="gridLayout">
    <item row="2" column="2">
-    <widget class="QPushButton" name="cancel">
+    <widget class="QPushButton" name="close">
      <property name="text">
-      <string>Cancel</string>
+      <string>Close</string>
      </property>
     </widget>
    </item>
@@ -35,7 +35,7 @@
     </spacer>
    </item>
    <item row="2" column="1">
-    <widget class="QPushButton" name="ok">
+    <widget class="QPushButton" name="save">
      <property name="text">
       <string>Save</string>
      </property>
@@ -224,8 +224,8 @@
   </layout>
  </widget>
  <tabstops>
-  <tabstop>ok</tabstop>
-  <tabstop>cancel</tabstop>
+  <tabstop>save</tabstop>
+  <tabstop>close</tabstop>
   <tabstop>SettingTabs</tabstop>
  </tabstops>
  <resources/>

From e750fc45e6f491c8879577385d95b8fa02ab7687 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joni=20R=C3=A4s=C3=A4nen?= <joni.rasanen@tut.fi>
Date: Wed, 24 Apr 2019 16:13:54 +0300
Subject: [PATCH 09/24] [Media](in_progress) Further separated camera
 initialization in hopes that rest could be run separate thread to reduce
 startup time.

---
 src/video/camerafilter.cpp | 24 +++++++++++++++++++-----
 src/video/camerafilter.h   |  2 ++
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/src/video/camerafilter.cpp b/src/video/camerafilter.cpp
index 4497de71..0ef355c0 100644
--- a/src/video/camerafilter.cpp
+++ b/src/video/camerafilter.cpp
@@ -14,19 +14,26 @@
 CameraFilter::CameraFilter(QString id, StatisticsInterface *stats):
   Filter(id, "Camera", stats, NONE, RGB32VIDEO),
   camera_(nullptr),
-  cameraFrameGrabber_(),
+  cameraFrameGrabber_(nullptr),
   framerate_(0)
 {}
 
 
 CameraFilter::~CameraFilter()
 {
-  delete camera_;
-  delete cameraFrameGrabber_;
+  if (camera_ != nullptr)
+  {
+    delete camera_;
+  }
+  if(cameraFrameGrabber_ != nullptr)
+  {
+    delete cameraFrameGrabber_;
+  }
 }
 
 bool CameraFilter::init()
 {
+  initialCameraSetup();
   cameraSetup();
   return Filter::init();
 }
@@ -37,8 +44,7 @@ void CameraFilter::run()
   Filter::run();
 }
 
-
-bool CameraFilter::cameraSetup()
+bool CameraFilter::initialCameraSetup()
 {
   QList<QCameraInfo> cameras = QCameraInfo::availableCameras();
 
@@ -77,6 +83,14 @@ bool CameraFilter::cameraSetup()
 
 #ifndef __linux__
   camera_->load();
+#endif
+}
+
+
+bool CameraFilter::cameraSetup()
+{
+  QSettings settings("kvazzup.ini", QSettings::IniFormat);
+#ifndef __linux__
   while(camera_->state() != QCamera::LoadedState)
   {
     qSleep(5);
diff --git a/src/video/camerafilter.h b/src/video/camerafilter.h
index 2876b7a9..8a39ebfb 100644
--- a/src/video/camerafilter.h
+++ b/src/video/camerafilter.h
@@ -36,6 +36,8 @@ private slots:
 
 private:
 
+  bool initialCameraSetup();
+
   // setup camera device. For some reason this has to be called from main thread
   bool cameraSetup();
 

From a0d9e4c10226ca9b778023e68f82d0388776d061 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joni=20R=C3=A4s=C3=A4nen?= <joni.rasanen@tut.fi>
Date: Thu, 25 Apr 2019 16:04:15 +0300
Subject: [PATCH 10/24] [Media] (improvement) Removed Linux specific stuff from
 kvazaar filter, because it was a hack to prevent a fps bug from manifesting
 on linux.

---
 src/video/kvazaarfilter.cpp | 26 ++++++++++----------------
 1 file changed, 10 insertions(+), 16 deletions(-)

diff --git a/src/video/kvazaarfilter.cpp b/src/video/kvazaarfilter.cpp
index 5fd89fec..5498ca1a 100644
--- a/src/video/kvazaarfilter.cpp
+++ b/src/video/kvazaarfilter.cpp
@@ -66,15 +66,7 @@ bool KvazaarFilter::init()
 
   api_->config_init(config_);
 
-#ifdef __linux__
-  api_->config_parse(config_, "preset", "ultrafast");
-
-  config_->width = 640;
-  config_->height = 480;
-  config_->framerate_num = 30;
-#else
   api_->config_parse(config_, "preset", settings.value("video/Preset").toString().toUtf8());
-
   config_->width = settings.value("video/ResolutionWidth").toInt();
   config_->height = settings.value("video/ResolutionHeight").toInt();
   config_->threads = settings.value("video/kvzThreads").toInt();
@@ -85,7 +77,6 @@ bool KvazaarFilter::init()
   config_->framerate_num = settings.value("video/Framerate").toInt();
   config_->framerate_denom = framerate_denom_;
   config_->hash = KVZ_HASH_NONE;
-#endif
 
   //config_->fme_level = 0;
 
@@ -191,9 +182,11 @@ void KvazaarFilter::customParameters(QSettings& settings)
     settings.setArrayIndex(i);
     QString name = settings.value("Name").toString();
     QString value = settings.value("Value").toString();
-    if (api_->config_parse(config_, name.toStdString().c_str(), value.toStdString().c_str()) != 1)
+    if (api_->config_parse(config_, name.toStdString().c_str(),
+                           value.toStdString().c_str()) != 1)
     {
-      qDebug() << "Initialization," << metaObject()->className() << ": Invalid custom parameter for kvazaar";
+      qDebug() << "Initialization," << metaObject()->className()
+               << ": Invalid custom parameter for kvazaar";
     }
   }
   settings.endArray();
@@ -252,7 +245,8 @@ void KvazaarFilter::feedInput(std::unique_ptr<Data> input)
   }
 }
 
-void KvazaarFilter::parseEncodedFrame(kvz_data_chunk *data_out, uint32_t len_out, kvz_picture *recon_pic)
+void KvazaarFilter::parseEncodedFrame(kvz_data_chunk *data_out,
+                                      uint32_t len_out, kvz_picture *recon_pic)
 {
   std::unique_ptr<Data> encodedFrame = std::move(encodingFrames_.back());
   encodingFrames_.pop_back();
@@ -268,8 +262,8 @@ void KvazaarFilter::parseEncodedFrame(kvz_data_chunk *data_out, uint32_t len_out
 
   for (kvz_data_chunk *chunk = data_out; chunk != nullptr; chunk = chunk->next)
   {
-    if(chunk->len > 3 &&
-       chunk->data[0] == 0 && chunk->data[1] == 0  &&( chunk->data[2] == 1 || (chunk->data[2] == 0 && chunk->data[3] == 1 ))
+    if(chunk->len > 3 && chunk->data[0] == 0 && chunk->data[1] == 0
+       &&( chunk->data[2] == 1 || (chunk->data[2] == 0 && chunk->data[3] == 1 ))
        && dataWritten != 0 && config_->slices != KVZ_SLICES_NONE)
     {
       // send previous packet if this is not the first
@@ -295,8 +289,8 @@ void KvazaarFilter::parseEncodedFrame(kvz_data_chunk *data_out, uint32_t len_out
   sendEncodedFrame(std::move(encodedFrame), std::move(hevc_frame), dataWritten);
 }
 
-void KvazaarFilter::sendEncodedFrame(std::unique_ptr<Data> input, std::unique_ptr<uchar[]> hevc_frame,
-                                     uint32_t dataWritten)
+void KvazaarFilter::sendEncodedFrame(std::unique_ptr<Data> input,
+                                     std::unique_ptr<uchar[]> hevc_frame, uint32_t dataWritten)
 {
   input->type = HEVCVIDEO;
   input->data_size = dataWritten;

From 744e5643c4a0f5a58540440d901cf17b7bca6adf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joni=20R=C3=A4s=C3=A4nen?= <joni.rasanen@tut.fi>
Date: Thu, 25 Apr 2019 16:06:50 +0300
Subject: [PATCH 11/24] [Settings] (Improvement) Removed the possibility to for
 the user to select pixel formats in settings that are unsupported in Kvazzup.

---
 src/video/camerafilter.cpp | 39 +++++++++++++----------
 src/video/camerainfo.cpp   | 65 +++++++++++++++++++++++---------------
 2 files changed, 63 insertions(+), 41 deletions(-)

diff --git a/src/video/camerafilter.cpp b/src/video/camerafilter.cpp
index 0ef355c0..58eeb3fa 100644
--- a/src/video/camerafilter.cpp
+++ b/src/video/camerafilter.cpp
@@ -105,35 +105,42 @@ bool CameraFilter::cameraSetup()
   QCameraViewfinderSettings viewSettings = camera_->viewfinderSettings();
   printSupportedFormats();
 
-  // TODO: this should be a temprary hack until dshow is replaced by qcamera
-  if(settings.value("video/InputFormat").toString() == "MJPG")
+  // TODO: this should be a temporary hack until dshow is replaced by qcamera
+  QString inputFormat = settings.value("video/InputFormat").toString();
+
+#ifndef __linux__
+  if(inputFormat == "MJPG")
   {
     viewSettings.setPixelFormat(QVideoFrame::Format_Jpeg);
     output_ = RGB32VIDEO;
   }
-  else if(settings.value("video/InputFormat").toString() == "YUY2")
+#else
+  if(inputFormat == "MJPG")
   {
-    viewSettings.setPixelFormat(QVideoFrame::Format_YUYV);
+    viewSettings.setPixelFormat(QVideoFrame::Format_RGB32);
     output_ = RGB32VIDEO;
   }
-  else if(settings.value("video/InputFormat").toString() == "NV12")
+#endif
+  else if(inputFormat == "RGB32")
   {
-    viewSettings.setPixelFormat(QVideoFrame::Format_NV12);
+    viewSettings.setPixelFormat(QVideoFrame::Format_RGB32);
     output_ = RGB32VIDEO;
   }
-  else if(settings.value("video/InputFormat").toString() == "I420")
+  else if(inputFormat == "YUV420P")
   {
     viewSettings.setPixelFormat(QVideoFrame::Format_YUV420P);
-    output_ = RGB32VIDEO;
+    output_ = YUVVIDEO;
   }
-  else if(settings.value("video/InputFormat").toString() == "YV12")
+  else
   {
-    viewSettings.setPixelFormat(QVideoFrame::Format_YV12);
-    output_ = RGB32VIDEO;
+    qDebug() << "Input format is not supported";
+    viewSettings.setPixelFormat(QVideoFrame::Format_Invalid);
+    output_ = NONE;
+    return false;
   }
-
   //printSupportedResolutions(viewSettings);
 
+#ifndef __linux__
   QList<QSize> resolutions = camera_->supportedViewfinderResolutions(viewSettings);
 
   int resolutionID = settings.value("video/ResolutionID").toInt();
@@ -146,6 +153,9 @@ bool CameraFilter::cameraSetup()
   else {
     viewSettings.setResolution(QSize(0,0));
   }
+#else
+  viewSettings.setResolution(QSize(640, 480));
+#endif
 
   QList<QCamera::FrameRateRange> framerates = camera_->supportedViewfinderFrameRateRanges(viewSettings);
 
@@ -164,14 +174,11 @@ bool CameraFilter::cameraSetup()
       viewSettings.setMinimumFrameRate(framerates.back().minimumFrameRate);
     }
   }
-
 #else
   viewSettings.setMaximumFrameRate(30);
   viewSettings.setMinimumFrameRate(30);
-  viewSettings.setResolution(QSize(640, 480));
-  viewSettings.setPixelFormat(QVideoFrame::Format_BGRA32);
-  output_ = RGB32VIDEO;
 #endif
+
   qDebug() << "Iniating, CameraFilter : Using following QCamera settings:";
   qDebug() << "Iniating, CameraFilter :---------------------------------------";
   qDebug() << "Iniating, CameraFilter : Format:" << viewSettings.pixelFormat();
diff --git a/src/video/camerainfo.cpp b/src/video/camerainfo.cpp
index 3d3895e7..0bea8fbc 100644
--- a/src/video/camerainfo.cpp
+++ b/src/video/camerainfo.cpp
@@ -39,11 +39,12 @@ const std::map<QVideoFrame::PixelFormat, QString> pixelFormatStrings = {{QVideoF
                                                          {QVideoFrame::Format_AdobeDng, "AdobeDng"},
                                                          {QVideoFrame::Format_User, "User Defined"}};
 
+const QList<QVideoFrame::PixelFormat> kvazzupFormats = {{QVideoFrame::Format_RGB32},
+                                                        {QVideoFrame::Format_YUV420P},
+                                                        {QVideoFrame::Format_Jpeg}};;
 
 CameraInfo::CameraInfo()
-{
-  //dshow_initCapture();
-}
+{}
 
 
 QStringList CameraInfo::getVideoDevices()
@@ -69,11 +70,18 @@ void CameraInfo::getVideoFormats(int deviceID, QStringList& formats)
   if (camera != nullptr)
   {
     QList<QVideoFrame::PixelFormat> p_formats = camera->supportedViewfinderPixelFormats();
+    camera->unload();
     qDebug() << "Settings, CameraInfo : Found" << p_formats.size() <<  "formats for deviceID:" << deviceID;
 
     for(int i = 0; i < p_formats.size() ; ++i)
     {
-      formats.push_back(pixelFormatStrings.at(p_formats.at(i)));
+      for (int j = 0; j < kvazzupFormats.size(); ++j)
+      {
+        if (p_formats.at(i) == kvazzupFormats.at(j))
+        {
+          formats.push_back(pixelFormatStrings.at(p_formats.at(i)));
+        }
+      }
     }
   }
 }
@@ -90,13 +98,15 @@ void CameraInfo::getFormatResolutions(int deviceID, QString format, QStringList
 
   if (camera != nullptr)
   {
-    QList<QSize> supporteResolutions = camera->supportedViewfinderResolutions(viewSettings);
-    qDebug() << "Settings, CameraInfo : Found" << supporteResolutions.size() <<  "resolutions for deviceID:" << deviceID;
+    QList<QSize> supportedResolutions = camera->supportedViewfinderResolutions(viewSettings);
+    camera->unload();
+    qDebug() << "Settings, CameraInfo : Found" << supportedResolutions.size()
+             <<  "resolutions for deviceID:" << deviceID;
 
-    for (int i = 0; i < supporteResolutions.size(); ++i)
+    for (int i = 0; i < supportedResolutions.size(); ++i)
     {
-      resolutions.push_back(QString::number(supporteResolutions[i].width()) + "x" +
-                            QString::number(supporteResolutions[i].height()));
+      resolutions.push_back(QString::number(supportedResolutions[i].width()) + "x" +
+                            QString::number(supportedResolutions[i].height()));
     }
   }
 }
@@ -104,27 +114,31 @@ void CameraInfo::getFormatResolutions(int deviceID, QString format, QStringList
 
 void CameraInfo::getFramerates(int deviceID, QString format, int resolutionID, QStringList &ranges)
 {
-   std::unique_ptr<QCamera> camera = loadCamera(deviceID);
+  std::unique_ptr<QCamera> camera = loadCamera(deviceID);
 
-  QCameraViewfinderSettings viewSettings;
-  viewSettings.setPixelFormat(stringToPixelFormat(format));
-  QList<QSize> resolutions  = camera->supportedViewfinderResolutions(viewSettings);
-  if(resolutionID < resolutions.size())
+  if (camera != nullptr)
   {
-    viewSettings.setResolution(resolutions.at(resolutionID));
-  }
+    QCameraViewfinderSettings viewSettings;
+    viewSettings.setPixelFormat(stringToPixelFormat(format));
+    QList<QSize> resolutions  = camera->supportedViewfinderResolutions(viewSettings);
+    if(resolutionID < resolutions.size())
+    {
+      viewSettings.setResolution(resolutions.at(resolutionID));
+    }
 
-  QList<QCamera::FrameRateRange> framerates = camera->supportedViewfinderFrameRateRanges(viewSettings);
+    QList<QCamera::FrameRateRange> framerates = camera->supportedViewfinderFrameRateRanges(viewSettings);
+    camera->unload();
 
-  for(int i = 0; i < framerates.size(); ++i)
-  {
-    if(framerates.at(i).minimumFrameRate == framerates.at(i).maximumFrameRate)
+    for(int i = 0; i < framerates.size(); ++i)
     {
-      ranges.push_back(QString::number(framerates.at(i).maximumFrameRate));
-    }
-    else {
-      ranges.push_back(QString::number(framerates.at(i).minimumFrameRate)
-                       + " to " + QString::number(framerates.at(i).maximumFrameRate));
+      if(framerates.at(i).minimumFrameRate == framerates.at(i).maximumFrameRate)
+      {
+        ranges.push_back(QString::number(framerates.at(i).maximumFrameRate));
+      }
+      else {
+        ranges.push_back(QString::number(framerates.at(i).minimumFrameRate)
+                         + " to " + QString::number(framerates.at(i).maximumFrameRate));
+      }
     }
   }
 }
@@ -175,6 +189,7 @@ QSize CameraInfo::getResolution(int deviceID, int formatID, int resolutionID)
     QCameraViewfinderSettings viewSettings;
     viewSettings.setPixelFormat(stringToPixelFormat(format));
     QList<QSize> supporteResolutions = camera->supportedViewfinderResolutions(viewSettings);
+    camera->unload();
 
     if(supporteResolutions.size() > resolutionID)
     {

From 929e2eaab306af2133eae0348fcbc62a898e20cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joni=20R=C3=A4s=C3=A4nen?= <joni.rasanen@tut.fi>
Date: Thu, 25 Apr 2019 16:09:34 +0300
Subject: [PATCH 12/24] [Media] (cosmetic) Renamed YUVVIDEO to YUV420VIDEO
 because we may someday support other YUV formats besides YUV420P.

---
 src/filter.h                 | 2 +-
 src/filtergraph.cpp          | 4 ++--
 src/video/camerafilter.cpp   | 2 +-
 src/video/displayfilter.cpp  | 4 ++--
 src/video/kvazaarfilter.cpp  | 2 +-
 src/video/openhevcfilter.cpp | 4 ++--
 src/video/rgb32toyuv.cpp     | 4 ++--
 src/video/yuvtorgb32.cpp     | 2 +-
 8 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/filter.h b/src/filter.h
index a07a7c81..c73c13fd 100644
--- a/src/filter.h
+++ b/src/filter.h
@@ -21,7 +21,7 @@
 // called filter graph. A class inherited from filter can do any sort of processing to the data it
 // receives. The filter sleeps when it does not have any input to process.
 
-enum DataType {NONE = 0, RGB32VIDEO, YUVVIDEO, RAWAUDIO, HEVCVIDEO, OPUSAUDIO};
+enum DataType {NONE = 0, RGB32VIDEO, YUV420VIDEO, RAWAUDIO, HEVCVIDEO, OPUSAUDIO};
 enum DataSource {UNKNOWN, LOCAL, REMOTE};
 
 // NOTE: remember to make changes to deepcopy, camera, audiocapture and RTPSinkFilter
diff --git a/src/filtergraph.cpp b/src/filtergraph.cpp
index 82d8d2c1..442f2b65 100644
--- a/src/filtergraph.cpp
+++ b/src/filtergraph.cpp
@@ -184,13 +184,13 @@ bool FilterGraph::addToGraph(std::shared_ptr<Filter> filter,
       // TODO: Check the out connections of connected filter for an already existing conversion.
 
       if(graph.at(connectIndex)->outputType() == RGB32VIDEO &&
-         filter->inputType() == YUVVIDEO)
+         filter->inputType() == YUV420VIDEO)
       {
         qDebug() << "FilterGraph : Found RGB32 to YUV conversion needed";
         addToGraph(std::shared_ptr<Filter>(new RGB32toYUV("", stats_, conversionIndex_)), graph, connectIndex);
         ++conversionIndex_;
       }
-      else if(graph.at(connectIndex)->outputType() == YUVVIDEO &&
+      else if(graph.at(connectIndex)->outputType() == YUV420VIDEO &&
               filter->inputType() == RGB32VIDEO)
       {
         qDebug() << "FilterGraph : Found RGB32 to YUV conversion needed";
diff --git a/src/video/camerafilter.cpp b/src/video/camerafilter.cpp
index 58eeb3fa..f6f4c367 100644
--- a/src/video/camerafilter.cpp
+++ b/src/video/camerafilter.cpp
@@ -129,7 +129,7 @@ bool CameraFilter::cameraSetup()
   else if(inputFormat == "YUV420P")
   {
     viewSettings.setPixelFormat(QVideoFrame::Format_YUV420P);
-    output_ = YUVVIDEO;
+    output_ = YUV420VIDEO;
   }
   else
   {
diff --git a/src/video/displayfilter.cpp b/src/video/displayfilter.cpp
index b92ddd60..400415b9 100644
--- a/src/video/displayfilter.cpp
+++ b/src/video/displayfilter.cpp
@@ -22,7 +22,7 @@ DisplayFilter::DisplayFilter(QString id, StatisticsInterface *stats,
   }
   else if(widget->supportedFormat() == VIDEO_YUV420)
   {
-    input_ = YUVVIDEO;
+    input_ = YUV420VIDEO;
   }
   widget_->setStats(stats);
   updateSettings();
@@ -62,7 +62,7 @@ void DisplayFilter::process()
     case RGB32VIDEO:
       format = QImage::Format_RGB32;
       break;
-    case YUVVIDEO:
+    case YUV420VIDEO:
       format = QImage::Format_Invalid;
       break;
     default:
diff --git a/src/video/kvazaarfilter.cpp b/src/video/kvazaarfilter.cpp
index 5498ca1a..04a9df65 100644
--- a/src/video/kvazaarfilter.cpp
+++ b/src/video/kvazaarfilter.cpp
@@ -12,7 +12,7 @@
 enum RETURN_STATUS {C_SUCCESS = 0, C_FAILURE = -1};
 
 KvazaarFilter::KvazaarFilter(QString id, StatisticsInterface *stats):
-  Filter(id, "Kvazaar", stats, YUVVIDEO, HEVCVIDEO),
+  Filter(id, "Kvazaar", stats, YUV420VIDEO, HEVCVIDEO),
   api_(nullptr),
   config_(nullptr),
   enc_(nullptr),
diff --git a/src/video/openhevcfilter.cpp b/src/video/openhevcfilter.cpp
index d6315c57..ae3760a3 100644
--- a/src/video/openhevcfilter.cpp
+++ b/src/video/openhevcfilter.cpp
@@ -4,7 +4,7 @@
 #include <QSettings>
 
 OpenHEVCFilter::OpenHEVCFilter(QString id, StatisticsInterface *stats):
-  Filter(id, "OpenHEVC", stats, HEVCVIDEO, YUVVIDEO),
+  Filter(id, "OpenHEVC", stats, HEVCVIDEO, YUV420VIDEO),
   handle_(),
   parameterSets_(false),
   waitFrames_(0),
@@ -174,7 +174,7 @@ void OpenHEVCFilter::process()
 
           // TODO: put delay into deque, and set timestamp accordingly to get more accurate latency.
 
-          frame->type = YUVVIDEO;
+          frame->type = YUV420VIDEO;
           frame->data_size = finalDataSize;
           frame->data = std::move(yuv_frame);
 
diff --git a/src/video/rgb32toyuv.cpp b/src/video/rgb32toyuv.cpp
index dd88ed21..2d3ad214 100644
--- a/src/video/rgb32toyuv.cpp
+++ b/src/video/rgb32toyuv.cpp
@@ -5,7 +5,7 @@
 #include <QtDebug>
 
 RGB32toYUV::RGB32toYUV(QString id, StatisticsInterface *stats, uint32_t peer) :
-  Filter(id, "RGB32toYUV_" + QString::number(peer), stats, RGB32VIDEO, YUVVIDEO),
+  Filter(id, "RGB32toYUV_" + QString::number(peer), stats, RGB32VIDEO, YUV420VIDEO),
   sse_(true)
 {}
 
@@ -56,7 +56,7 @@ void RGB32toYUV::process()
       }
     }
 
-    input->type = YUVVIDEO;
+    input->type = YUV420VIDEO;
     input->data = std::move(yuv_data);
     input->data_size = finalDataSize;
     sendOutput(std::move(input));
diff --git a/src/video/yuvtorgb32.cpp b/src/video/yuvtorgb32.cpp
index cc9f326e..7d6e8a87 100644
--- a/src/video/yuvtorgb32.cpp
+++ b/src/video/yuvtorgb32.cpp
@@ -17,7 +17,7 @@ uint8_t clamp(int32_t input)
 }
 
 YUVtoRGB32::YUVtoRGB32(QString id, StatisticsInterface *stats, uint32_t peer) :
-  Filter(id, "YUVtoRGB32_" + QString::number(peer), stats, YUVVIDEO, RGB32VIDEO),
+  Filter(id, "YUVtoRGB32_" + QString::number(peer), stats, YUV420VIDEO, RGB32VIDEO),
   sse_(true),
   avx2_(true),
   threadCount_(0)

From 88b75268bc03689df0a668cde2dc0b7e7e6c6019 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joni=20R=C3=A4s=C3=A4nen?= <joni.rasanen@tut.fi>
Date: Thu, 2 May 2019 15:48:06 +0300
Subject: [PATCH 13/24] [Media] (improvement) Add variable for not restarting
 the self view when ending the call. Its not actually set in any meaningful
 place. In the future the media manager could have a state where it would tell
 filtergraph not to restart the self view needlessly.

---
 src/filtergraph.cpp | 10 ++++++++--
 src/filtergraph.h   |  5 ++---
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/filtergraph.cpp b/src/filtergraph.cpp
index 442f2b65..cda76f0a 100644
--- a/src/filtergraph.cpp
+++ b/src/filtergraph.cpp
@@ -28,7 +28,8 @@ FilterGraph::FilterGraph():
   selfView_(nullptr),
   stats_(nullptr),
   conversionIndex_(0),
-  format_()
+  format_(),
+  quitting_(false)
 {
   // TODO negotiate these values with all included filters and SDP
   // TODO move these to settings and manage them automatically
@@ -387,6 +388,7 @@ void FilterGraph::receiveAudioFrom(uint32_t sessionID, std::shared_ptr<Filter> a
 
 void FilterGraph::uninit()
 {
+  quitting_ = true;
   removeAllParticipants();
 
   destroyFilters(videoSend_);
@@ -561,7 +563,11 @@ void FilterGraph::removeParticipant(uint32_t sessionID)
   if(!peerPresent)
   {
     destroyFilters(videoSend_);
-    initSelfView(selfView_); // restore the self view.
+    if (!quitting_)
+    {
+      initSelfView(selfView_); // restore the self view.
+    }
+
     destroyFilters(audioSend_);
   }
 }
diff --git a/src/filtergraph.h b/src/filtergraph.h
index 09d79218..f92803f3 100644
--- a/src/filtergraph.h
+++ b/src/filtergraph.h
@@ -79,9 +79,6 @@ class FilterGraph
 
   void destroyFilters(std::vector<std::shared_ptr<Filter>>& filters);
 
-  unsigned int camera_;
-  unsigned int kvazaar_;
-  unsigned int opusEncoder_;
 
   // id is also the index of the Peer in this vector
   std::vector<Peer*> peers_;
@@ -99,4 +96,6 @@ class FilterGraph
   QAudioFormat format_;
 
   QString videoFormat_;
+
+  bool quitting_;
 };

From 5f814eb7ff384f5f4dd59c8f455833f217f9f447 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joni=20R=C3=A4s=C3=A4nen?= <joni.rasanen@tut.fi>
Date: Thu, 2 May 2019 15:55:24 +0300
Subject: [PATCH 14/24] [Media] (fix) Fixed a bug when the filter is started
 and stopped immediately, but doesn't stop because the variable is set too
 late. Renamed sleep to waitForInput which describes the meaning better.

---
 src/filter.cpp | 3 +--
 src/filter.h   | 3 ++-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/filter.cpp b/src/filter.cpp
index b5d9974c..90ba9db0 100644
--- a/src/filter.cpp
+++ b/src/filter.cpp
@@ -217,10 +217,9 @@ void Filter::run()
   stats_->addFilter(name_, (uint64_t)currentThreadId());
   //qDebug() << "Iniating," << metaObject()->className()
     //<< Running filter" << name_ << "with max buffer:" << maxBufferSize_;
-  running_ = true;
   while(running_)
   {
-    sleep();
+    waitForInput();
     if(!running_) break;
 
     process();
diff --git a/src/filter.h b/src/filter.h
index c73c13fd..35788469 100644
--- a/src/filter.h
+++ b/src/filter.h
@@ -86,6 +86,7 @@ class Filter : public QThread
 
   virtual void start()
   {
+    running_ = true;
     QThread::start();
   }
 
@@ -122,7 +123,7 @@ class Filter : public QThread
     waitMutex_->unlock();
   }
 
-  void sleep()
+  void waitForInput()
   {
     waitMutex_->lock();
     hasInput_.wait(waitMutex_);

From bb3bd60018251d2b8d69f74587f07550c34c2405 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joni=20R=C3=A4s=C3=A4nen?= <joni.rasanen@tut.fi>
Date: Fri, 3 May 2019 16:30:01 +0300
Subject: [PATCH 15/24] [Settings] (feature) Getting available framerates and
 setting the highest one when changing resolution or when starting the
 program.

---
 src/gui/customsettings.cpp | 15 ++++++++++-----
 src/gui/customsettings.h   |  2 +-
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/gui/customsettings.cpp b/src/gui/customsettings.cpp
index 107df65c..a6e2078c 100644
--- a/src/gui/customsettings.cpp
+++ b/src/gui/customsettings.cpp
@@ -337,7 +337,8 @@ void CustomSettings::initializeFormat()
 
 void CustomSettings::initializeResolutions(QString format)
 {
-  qDebug() << "Settings," << metaObject()->className() << ": Initializing resolutions for format:" << format;
+  qDebug() << "Settings," << metaObject()->className()
+           << ": Initializing resolutions for format:" << format;
   customUI_->resolution->clear();
   QStringList resolutions;
 
@@ -354,18 +355,20 @@ void CustomSettings::initializeResolutions(QString format)
   if(customUI_->resolution->count() > 0)
   {
     customUI_->resolution->setCurrentIndex(0);
-    initializeFramerates(format, 0);
+    initializeFramerates(customUI_->resolution->currentText());
   }
 }
 
 
-void CustomSettings::initializeFramerates(QString format, int resolutionID)
+void CustomSettings::initializeFramerates(QString resolution)
 {
-  qDebug() << "Settings,"  << metaObject()->className() << ": Initializing resolutions for format:" << format;
+  qDebug() << "Settings,"  << metaObject()->className() << ": Initializing framerates for resolution:"
+           << resolution;
   customUI_->framerate_box->clear();
   QStringList rates;
 
-  cam_->getFramerates(currentDevice_, format, resolutionID, rates);
+  cam_->getFramerates(currentDevice_, customUI_->format_box->currentText(),
+                      customUI_->resolution->currentIndex(), rates);
 
   if(!rates.empty())
   {
@@ -373,6 +376,8 @@ void CustomSettings::initializeFramerates(QString format, int resolutionID)
     {
       customUI_->framerate_box->addItem(rates.at(i));
     }
+    // use the highest framerate values as default selection.
+    customUI_->framerate_box->setCurrentIndex(customUI_->framerate_box->count() - 1);
   }
 }
 
diff --git a/src/gui/customsettings.h b/src/gui/customsettings.h
index ed9612f0..aae36708 100644
--- a/src/gui/customsettings.h
+++ b/src/gui/customsettings.h
@@ -48,7 +48,7 @@ public slots:
   void on_add_parameter_clicked();
 
   void initializeResolutions(QString format);
-  void initializeFramerates(QString format, int resolutionID);
+  void initializeFramerates(QString resolution);
 
 private:
   // QSettings -> GUI

From 9babe2587f3d9736c77c3474eaba2882f353a3d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joni=20R=C3=A4s=C3=A4nen?= <joni.rasanen@tut.fi>
Date: Fri, 3 May 2019 16:47:08 +0300
Subject: [PATCH 16/24] [Settings] (feature) Moved settings initialization a
 bit later so the GUI is initialized first.

---
 src/gui/callwindow.cpp |  7 +++++--
 src/gui/settings.cpp   | 13 ++++++++-----
 src/gui/settings.h     |  2 ++
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/gui/callwindow.cpp b/src/gui/callwindow.cpp
index 727a0850..b4b2c5b3 100644
--- a/src/gui/callwindow.cpp
+++ b/src/gui/callwindow.cpp
@@ -21,7 +21,9 @@ CallWindow::CallWindow(QWidget *parent):
   conference_(this),
   partInt_(nullptr),
   timer_(new QTimer(this))
-{}
+{
+  ui_->setupUi(this);
+}
 
 CallWindow::~CallWindow()
 {
@@ -39,7 +41,6 @@ void CallWindow::init(ParticipantInterface *partInt)
 { 
   partInt_ = partInt;
 
-  ui_->setupUi(this);
   ui_->Add_contact_widget->setVisible(false);
 
   viewFactory_->setSelfview(ui_->SelfView, ui_->SelfView);
@@ -93,6 +94,8 @@ void CallWindow::init(ParticipantInterface *partInt)
   ui_->contactListContainer->layout()->setAlignment(ui_->addContact, Qt::AlignHCenter);
 
   ui_->EndCallButton->hide();
+
+  settingsView_.init();
 }
 
 void CallWindow::initButton(QString iconPath, QSize size, QSize iconSize, QPushButton* button)
diff --git a/src/gui/settings.cpp b/src/gui/settings.cpp
index 1f6fa2a1..6f43b99c 100644
--- a/src/gui/settings.cpp
+++ b/src/gui/settings.cpp
@@ -14,6 +14,14 @@ Settings::Settings(QWidget *parent) :
   advanced_(this),
   custom_(this, cam_),
   settings_("kvazzup.ini", QSettings::IniFormat)
+{}
+
+Settings::~Settings()
+{
+  // I believe the UI:s are destroyed when parents are destroyed
+}
+
+void Settings::init()
 {
   basicUI_->setupUi(this);
 
@@ -33,11 +41,6 @@ Settings::Settings(QWidget *parent) :
   QObject::connect(&advanced_, &AdvancedSettings::hidden, this, &Settings::show);
 }
 
-Settings::~Settings()
-{
-  // I believe the UI:s are destroyed when parents are destroyed
-}
-
 void Settings::show()
 {
   initializeUIDeviceList(); // initialize everytime in case they have changed
diff --git a/src/gui/settings.h b/src/gui/settings.h
index 1d73a1ae..47c04b47 100644
--- a/src/gui/settings.h
+++ b/src/gui/settings.h
@@ -36,6 +36,8 @@ class Settings : public QDialog
   explicit Settings(QWidget *parent = nullptr);
   ~Settings();
 
+  void init();
+
   void updateDevices();
 
 signals:

From c375fded4495192868a346bddc222b51933f6554 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joni=20R=C3=A4s=C3=A4nen?= <joni.rasanen@tut.fi>
Date: Fri, 3 May 2019 16:51:45 +0300
Subject: [PATCH 17/24] [SIP] (bug_fix) Unlock a mutex in case there is
 something wrong with response and not lock down the application.

---
 src/sip/siptransactions.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/sip/siptransactions.cpp b/src/sip/siptransactions.cpp
index 3b63afe6..e7ef230b 100644
--- a/src/sip/siptransactions.cpp
+++ b/src/sip/siptransactions.cpp
@@ -247,6 +247,8 @@ void SIPTransactions::acceptCall(uint32_t sessionID)
 {
   Q_ASSERT(dialogs_.find(sessionID) != dialogs_.end());
 
+  qDebug() << "Accept, SIPTransaction" << "accepting call:" << sessionID;
+
   dialogMutex_.lock();
   std::shared_ptr<SIPDialogData> dialog = dialogs_[sessionID];
   dialogMutex_.unlock();
@@ -525,6 +527,7 @@ void SIPTransactions::processSIPResponse(SIPResponse response,
   {
     qDebug() << "PEER_ERROR: Could not find the suggested dialog in response!";
     qDebug() << "TransportID:" << transportID << "CallID:" << response.message->dialog->callID;
+    dialogMutex_.unlock();
     return;
   }
 

From c81f631f08c1753d6efd519bd17c2f3464920d86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joni=20R=C3=A4s=C3=A4nen?= <joni.rasanen@tut.fi>
Date: Fri, 3 May 2019 16:58:56 +0300
Subject: [PATCH 18/24] [Core] (feature) Removed the ending of calls when
 closing the application because uninit should do the same and this way we
 don't restart self view camera.

---
 src/kvazzupcore.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/kvazzupcore.cpp b/src/kvazzupcore.cpp
index bd5557d5..fd70e456 100644
--- a/src/kvazzupcore.cpp
+++ b/src/kvazzupcore.cpp
@@ -46,7 +46,6 @@ void KvazzupCore::init()
 
 void KvazzupCore::uninit()
 {
-  endTheCall();
   sip_.uninit();
   media_.uninit();
 }

From 818a8c9a39387f13568fd31445b910efdc58513d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joni=20R=C3=A4s=C3=A4nen?= <joni.rasanen@tut.fi>
Date: Fri, 3 May 2019 17:04:19 +0300
Subject: [PATCH 19/24] [SIP] (cosmetic) Reduced row lengths and print more
 information in debug.

---
 src/sip/sipdialogstate.cpp | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/sip/sipdialogstate.cpp b/src/sip/sipdialogstate.cpp
index ba611184..23e73ba8 100644
--- a/src/sip/sipdialogstate.cpp
+++ b/src/sip/sipdialogstate.cpp
@@ -152,12 +152,16 @@ void SIPDialogState::getRequestDialogInfo(SIPRequest &outRequest, QString localA
       = std::shared_ptr<SIPDialogInfo> (new SIPDialogInfo{remoteTag_, localTag_, callID_});
 }
 
+
 ViaInfo SIPDialogState::getLocalVia(QString localAddress)
 {
-  return ViaInfo{TCP, "2.0", localAddress, QString("z9hG4bK" + generateRandomString(BRANCHLENGTH))};
+  return ViaInfo{TCP, "2.0", localAddress,
+        QString("z9hG4bK" + generateRandomString(BRANCHLENGTH))};
 }
 
-bool SIPDialogState::correctRequestDialog(std::shared_ptr<SIPDialogInfo> dialog, RequestType type, uint32_t remoteCSeq)
+
+bool SIPDialogState::correctRequestDialog(std::shared_ptr<SIPDialogInfo> dialog,
+                                          RequestType type, uint32_t remoteCSeq)
 {
   Q_ASSERT(callID_ != "");
   if(callID_ == "")
@@ -185,6 +189,7 @@ bool SIPDialogState::correctRequestDialog(std::shared_ptr<SIPDialogInfo> dialog,
   return false;
 }
 
+
 bool SIPDialogState::correctResponseDialog(std::shared_ptr<SIPDialogInfo> dialog, uint32_t messageCSeq)
 {
   // For backwards compability, this should be prepared for missing To-tag (or was it from tag) (RFC3261).
@@ -195,7 +200,8 @@ bool SIPDialogState::correctResponseDialog(std::shared_ptr<SIPDialogInfo> dialog
     // The response cseq should be the same as our cseq
     if(messageCSeq != localCSeq_)
     {
-      qDebug() << "PEER_ERROR:" << "The message CSeq was not the same as our previous request!";
+      qDebug() << "PEER_ERROR:" << "The message CSeq was not the same as our previous request!"
+               << messageCSeq << "vs " << localCSeq_;
       // TODO: if remote cseq in message is lower than remote cseq, send 500
       return false;
     }

From 287c894acd1b3a118a51f7b4fb913857b421542e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joni=20R=C3=A4s=C3=A4nen?= <joni.rasanen@tut.fi>
Date: Tue, 7 May 2019 15:47:20 +0300
Subject: [PATCH 20/24] refactor(Processing): Camera filter flow improvements.

Check that camera_ exists when initializing cameraFilter. Remove state
check because it may only cause harm and nothing useful. Reformatted process
function loop to be similar as other filters instead of while(true)loop which
seemed questionable.
---
 src/video/camerafilter.cpp | 189 ++++++++++++++++++-------------------
 1 file changed, 94 insertions(+), 95 deletions(-)

diff --git a/src/video/camerafilter.cpp b/src/video/camerafilter.cpp
index f6f4c367..2bd6e164 100644
--- a/src/video/camerafilter.cpp
+++ b/src/video/camerafilter.cpp
@@ -84,120 +84,128 @@ bool CameraFilter::initialCameraSetup()
 #ifndef __linux__
   camera_->load();
 #endif
+  return true;
 }
 
 
 bool CameraFilter::cameraSetup()
 {
-  QSettings settings("kvazzup.ini", QSettings::IniFormat);
-#ifndef __linux__
-  while(camera_->state() != QCamera::LoadedState)
+  Q_ASSERT(camera_ && cameraFrameGrabber_);
+
+  if (camera_ && cameraFrameGrabber_)
   {
-    qSleep(5);
-  }
-#endif
+    QSettings settings("kvazzup.ini", QSettings::IniFormat);
+    //#ifndef __linux__
+    while(camera_->state() != QCamera::LoadedState)
+    {
+      qSleep(5);
+    }
+    //#endif
 
-  Q_ASSERT(camera_ && cameraFrameGrabber_);
-  camera_->setViewfinder(cameraFrameGrabber_);
+    camera_->setViewfinder(cameraFrameGrabber_);
 
-  connect(cameraFrameGrabber_, SIGNAL(frameAvailable(QVideoFrame)), this, SLOT(handleFrame(QVideoFrame)));
+    connect(cameraFrameGrabber_, SIGNAL(frameAvailable(QVideoFrame)), this, SLOT(handleFrame(QVideoFrame)));
 
-  QCameraViewfinderSettings viewSettings = camera_->viewfinderSettings();
-  printSupportedFormats();
+    QCameraViewfinderSettings viewSettings = camera_->viewfinderSettings();
+    printSupportedFormats();
 
-  // TODO: this should be a temporary hack until dshow is replaced by qcamera
-  QString inputFormat = settings.value("video/InputFormat").toString();
+    // TODO: this should be a temporary hack until dshow is replaced by qcamera
+    QString inputFormat = settings.value("video/InputFormat").toString();
 
 #ifndef __linux__
-  if(inputFormat == "MJPG")
-  {
-    viewSettings.setPixelFormat(QVideoFrame::Format_Jpeg);
-    output_ = RGB32VIDEO;
-  }
+    if(inputFormat == "MJPG")
+    {
+      viewSettings.setPixelFormat(QVideoFrame::Format_Jpeg);
+      output_ = RGB32VIDEO;
+    }
 #else
-  if(inputFormat == "MJPG")
-  {
-    viewSettings.setPixelFormat(QVideoFrame::Format_RGB32);
-    output_ = RGB32VIDEO;
-  }
+    if(inputFormat == "MJPG")
+    {
+      viewSettings.setPixelFormat(QVideoFrame::Format_RGB32);
+      output_ = RGB32VIDEO;
+    }
 #endif
-  else if(inputFormat == "RGB32")
-  {
-    viewSettings.setPixelFormat(QVideoFrame::Format_RGB32);
-    output_ = RGB32VIDEO;
-  }
-  else if(inputFormat == "YUV420P")
-  {
-    viewSettings.setPixelFormat(QVideoFrame::Format_YUV420P);
-    output_ = YUV420VIDEO;
-  }
-  else
-  {
-    qDebug() << "Input format is not supported";
-    viewSettings.setPixelFormat(QVideoFrame::Format_Invalid);
-    output_ = NONE;
-    return false;
-  }
-  //printSupportedResolutions(viewSettings);
+    else if(inputFormat == "RGB32")
+    {
+      viewSettings.setPixelFormat(QVideoFrame::Format_RGB32);
+      output_ = RGB32VIDEO;
+    }
+    else if(inputFormat == "YUV420P")
+    {
+      viewSettings.setPixelFormat(QVideoFrame::Format_YUV420P);
+      output_ = YUV420VIDEO;
+    }
+    else
+    {
+      qDebug() << "Input format is not supported";
+      viewSettings.setPixelFormat(QVideoFrame::Format_Invalid);
+      output_ = NONE;
+      return false;
+    }
+    //printSupportedResolutions(viewSettings);
 
 #ifndef __linux__
-  QList<QSize> resolutions = camera_->supportedViewfinderResolutions(viewSettings);
+    QList<QSize> resolutions = camera_->supportedViewfinderResolutions(viewSettings);
 
-  int resolutionID = settings.value("video/ResolutionID").toInt();
-  if(resolutions.size() >= resolutionID && !resolutions.empty())
-  {
-    QSize resolution = resolutions.at(resolutionID);
-    viewSettings.setResolution(QSize(resolution.width(),
-                                     resolution.height()));
-  }
-  else {
-    viewSettings.setResolution(QSize(0,0));
-  }
+    int resolutionID = settings.value("video/ResolutionID").toInt();
+    if(resolutions.size() >= resolutionID && !resolutions.empty())
+    {
+      QSize resolution = resolutions.at(resolutionID);
+      viewSettings.setResolution(QSize(resolution.width(),
+                                       resolution.height()));
+    }
+    else {
+      viewSettings.setResolution(QSize(0,0));
+    }
 #else
-  viewSettings.setResolution(QSize(640, 480));
+    viewSettings.setResolution(QSize(1280, 720));
 #endif
 
-  QList<QCamera::FrameRateRange> framerates = camera_->supportedViewfinderFrameRateRanges(viewSettings);
+    QList<QCamera::FrameRateRange> framerates = camera_->supportedViewfinderFrameRateRanges(viewSettings);
 
-  int framerateID = settings.value("video/FramerateID").toInt();
+    int framerateID = settings.value("video/FramerateID").toInt();
 
 #ifndef __linux__
-  if (!framerates.empty())
-  {
-    if(framerateID < framerates.size())
+    if (!framerates.empty())
     {
-      viewSettings.setMaximumFrameRate(framerates.at(framerateID).maximumFrameRate);
-      viewSettings.setMinimumFrameRate(framerates.at(framerateID).minimumFrameRate);
-    }
-    else {
-      viewSettings.setMaximumFrameRate(framerates.back().maximumFrameRate);
-      viewSettings.setMinimumFrameRate(framerates.back().minimumFrameRate);
+      if(framerateID < framerates.size())
+      {
+        viewSettings.setMaximumFrameRate(framerates.at(framerateID).maximumFrameRate);
+        viewSettings.setMinimumFrameRate(framerates.at(framerateID).minimumFrameRate);
+      }
+      else {
+        viewSettings.setMaximumFrameRate(framerates.back().maximumFrameRate);
+        viewSettings.setMinimumFrameRate(framerates.back().minimumFrameRate);
+      }
     }
-  }
 #else
-  viewSettings.setMaximumFrameRate(30);
-  viewSettings.setMinimumFrameRate(30);
+    viewSettings.setMaximumFrameRate(30);
+    viewSettings.setMinimumFrameRate(30);
 #endif
 
-  qDebug() << "Iniating, CameraFilter : Using following QCamera settings:";
-  qDebug() << "Iniating, CameraFilter :---------------------------------------";
-  qDebug() << "Iniating, CameraFilter : Format:" << viewSettings.pixelFormat();
-  qDebug() << "Iniating, CameraFilter : Resolution:" << viewSettings.resolution();
-  qDebug() << "Iniating, CameraFilter : FrameRate:" << viewSettings.minimumFrameRate()
-           << "to" << viewSettings.maximumFrameRate();
-  qDebug() << "Iniating, CameraFilter : ---------------------------------------";
-  camera_->setViewfinderSettings(viewSettings);
-  camera_->start();
-
-  qDebug() << "Iniating, CameraFilter : Camera status:" << camera_->state();
-
+    qDebug() << "Iniating, CameraFilter : Using following QCamera settings:";
+    qDebug() << "Iniating, CameraFilter :---------------------------------------";
+    qDebug() << "Iniating, CameraFilter : Format:" << viewSettings.pixelFormat();
+    qDebug() << "Iniating, CameraFilter : Resolution:" << viewSettings.resolution();
+    qDebug() << "Iniating, CameraFilter : FrameRate:" << viewSettings.minimumFrameRate()
+             << "to" << viewSettings.maximumFrameRate();
+    qDebug() << "Iniating, CameraFilter : ---------------------------------------";
+    camera_->setViewfinderSettings(viewSettings);
+    camera_->start();
+
+    qDebug() << "Iniating, CameraFilter : Camera status:" << camera_->state();
+  }
+  else
+  {
+    return false;
+  }
   return true;
 }
 
 
 void CameraFilter::stop()
 {
-  if(camera_ && camera_->state() == QCamera::ActiveState)
+  if(camera_)
   {
     camera_->stop();
   }
@@ -221,13 +229,14 @@ void CameraFilter::process()
     qDebug() << "No frame";
     return;
   }
-  QVideoFrame frame = frames_.front();
-  frameMutex_.lock();
-  frames_.pop_front();
-  frameMutex_.unlock();
 
-  while(true)
+  while(!frames_.empty())
   {
+    QVideoFrame frame = frames_.front();
+    frameMutex_.lock();
+    frames_.pop_front();
+    frameMutex_.unlock();
+
     // do nothing because camera input is handled via camera signal
     if(framerate_ == 0)
     {
@@ -273,16 +282,6 @@ void CameraFilter::process()
 
     Q_ASSERT(u_newImage->data);
     sendOutput(std::move(u_newImage));
-
-    if(frames_.empty())
-    {
-      return;
-    }
-
-    frame = frames_.front();
-    frameMutex_.lock();
-    frames_.pop_front();
-    frameMutex_.unlock();
   }
 }
 

From b8824222bee3b5e9924ef156096c28a497488b9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joni=20R=C3=A4s=C3=A4nen?= <joni.rasanen@tut.fi>
Date: Wed, 8 May 2019 12:37:42 +0300
Subject: [PATCH 21/24] refactor(global): Uniform printing of debug
 information.

Added functions for printing debug information so that all debug prints will be
formulated in the same way.
---
 src/common.cpp | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++
 src/common.h   | 14 +++++++++++
 2 files changed, 82 insertions(+)

diff --git a/src/common.cpp b/src/common.cpp
index e0840b7d..74e59b17 100644
--- a/src/common.cpp
+++ b/src/common.cpp
@@ -7,6 +7,8 @@
 #include <windows.h> // for Sleep
 #endif
 
+#include <QDebug>
+
 // TODO move this to a different file from common.h
 void qSleep(int ms)
 {
@@ -36,3 +38,69 @@ QString generateRandomString(uint32_t length)
   }
   return string;
 }
+
+
+void printDebugObject(DebugType type, QObject* object,
+                      QString context, QString description,
+                      QStringList valueNames, QStringList values)
+{
+  printDebug(type, object->metaObject()->className(), context, description, valueNames, values);
+}
+
+void printDebug(DebugType type, QString className, QString context, QString description, QStringList valueNames, QStringList values)
+{
+
+  QString valueString = "";
+  if (valueNames.size() == values.size())
+  {
+    for (int i = 0; i < valueNames.size(); ++i)
+    {
+      valueString.append(valueNames.at(i));
+      valueString.append(": ");
+      valueString.append(values.at(i));
+      if (i != valueNames.size() - 1)
+      {
+        valueString.append("\r\n");
+      }
+    }
+  }
+  else {
+    qDebug() << "Value printing failed";
+  }
+
+  // This could be reduced, but it might change so not worth probably at the moment.
+  // Choose which text to print based on type.
+  switch (type) {
+  case DEBUG_NORMAL:
+  {
+    qDebug().nospace().noquote() << context << ", " << className << ": "
+                                 << description << " " << valueString;
+    break;
+  }
+  case DEBUG_ERROR:
+  {
+    qCritical().nospace().noquote() << "ERROR: --------------------------------------------";
+    qCritical().nospace().noquote() << context << ", " << className << ": "
+                                 << description << " " << valueString;
+    qCritical().nospace().noquote() << "-------------------------------------------- ERROR";
+    break;
+  }
+  case DEBUG_WARNING:
+  {
+    qWarning().nospace().noquote() << "WARNING: --------------------------------------------";
+    qWarning().nospace().noquote() << context << ", " << className << ": "
+                                 << description << " " << valueString;
+    qWarning().nospace().noquote() << "-------------------------------------------- WARNING";
+    break;
+  }
+  case DEBUG_PEER_ERROR:
+  {
+    qWarning().nospace().noquote() << "PEER ERROR: --------------------------------------------";
+    qWarning().nospace().noquote() << context << ", " << className << ": "
+                                 << description << " " << valueString;
+    qWarning().nospace().noquote() << "-------------------------------------------- PEER ERROR";
+    break;
+  }
+
+  }
+}
diff --git a/src/common.h b/src/common.h
index b7915b90..7870d387 100644
--- a/src/common.h
+++ b/src/common.h
@@ -1,6 +1,7 @@
 #pragma once
 #include <QList>
 #include <QString>
+#include <QObject>
 #include <stdint.h>
 
 // A module for functions used multiple times across the whole program
@@ -9,3 +10,16 @@
 void qSleep(int ms);
 
 QString generateRandomString(uint32_t length);
+
+enum DebugType{DEBUG_NORMAL, DEBUG_ERROR, DEBUG_WARNING, DEBUG_PEER_ERROR};
+
+
+// use this if printing happens inside class derived from QObject which is most Qt-classes
+void printDebugObject(DebugType type, QObject* object,
+                      QString context = "", QString description = "",
+                      QStringList valueNames = {}, QStringList values = {});
+
+// print debug information
+void printDebug(DebugType type, QString className,
+                QString context = "", QString description = "",
+                QStringList valueNames = {}, QStringList values = {});

From b4891e0e63e701ca6b3c4bd8ad1f42cb421dab0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joni=20R=C3=A4s=C3=A4nen?= <joni.rasanen@tut.fi>
Date: Thu, 9 May 2019 15:53:47 +0300
Subject: [PATCH 22/24] refactor(everything): Migrated the error prints.

Migrated error prints from everything expect RTPStreamer and ICE.
---
 src/audio/audiocapturefilter.cpp |  21 +-
 src/audio/audiooutput.cpp        |   7 +-
 src/audio/opusdecoderfilter.cpp  |   7 +-
 src/audio/opusencoderfilter.cpp  |  12 +-
 src/audio/speexaecfilter.cpp     |   5 +-
 src/common.h                     |   4 +
 src/filter.cpp                   |  14 +-
 src/filtergraph.cpp              |  19 +-
 src/gui/conferenceview.cpp       |  38 ++--
 src/gui/contactlist.cpp          |   4 +-
 src/gui/settingshelper.cpp       |   6 +-
 src/gui/statisticswindow.cpp     |   4 +-
 src/gui/videodrawhelper.cpp      |   4 +-
 src/gui/videoviewfactory.cpp     |   9 +-
 src/main.cpp                     |   7 +-
 src/mediamanager.cpp             |  10 +-
 src/scalefilter.cpp              |   7 +-
 src/sip/sipcontent.cpp           |  22 ++-
 src/sip/sipconversions.cpp       |   7 +-
 src/sip/sipdialogclient.cpp      |   6 +-
 src/sip/sipfieldcomposing.cpp    |   7 +-
 src/sip/sipservertransaction.cpp |   5 +-
 src/sip/siptransactions.cpp      |  15 +-
 src/sip/siptransport.cpp         |   5 +-
 src/tcpconnection.cpp            |  17 +-
 src/video/cameraframegrabber.cpp |   4 +-
 src/video/displayfilter.cpp      |   7 +-
 src/video/kvazaarfilter.cpp      |  12 +-
 src/video/openhevcfilter.cpp     |  11 +-
 ui/customSettings.ui             | 328 ++++++++++++++++---------------
 30 files changed, 360 insertions(+), 264 deletions(-)

diff --git a/src/audio/audiocapturefilter.cpp b/src/audio/audiocapturefilter.cpp
index 2e315ad5..71b1fad4 100644
--- a/src/audio/audiocapturefilter.cpp
+++ b/src/audio/audiocapturefilter.cpp
@@ -3,6 +3,8 @@
 #include "audiocapturedevice.h"
 #include "statisticsinterface.h"
 
+#include "common.h"
+
 #include <QAudioInput>
 #include <QDebug>
 #include <QTime>
@@ -23,21 +25,17 @@ AudioCaptureFilter::~AudioCaptureFilter(){}
 
 bool AudioCaptureFilter::init()
 {
-  qDebug() << "Initiating," << metaObject()->className() << ": Initializing audio capture filter";
-
+  printDebugObject(DEBUG_NORMAL, this, "Iniating", "Initializing audio capture filter.");
   QAudioDeviceInfo info(deviceInfo_);
 
   for(auto device : QAudioDeviceInfo::availableDevices(QAudio::AudioInput))
   {
-    qDebug() << "Iniating," << metaObject()->className()
-             << ": Audio Recording device:" << device.deviceName();
+    printDebugObject(DEBUG_NORMAL, this, "Iniating", "", {"Available audio recording devices"}, {device.deviceName()});
   }
-
-  qDebug() << "Iniating," << metaObject()->className()
-              << ": Device:" << info.deviceName();
+  printDebugObject(DEBUG_NORMAL, this, "Iniating", "", {"Chosen Device"}, {info.deviceName()});
 
   if (!info.isFormatSupported(format_)) {
-    qWarning() << "WARNING: Default audio format not supported - trying to use nearest";
+    printDebugObject(DEBUG_WARNING, this, "Iniating", "Default audio format not supported - trying to use nearest");
     format_ = info.nearestFormat(format_);
   }
 
@@ -51,8 +49,7 @@ bool AudioCaptureFilter::init()
   device_  = new AudioCaptureDevice(format_, this);
 
   createAudioInput();
-  qDebug() << "Iniating," << metaObject()->className() << ": Audio initializing completed";
-
+  printDebugObject(DEBUG_NORMAL, this, "Iniating", "Audio initializing completed.");
   return true;
 }
 
@@ -71,7 +68,7 @@ void AudioCaptureFilter::readMore()
 {
   if (!audioInput_)
   {
-    qWarning() << "WARNING," << metaObject()->className() << ": No audio input in readMore";
+    printDebugObject(DEBUG_WARNING, this, "Audio input", "No audio input in readMore");
     return;
   }
   qint64 len = audioInput_->bytesReady();
@@ -139,7 +136,7 @@ void AudioCaptureFilter::stop()
 // changing of audio device mid stream.
 void AudioCaptureFilter::deviceChanged(int index)
 {
-  qWarning() << "WARNING: audiocapturefilter device change not implemented fully:" << index;
+  printDebugObject(DEBUG_WARNING, this, "Settings", "audiocapturefilter device change not implemented fully.");
 
   device_->stop();
   audioInput_->stop();
diff --git a/src/audio/audiooutput.cpp b/src/audio/audiooutput.cpp
index 0419abbf..edea19bf 100644
--- a/src/audio/audiooutput.cpp
+++ b/src/audio/audiooutput.cpp
@@ -2,7 +2,7 @@
 
 #include "audiooutputdevice.h"
 
-#include <QDebug>
+#include "common.h"
 
 const int BufferSize      = 32768;
 
@@ -25,7 +25,7 @@ void AudioOutput::initializeAudio(QAudioFormat format)
 {
   QAudioDeviceInfo info(device_);
   if (!info.isFormatSupported(format)) {
-    qWarning() << "Default format not supported - trying to use nearest";
+    printDebugObject(DEBUG_WARNING, this, "Iniating", "Default format not supported - trying to use nearest.");
     format_ = info.nearestFormat(format);
   }
   else
@@ -57,7 +57,8 @@ void AudioOutput::createAudioOutput()
 
 void AudioOutput::deviceChanged(int index)
 {
-  qWarning() << "WARNING: audio output device change not implemented fully:" << index;
+  printDebugObject(DEBUG_WARNING, this, "Audio", "Audio output device change not implemented fully.",
+    {"Index"}, {QString::number(index)});
 
   //m_pushTimer->stop();
   source_->stop();
diff --git a/src/audio/opusdecoderfilter.cpp b/src/audio/opusdecoderfilter.cpp
index 7b51168d..080bb373 100644
--- a/src/audio/opusdecoderfilter.cpp
+++ b/src/audio/opusdecoderfilter.cpp
@@ -1,6 +1,6 @@
 #include "opusdecoderfilter.h"
 
-#include <QDebug>
+#include "common.h"
 
 OpusDecoderFilter::OpusDecoderFilter(QString id, QAudioFormat format, StatisticsInterface *stats):
   Filter(id, "Opus_Decoder", stats, OPUSAUDIO, RAWAUDIO),
@@ -28,7 +28,8 @@ bool OpusDecoderFilter::init()
 
   if(error)
   {
-    qWarning() << "WARNING:" << metaObject()->className() << ": Failed to initialize opus decoder with errorcode:" << error;
+    printDebugObject(DEBUG_WARNING, this, "Iniating", "Failed to initialize opus decoder.",
+      {"Errorcode"}, {QString::number(error)});
     return false;
   }
   return true;
@@ -61,7 +62,7 @@ void OpusDecoderFilter::process()
     }
     else
     {
-      qWarning() << "WARNING," << metaObject()->className() << ":Failed to encode audio frame. Error:" << len;
+      printDebugObject(DEBUG_WARNING, this, "Process", "Failed to encode audio frame.", {"Error"}, {QString::number(len)});
     }
     input = getInput();
   }
diff --git a/src/audio/opusencoderfilter.cpp b/src/audio/opusencoderfilter.cpp
index e126259c..eeab7f44 100644
--- a/src/audio/opusencoderfilter.cpp
+++ b/src/audio/opusencoderfilter.cpp
@@ -2,7 +2,8 @@
 
 #include "statisticsinterface.h"
 
-#include <QDebug>
+#include "common.h"
+
 #include <QDateTime>
 
 // this is how many frames the audio capture seems to send
@@ -34,7 +35,8 @@ bool OpusEncoderFilter::init()
 
   if(error)
   {
-    qWarning() << "Failed to initialize opus encoder with errorcode:" << error;
+    printDebugObject(DEBUG_WARNING, this, "Iniating", "Failed to initialize opus encoder.",
+      {"Errorcode"}, {QString::number(error)});
     return false;
   }
 
@@ -58,7 +60,8 @@ void OpusEncoderFilter::process()
       len = opus_encode(enc_, (opus_int16*)input->data.get()+i/2, numberOfSamples_, opusOutput_ + pos, max_data_bytes_ - pos);
       if(len <= 0)
       {
-        qWarning() << "Warning: Failed to encode audio. Error:" << len;
+        printDebugObject(DEBUG_WARNING, this, "Process", "Failed to encode audio",
+          {"Errorcode:"}, {QString::number(len)});
         break;
       }
 
@@ -86,7 +89,8 @@ void OpusEncoderFilter::process()
     }
     else
     {
-      qWarning() << "Warning: Failed to encode audio frame. Length:" << input->data_size;
+      printDebugObject(DEBUG_WARNING, this, "Process", "Failed to encode audio frame.",
+        {"Frame length"}, {QString::number(input->data_size)});
     }
     input = getInput();
   }
diff --git a/src/audio/speexaecfilter.cpp b/src/audio/speexaecfilter.cpp
index 6df5423a..7c800bd1 100644
--- a/src/audio/speexaecfilter.cpp
+++ b/src/audio/speexaecfilter.cpp
@@ -1,6 +1,6 @@
 #include "speexaecfilter.h"
 
-#include <QDebug>
+#include "common.h"
 
 // this is how many frames the audio capture seems to send
 const uint16_t FRAMESPERSECOND = 25;
@@ -74,7 +74,8 @@ void SpeexAECFilter::process()
       }
       else
       {
-        qWarning() << "Warning: AEC received too much output before input";
+        printDebugObject(DEBUG_WARNING, this, "Process", "AEC received too much output before input.",
+          {"input", "output"}, {QString::number(in_), QString::number(out_)});
         break;
       }
     }
diff --git a/src/common.h b/src/common.h
index 7870d387..25a5f404 100644
--- a/src/common.h
+++ b/src/common.h
@@ -20,6 +20,10 @@ void printDebugObject(DebugType type, QObject* object,
                       QStringList valueNames = {}, QStringList values = {});
 
 // print debug information
+// DEBUG_NORMAL is for one time informational debug printing.
+// DEBUG_ERROR is for events that should not be able to happen in Kvazzup and result in problems
+// DEBUG_WARNING is for events that should not be able to happen in Kvazzup which do not result in problems
+// DEBUG_PEER_ERROR is for events that are errors in behavior of entities that are not us.
 void printDebug(DebugType type, QString className,
                 QString context = "", QString description = "",
                 QStringList valueNames = {}, QStringList values = {});
diff --git a/src/filter.cpp b/src/filter.cpp
index 90ba9db0..7a1fe830 100644
--- a/src/filter.cpp
+++ b/src/filter.cpp
@@ -2,6 +2,8 @@
 
 #include "statisticsinterface.h"
 
+#include "common.h"
+
 #include <QDebug>
 
 Filter::Filter(QString id, QString name, StatisticsInterface *stats,
@@ -59,7 +61,7 @@ void Filter::removeOutConnection(std::shared_ptr<Filter> out)
 
   if(!removed)
   {
-    qWarning() << "WARNING: Did not succeed at removing outconnection.";
+    printDebugObject(DEBUG_WARNING, this, "Uninit", "Did not succeed at removing outconnection.");
   }
 }
 
@@ -80,7 +82,7 @@ void Filter::putInput(std::unique_ptr<Data> data)
      || data->type == NONE
      || data->data_size == 0)
   {
-    qWarning() << "Warning: Discarding bad data";
+    printDebugObject(DEBUG_WARNING, this, "Processing", "Discarding bad data.");
     return;
   }
 
@@ -123,7 +125,7 @@ void Filter::putInput(std::unique_ptr<Data> data)
     {
       if(inBuffer_[0]->type == OPUSAUDIO)
       {
-        qWarning() << "WARNING: Unimplented: Should input Null pointer to decoder";
+        printDebugObject(DEBUG_WARNING, this, "Processing", "Should input Null pointer to decoder.");
       }
       inBuffer_.pop_front(); // discard the oldest
     }
@@ -160,7 +162,7 @@ void Filter::sendOutput(std::unique_ptr<Data> output)
 
   if(outDataCallbacks_.size() == 0 && outConnections_.size() == 0)
   {
-    qWarning() << name_ << "trying to send output data without outconnections";
+    printDebugObject(DEBUG_WARNING, this, "Processing", "Trying to send output data without outconnections.");
     return;
   }
 
@@ -243,7 +245,7 @@ Data* Filter::shallowDataCopy(Data* original)
 
     return copy;
   }
-  qWarning() << "Warning: Trying to copy nullptr Data pointer";
+  printDebugObject(DEBUG_WARNING, this, "Processing", "Trying to copy nullptr Data pointer.");
   return nullptr;
 }
 
@@ -258,7 +260,7 @@ Data* Filter::deepDataCopy(Data* original)
 
     return copy;
   }
-  qWarning() << "Warning: Trying to copy nullptr Data pointer";
+  printDebugObject(DEBUG_WARNING, this, "Processing", "Trying to copy nullptr Data pointer.");
   return nullptr;
 }
 
diff --git a/src/filtergraph.cpp b/src/filtergraph.cpp
index cda76f0a..0bc46ca8 100644
--- a/src/filtergraph.cpp
+++ b/src/filtergraph.cpp
@@ -19,7 +19,6 @@
 #include "common.h"
 
 #include <QSettings>
-#include <QDebug>
 
 FilterGraph::FilterGraph():
   peers_(),
@@ -200,7 +199,7 @@ bool FilterGraph::addToGraph(std::shared_ptr<Filter> filter,
       }
       else
       {
-        qWarning() << "WARNING, FilterGraph : Could not find conversion for filter";
+        printDebug(DEBUG_WARNING, "FilterGraph", "Iniating", "Could not find conversion for filter.");
         return false;
       }
       // the conversion filter has been added to the end
@@ -223,7 +222,7 @@ bool FilterGraph::connectFilters(std::shared_ptr<Filter> filter, std::shared_ptr
 
   if(previous->outputType() != filter->inputType())
   {
-    qWarning() << "WARNING, FilterGraph : The connecting filter output and input DO NOT MATCH";
+    printDebug(DEBUG_WARNING, "FilterGraph", "Iniating", "The connecting filter output and input DO NOT MATCH.");
     return false;
   }
   previous->addOutConnection(filter);
@@ -284,7 +283,8 @@ void FilterGraph::sendVideoto(uint32_t sessionID, std::shared_ptr<Filter> videoF
 
   if(peers_.at(sessionID - 1)->videoFramedSource)
   {
-    qWarning() << "WARNING: We are already sending video to participant.";
+    printDebug(DEBUG_WARNING, "FilterGraph", "Add participant",
+               "We are already sending video to participant.");
     return;
   }
 
@@ -305,7 +305,8 @@ void FilterGraph::receiveVideoFrom(uint32_t sessionID, std::shared_ptr<Filter> v
 
   if(!peers_.at(sessionID - 1)->videoReceive.empty())
   {
-    qWarning() << "WARNING: We are receiving video from this participant:" << sessionID;
+    printDebug(DEBUG_WARNING, "FilterGraph", "Add Participant",
+               "We are receiving video from this participant", {"SessionID"}, {QString::number(sessionID)});
     return;
   }
   addToGraph(videoSink, peers_.at(sessionID - 1)->videoReceive);
@@ -333,7 +334,8 @@ void FilterGraph::sendAudioTo(uint32_t sessionID, std::shared_ptr<Filter> audioF
 
   if(peers_.at(sessionID - 1)->audioFramedSource)
   {
-    qWarning() << "Warning: We are sending audio from to participant:" << sessionID;
+    printDebug(DEBUG_WARNING, "FilterGraph", "Add Participant", "We are already sending audio to participant.",
+      {"SessionID"}, {QString::number(sessionID)});
     return;
   }
 
@@ -359,7 +361,8 @@ void FilterGraph::receiveAudioFrom(uint32_t sessionID, std::shared_ptr<Filter> a
 
   if(!peers_.at(sessionID - 1)->audioReceive.empty())
   {
-    qWarning() << "WARNING, FilterGraph : We are receiving video from this participant:" << sessionID;
+    printDebug(DEBUG_WARNING, "FilterGraph", "Add Participant", "We are receiving video from this participant.",
+      {"SessionID"}, {QString::number(sessionID)});
     return;
   }
   addToGraph(audioSink, peers_.at(sessionID - 1)->audioReceive);
@@ -376,7 +379,7 @@ void FilterGraph::receiveAudioFrom(uint32_t sessionID, std::shared_ptr<Filter> a
   }
   else
   {
-    qWarning() << "WARNING, FilterGraph : Did not attach echo cancellation";
+    printDebug(DEBUG_WARNING, "FilterGraph", "Add Participant", "Did not attach echo cancellation");
   }
 
   peers_.at(sessionID - 1)->output = new AudioOutput(stats_, sessionID);
diff --git a/src/gui/conferenceview.cpp b/src/gui/conferenceview.cpp
index a020dc19..a7e8ed74 100644
--- a/src/gui/conferenceview.cpp
+++ b/src/gui/conferenceview.cpp
@@ -7,9 +7,11 @@
 #include "gui/videoviewfactory.h"
 #include "gui/videowidget.h"
 
+#include "common.h"
+
+#include <QDebug>
 #include <QLabel>
 #include <QGridLayout>
-#include <QDebug>
 #include <QDir>
 
 ConferenceView::ConferenceView(QWidget *parent):
@@ -39,7 +41,7 @@ void ConferenceView::callingTo(uint32_t sessionID, QString name)
   Q_ASSERT(sessionID);
   if(activeCalls_.find(sessionID) != activeCalls_.end())
   {
-    qWarning() << "WARNING: Outgoing call already has an allocated view";
+    printDebugObject(DEBUG_WARNING, this, "Outgoing Call", "Outgoing call already has an allocated view.");
     return;
   }
 
@@ -89,8 +91,8 @@ void ConferenceView::incomingCall(uint32_t sessionID, QString name)
 {
   if(activeCalls_.find(sessionID) != activeCalls_.end())
   {
-    qWarning() << "WARNING," << metaObject()->className()
-               << "Incoming call already has an allocated view. Session:" << sessionID;
+    printDebugObject(DEBUG_WARNING, this, "Incoming Call", "Incoming call already has an allocated view.",
+      {"SessionID"}, {QString::number(sessionID)});
     return;
   }
   qDebug() << "Incoming call," << metaObject()->className()
@@ -185,8 +187,10 @@ void ConferenceView::attachWidget(uint32_t sessionID, QWidget* view)
     }
   }
   else {
-    qWarning() << "ERROR," << metaObject()->className() << ": Trying to attach fullscreenview back to layout when the sessionID"
-             << sessionID << " does not exist in conference view.";
+
+    printDebugObject(DEBUG_ERROR, this, "Incoming Call",
+                     "Trying to attach fullscreenview back to layout when sessionID does not exist in conference view.",
+                    {"SessionID"}, {QString::number(sessionID)});
   }
   layoutMutex_.unlock();
 }
@@ -211,9 +215,9 @@ void ConferenceView::detachWidget(uint32_t sessionID, QWidget* view)
   }
   else
   {
-    qWarning() << "ERROR," << metaObject()->className()
-               << ": Trying to detach fullscreenview from the layout when the sessionID"
-               << sessionID << " does not exist in  conference view.";
+    printDebugObject(DEBUG_ERROR, this, "Remove Participant",
+                     "Trying to detach fullscreenview from the layout when the sessionID does not exist in  conference view.",
+                    {"SessionID"}, {QString::number(sessionID)});
   }
 
   layoutMutex_.unlock();
@@ -234,7 +238,10 @@ void ConferenceView::addVideoStream(uint32_t sessionID, std::shared_ptr<Videovie
   else if(activeCalls_[sessionID]->state != VIEWASKING
           && activeCalls_[sessionID]->state != VIEWWAITINGPEER)
   {
-    qWarning() << "WARNING: activating stream with wrong state";
+    printDebugObject(DEBUG_WARNING, this, "Add Participant",
+                     "Activating stream with wrong state.",
+                    {"SessionID", "State"},
+                    {QString::number(sessionID), QString::number(activeCalls_[sessionID]->state)});
     return;
   }
 
@@ -271,7 +278,9 @@ void ConferenceView::ringing(uint32_t sessionID)
 
   if(activeCalls_.find(sessionID) == activeCalls_.end())
   {
-    qWarning() << "ERROR: Ringing for nonexisting view. View should always exist if this function is called.";
+    printDebugObject(DEBUG_ERROR, this, "Ringing",
+                     "Ringing for nonexisting view. View should always exist if this function is called.",
+                    {"SessionID"}, {QString::number(sessionID)});
     return;
   }
   if (activeCalls_[sessionID]->out != nullptr)
@@ -282,7 +291,8 @@ void ConferenceView::ringing(uint32_t sessionID)
   }
   else
   {
-    qWarning() << "ERROR: No incoming call widget exists when it should be ringing:" << sessionID;
+    printDebugObject(DEBUG_ERROR, this, "Ringing", "No incoming call widget exists when it should be ringing.",
+      {"SessionID"},{QString::number(sessionID)});
   }
 }
 
@@ -291,7 +301,8 @@ bool ConferenceView::removeCaller(uint32_t sessionID)
   if(activeCalls_.find(sessionID) == activeCalls_.end())
   {
     Q_ASSERT(false);
-    qWarning() << "ERROR: Tried to remove the view of non-existing sessionID!";
+    printDebugObject(DEBUG_ERROR, this, "Remove Participant",
+                     "Tried to remove the view of non-existing sessionID!");
   }
   else
   {
@@ -425,6 +436,7 @@ void ConferenceView::accept()
   else
   {
     qCritical() << "ERROR," << metaObject()->className() << "Couldn't find the invoker for accept";
+    printDebugObject(DEBUG_ERROR, this, "Accept", "Couldn't find the invoker for accept.");
   }
 }
 
diff --git a/src/gui/contactlist.cpp b/src/gui/contactlist.cpp
index 437d5944..7f55bf97 100644
--- a/src/gui/contactlist.cpp
+++ b/src/gui/contactlist.cpp
@@ -3,6 +3,8 @@
 #include "contactlistitem.h"
 #include "participantinterface.h"
 
+#include "common.h"
+
 #include <QSettings>
 #include <QDebug>
 #include <QMenu>
@@ -141,7 +143,7 @@ void ContactList::removeContact(int index)
 
   if(index == -1  || index >= items_.size())
   {
-    qWarning() << "WARNING," << metaObject()->className() << ": Tried to remove a nonexisting contact";
+    printDebugObject(DEBUG_WARNING, this, "Remove Participant", "Tried to remove a nonexisting contact");
     return;
   }
 
diff --git a/src/gui/settingshelper.cpp b/src/gui/settingshelper.cpp
index 8b57d515..eb01794f 100644
--- a/src/gui/settingshelper.cpp
+++ b/src/gui/settingshelper.cpp
@@ -1,5 +1,7 @@
 #include "settingshelper.h"
 
+#include "common.h"
+
 #include <QMenu>
 #include <QCheckBox>
 #include <QDebug>
@@ -129,8 +131,8 @@ void showContextMenu(const QPoint& pos, QTableWidget* table, QObject* processor,
 
   if(actions.size() != processSlots.size())
   {
-    qWarning() << "ERROR, SettingsHelper : Different amounts of actions and slots: "
-                  << actions.size() << "vs" << processSlots.size();
+    printDebug(DEBUG_ERROR, "SettingsHelper", "Settings", "Different amounts of actions and slots",
+                    {"Actions", "Slots"}, {QString::number(actions.size()), QString::number(processSlots.size())});
     return;
   }
 
diff --git a/src/gui/statisticswindow.cpp b/src/gui/statisticswindow.cpp
index ce0dc3ee..b5aced91 100644
--- a/src/gui/statisticswindow.cpp
+++ b/src/gui/statisticswindow.cpp
@@ -2,6 +2,8 @@
 
 #include "ui_statisticswindow.h"
 
+#include "common.h"
+
 #include <QCloseEvent>
 #include <QDateTime>
 #include <QDebug>
@@ -86,7 +88,7 @@ void StatisticsWindow::addNextInterface(StatisticsInterface* next)
 {
   Q_UNUSED(next)
   Q_ASSERT(false && "NOT IMPLEMENTED");
-  qWarning() << "WARNING: addNextInterface has not been implemented in stat window";
+  printDebugObject(DEBUG_ERROR, this, "Stats", "addNextInterface has not been implemented in stat window");
 }
 
 void StatisticsWindow::videoInfo(double framerate, QSize resolution)
diff --git a/src/gui/videodrawhelper.cpp b/src/gui/videodrawhelper.cpp
index f31046e3..0100a1b8 100644
--- a/src/gui/videodrawhelper.cpp
+++ b/src/gui/videodrawhelper.cpp
@@ -1,5 +1,7 @@
 #include "videodrawhelper.h"
 
+#include "common.h"
+
 #include <QDebug>
 #include <QWidget>
 #include <QKeyEvent>
@@ -113,7 +115,7 @@ void VideoDrawHelper::updateTargetRect(QWidget* widget)
     Q_ASSERT(lastImage_.data_ptr());
     if(lastImage_.data_ptr() == nullptr)
     {
-      qWarning() << "WARNING: Null pointer in current image!";
+      printDebugObject(DEBUG_ERROR, this, "Drawing", "Null pointer in current image!");
       return;
     }
 
diff --git a/src/gui/videoviewfactory.cpp b/src/gui/videoviewfactory.cpp
index 56e20c3d..30e40c1e 100644
--- a/src/gui/videoviewfactory.cpp
+++ b/src/gui/videoviewfactory.cpp
@@ -7,6 +7,8 @@
 // this annoys me, but I can live with it. The only smart way to fix it would be to get signal connect working
 #include "conferenceview.h"
 
+#include "common.h"
+
 #include <QSettings>
 #include <QDebug>
 
@@ -77,7 +79,8 @@ QWidget* VideoviewFactory::getView(uint32_t sessionID)
 {
   if(widgets_.find(sessionID) == widgets_.end())
   {
-    qWarning() << "ERROR: Tried to get a video widget that doesn't exists:" << sessionID;
+    printDebug(DEBUG_ERROR, "VideoViewFactory", "Tried to get a video widget that doesn't exists",
+      {"SessionID"}, {QString::number(sessionID)});
     return nullptr;
   }
   return widgets_[sessionID];
@@ -87,7 +90,9 @@ VideoInterface* VideoviewFactory::getVideo(uint32_t sessionID)
 {
   if(videos_.find(sessionID) == videos_.end())
   {
-    qWarning() << "ERROR: Tried to get a video widget that doesn't exists:" << sessionID;
+    printDebug(DEBUG_ERROR, "VideoViewFactory", "Initiate",
+               "Tried to get a video widget that doesn't exists.",
+              {"SessionID"}, {QString::number(sessionID)});
     return nullptr;
   }
   return videos_[sessionID];
diff --git a/src/main.cpp b/src/main.cpp
index ab95ee38..68a340fc 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,5 +1,7 @@
 #include "kvazzupcore.h"
 
+#include "common.h"
+
 #include <QApplication>
 #include <QSettings>
 #include <QFontDatabase>
@@ -11,7 +13,8 @@ int main(int argc, char *argv[])
 
   a.setApplicationName("Kvazzup");
 
-  qDebug() << "Starting Kvazzup in" << QDir::currentPath();
+  printDebug(DEBUG_NORMAL, "Main", "Startup", "Starting Kvazzup.",
+    {"Location"}, {QDir::currentPath()});
 
   // TODO move to GUI
   int id = QFontDatabase::addApplicationFont(QDir::currentPath() + "/fonts/OpenSans-Regular.ttf");
@@ -23,7 +26,7 @@ int main(int argc, char *argv[])
   }
   else
   {
-    qWarning() << "Could not find default font. Is the file missing?";
+    printDebug(DEBUG_WARNING, "Main", "Startup", "Could not find default font. Is the file missing?");
   }
 
   QCoreApplication::setOrganizationName("Ultra Video Group");
diff --git a/src/mediamanager.cpp b/src/mediamanager.cpp
index 4f856c0f..3ab9c8eb 100644
--- a/src/mediamanager.cpp
+++ b/src/mediamanager.cpp
@@ -9,6 +9,7 @@
 #include "sip/sdptypes.h"
 #include "statisticsinterface.h"
 
+#include "common.h"
 
 #include <QHostAddress>
 #include <QtEndian>
@@ -65,7 +66,7 @@ void MediaManager::addParticipant(uint32_t sessionID, std::shared_ptr<SDPMessage
 
   if(peerInfo->timeDescriptions.at(0).startTime != 0 || localInfo->timeDescriptions.at(0).startTime != 0)
   {
-    qWarning() << "ERROR: Non zero start-time not supported!";
+    printDebugObject(DEBUG_ERROR, this, "Add Participant", "Nonzero start-time not supported!");
   }
 
 #if 0
@@ -107,18 +108,19 @@ void MediaManager::addParticipant(uint32_t sessionID, std::shared_ptr<SDPMessage
       // TODO: Make it possible to have a separate ip address for each mediastream by fixing this.
       if(!streamer_->addPeer(ip, sessionID))
       {
-        qCritical() << "Error creating RTP peer. Simultaneous destruction?";
+        printDebugObject(DEBUG_ERROR, this, "Add Participant", "Error creating RTP peer. Simultaneous destruction?.");
         return;
       }
     }
     else {
-      qDebug() << "ERROR:" << peerInfo->connection_addrtype << "not supported in media creation:" << address;
+      printDebugObject(DEBUG_ERROR, this, "Add Participant", "Not supported in media creation.",
+                      {"Media type", "address"}, {peerInfo->connection_addrtype, address.toString()});
       return;
     }
   }
   else
   {
-    qWarning() << "ERROR: What are we using if not the internet!?";
+    printDebugObject(DEBUG_ERROR, this, "Add Participant", "What are we using if not the internet!?");
     return;
   }
 
diff --git a/src/scalefilter.cpp b/src/scalefilter.cpp
index 08e14239..120081e2 100644
--- a/src/scalefilter.cpp
+++ b/src/scalefilter.cpp
@@ -1,5 +1,7 @@
 #include "scalefilter.h"
 
+#include "common.h"
+
 #include <QImage>
 #include <QDebug>
 
@@ -44,8 +46,9 @@ void ScaleFilter::process()
       }
       default:
       {
-        qCritical() << "ERROR: Wrong video format for scaler:" << input->type;
-         format = QImage::Format_Invalid;
+        printDebugObject(DEBUG_ERROR, this, "Video Process", "Wrong video format for scaler.",
+                        {"Input type"},{QString::number(input->type)});
+        format = QImage::Format_Invalid;
         break;
       }
     }
diff --git a/src/sip/sipcontent.cpp b/src/sip/sipcontent.cpp
index e32834b7..91b91d8a 100644
--- a/src/sip/sipcontent.cpp
+++ b/src/sip/sipcontent.cpp
@@ -2,8 +2,11 @@
 
 #include "sip/sdptypes.h"
 
-#include <QRegularExpression>
+#include "common.h"
+
 #include <QDebug>
+#include <QRegularExpression>
+
 
 
 // called for every new line in SDP parsing. Parses out the two first characters
@@ -46,11 +49,11 @@ bool checkSDPValidity(const SDPMessageInfo &sdpInfo)
      sdpInfo.timeDescriptions.empty() ||
      sdpInfo.media.empty())
   {
-    qWarning() << "Version: " << sdpInfo.version <<
-        "Originator: " << sdpInfo.originator_username <<
-        "Session name:" << sdpInfo.sessionName <<
-        "Number of time descriptions:" << sdpInfo.timeDescriptions.size() <<
-        "Number of medias:" << sdpInfo.media.size();
+    printDebug(DEBUG_WARNING, "SipContent", "Content", "Check failed",
+              {"Version", "Originator", "Session Name", "Number of time descriptions", "Number of medias"},
+              {QString(sdpInfo.version), sdpInfo.originator_username, sdpInfo.sessionName,
+                QString::number(sdpInfo.timeDescriptions.size()), QString::number(sdpInfo.media.size())});
+
     return false;
   }
 
@@ -94,12 +97,12 @@ QString composeSDPContent(const SDPMessageInfo &sdpInfo)
 {
   if(!checkSDPValidity(sdpInfo))
   {
-    qCritical() << "WARNING: Bad SDPInfo in string formation";
+    printDebug(DEBUG_ERROR, "SIPContent", "SDP", "Bad SDPInfo in string formation.");
     return "";
   }
   else
   {
-    qDebug() << "Composed SDP checks out. Starting to compose";
+    printDebug(DEBUG_NORMAL, "SIPContent", "SDP", "Composed SDP checks out. Starting to compose.");
   }
 
   QString sdp = "";
@@ -525,7 +528,8 @@ bool parseSDPContent(const QString& content, SDPMessageInfo &sdp)
 
   if(!checkSDPValidity(sdp))
   {
-    qCritical() << "ERROR: The parsing generated a bad SDP for some reason. The problem should be detected earlier.";
+    printDebug(DEBUG_ERROR, "SIPContent", "SDP Parsing",
+               "The parsing generated a bad SDP for some reason. The problem should be detected earlier.");
     return false;
   }
   else
diff --git a/src/sip/sipconversions.cpp b/src/sip/sipconversions.cpp
index 1ea8ef2f..08cec419 100644
--- a/src/sip/sipconversions.cpp
+++ b/src/sip/sipconversions.cpp
@@ -1,5 +1,7 @@
 #include <sip/sipconversions.h>
 
+#include "common.h"
+
 #include <QDebug>
 
 const std::map<QString, RequestType> requestTypes = {{"INVITE", SIP_INVITE},
@@ -74,8 +76,9 @@ QString responseToPhrase(ResponseType response)
 {
   if(responsePhrases.find(response) == responsePhrases.end())
   {
-    qWarning() << "WARNING: Did not find response in phrase map. "
-                  "Maybe it has not been added yet.";
+    printDebug(DEBUG_WARNING, "SIPConversions", "SIP",
+                     "Did not find response in phrase map. Maybe it has not been added yet.");
+
     return "NO PHRASE";
   }
 
diff --git a/src/sip/sipdialogclient.cpp b/src/sip/sipdialogclient.cpp
index d7552945..7bfe01b2 100644
--- a/src/sip/sipdialogclient.cpp
+++ b/src/sip/sipdialogclient.cpp
@@ -2,6 +2,8 @@
 
 #include "siptransactionuser.h"
 
+#include "common.h"
+
 #include <QDebug>
 
 // 1 minute for the user to react
@@ -25,7 +27,7 @@ bool SIPDialogClient::processResponse(SIPResponse &response)
   qDebug() << "Client starts processing response";
   if(!sessionID_)
   {
-    qWarning() << "WARNING: SIP Client Transaction not initialized.";
+    printDebugObject(DEBUG_WARNING, this, "SIP Client Transaction not initialized.");
     return true;
   }
 
@@ -96,7 +98,7 @@ bool SIPDialogClient::startCall(QString callee)
   Q_ASSERT(sessionID_ != 0);
   if(!sessionID_)
   {
-    qWarning() << "WARNING: SIP Client Transaction not initialized";
+    printDebugObject(DEBUG_WARNING, this, "SIP Client Transaction not initialized.");
     return false;
   }
 
diff --git a/src/sip/sipfieldcomposing.cpp b/src/sip/sipfieldcomposing.cpp
index cb1fcc30..206ce6d4 100644
--- a/src/sip/sipfieldcomposing.cpp
+++ b/src/sip/sipfieldcomposing.cpp
@@ -2,6 +2,8 @@
 
 #include "sipconversions.h"
 
+#include "common.h"
+
 #include <QDebug>
 
 
@@ -13,13 +15,12 @@ bool getFirstRequestLine(QString& line, SIPRequest& request, QString lineEnding)
 {
   if(request.requestURI.host == "")
   {
-    qWarning() << "ERROR: Request URI host is empty when compising first line:"
-               << request.requestURI.host;
+    printDebug(DEBUG_ERROR, "SIPComposing", "SIP Send", "Request URI host is empty when compising first line");
   }
 
   if(request.type == SIP_NO_REQUEST)
   {
-    qDebug() << "WARNING: First request line failed";
+    printDebug(DEBUG_ERROR, "SIPComposing", "SIP Send", "SIP_NO_REQUEST given.");
     return false;
   }
   if(request.type != SIP_REGISTER)
diff --git a/src/sip/sipservertransaction.cpp b/src/sip/sipservertransaction.cpp
index 1b142c78..a19c16cf 100644
--- a/src/sip/sipservertransaction.cpp
+++ b/src/sip/sipservertransaction.cpp
@@ -1,6 +1,7 @@
 #include "sipservertransaction.h"
 
 #include "siptransactionuser.h"
+#include "common.h"
 
 #include <QDebug>
 
@@ -28,7 +29,7 @@ bool SIPServerTransaction::processRequest(SIPRequest &request)
   Q_ASSERT(transactionUser_ && sessionID_);
   if(!transactionUser_ || sessionID_ == 0)
   {
-    qWarning() << "WARNING: SIP Server transaction not initialized.";
+    printDebugObject(DEBUG_ERROR, this, "SIP Process Response", "SIP Server transaction not initialized.");
     return false;
   }
 
@@ -93,7 +94,7 @@ void SIPServerTransaction::getResponseMessage(std::shared_ptr<SIPMessageInfo> &o
 {
   if(receivedRequest_ == nullptr)
   {
-    qWarning() << "ERROR: The received request was not set before trying to use it!";
+    printDebugObject(DEBUG_ERROR, this, "SIP Send Response", "The received request was not set before trying to use it!");
     return;
   }
   copyMessageDetails(receivedRequest_, outMessage);
diff --git a/src/sip/siptransactions.cpp b/src/sip/siptransactions.cpp
index e7ef230b..87a2f8e4 100644
--- a/src/sip/siptransactions.cpp
+++ b/src/sip/siptransactions.cpp
@@ -453,7 +453,8 @@ void SIPTransactions::processSIPRequest(SIPRequest request,
       {
         if(!content.isValid())
         {
-          qWarning() << "ERROR: The SDP content is not valid at processing. Should be detected earlier.";
+          printDebugObject(DEBUG_ERROR, this, "SIP Process Request",
+                           "The SDP content is not valid at processing. Should be detected earlier.");
           return;
         }
 
@@ -564,7 +565,8 @@ bool SIPTransactions::processSDP(uint32_t sessionID, QVariant& content, QHostAdd
 {
   if(!content.isValid() || dialogs_.find(sessionID) == dialogs_.end())
   {
-    qWarning() << "ERROR: The SDP content is not valid at processing. Should be detected earlier.";
+    printDebugObject(DEBUG_ERROR, this, "SIP Process SDP",
+                     "The SDP content is not valid at processing. Should be detected earlier.");
     return false;
   }
 
@@ -703,10 +705,12 @@ void SIPTransactions::sendNonDialogRequest(SIP_URI& uri, RequestType type)
     transport->sendRequest(request, content);
   }
   else if (type == SIP_OPTIONS) {
-    qWarning() << "ERROR: Trying to send unimplemented non-dialog request OPTIONS!";
+    printDebugObject(DEBUG_ERROR, this, "SIP Request Sending",
+                     "Trying to send unimplemented non-dialog request OPTIONS!");
   }
   else {
-    qWarning() << "ERROR: Trying to send a non-dialog request of type which is a dialog request!";
+    printDebugObject(DEBUG_ERROR, this, "SIP Request Sending",
+                     "Trying to send a non-dialog request of type which is a dialog request!");
   }
 }
 
@@ -738,7 +742,8 @@ void SIPTransactions::destroyDialog(std::shared_ptr<SIPDialogData> dialog)
   Q_ASSERT(dialog != nullptr);
   if(dialog == nullptr)
   {
-    qCritical() << "ERROR: Bad sessionID for destruction: ";
+    printDebugObject(DEBUG_ERROR, this, "Remove Participant SIP",
+                     "Bad sessionID for destruction.");
     return;
   }
   qDebug() << "Destroying dialog:";
diff --git a/src/sip/siptransport.cpp b/src/sip/siptransport.cpp
index 6356826c..7dbc4a88 100644
--- a/src/sip/siptransport.cpp
+++ b/src/sip/siptransport.cpp
@@ -271,7 +271,8 @@ void SIPTransport::networkPackage(QString package)
 
     if(request_match.hasMatch() && response_match.hasMatch())
     {
-      qWarning() << "ERROR: Both the request and response matched, which should not be possible!";
+      printDebugObject(DEBUG_ERROR, this, "SIP Receive",
+                       "Both the request and response matched, which should not be possible!");
       return;
     }
 
@@ -589,7 +590,7 @@ QString SIPTransport::addContent(QList<SIPField>& fields, bool haveContent, cons
   }
   else if(!includeContentLengthField(fields, 0))
   {
-    qWarning() << "ERROR: Could not add content-length field to sip message!";
+    printDebugObject(DEBUG_ERROR, this, "SIP Send Content", "Could not add content-length field to sip message!");
   }
   return sdp_str;
 }
diff --git a/src/tcpconnection.cpp b/src/tcpconnection.cpp
index 64e920e0..77de99ad 100644
--- a/src/tcpconnection.cpp
+++ b/src/tcpconnection.cpp
@@ -1,5 +1,7 @@
 #include "tcpconnection.h"
 
+#include "common.h"
+
 #include <QDataStream>
 #include <QtConcurrent/QtConcurrent>
 
@@ -73,7 +75,8 @@ void TCPConnection::sendPacket(const QString &data)
   }
   else
   {
-    qWarning() << "Warning: Not sending message, because sender has been shut down.";
+    printDebugObject(DEBUG_WARNING, this, "TCP Send",
+                     "Not sending message, because sender has been shut down.");
   }
 }
 
@@ -95,7 +98,7 @@ bool TCPConnection::connectLoop()
 
   if (!socket_)
   {
-    qWarning() << "ERROR: Socket not initialized before connection";
+    printDebugObject(DEBUG_ERROR, this, "TCP Connect", "Socket not initialized before connection");
     return false;
   }
 
@@ -105,6 +108,7 @@ bool TCPConnection::connectLoop()
     if(!socket_->setSocketDescriptor(socketDescriptor_))
     {
       qCritical() << "ERROR: Could not set socket descriptor for existing connection";
+      printDebugObject(DEBUG_ERROR, this, "Video Process", "Could not set socket descriptor for existing connection.");
       return false;
     }
   }
@@ -142,7 +146,7 @@ void TCPConnection::run()
 
   if(eventDispatcher() == nullptr)
   {
-    qWarning() << "WARNING: Sorry no event dispatcher for this connection.";
+    printDebugObject(DEBUG_WARNING, this, "TCP Connect", "No event dispatcher for this connection.");
     return;
   }
   while(active_)
@@ -179,7 +183,7 @@ void TCPConnection::run()
       }
       else if(socket_->bytesAvailable() > TOO_LARGE_AMOUNT_OF_DATA)
       {
-        qWarning() << "Flushing the socket because of too much data!";
+        printDebugObject(DEBUG_WARNING, this, "TCP Receive", "Flushing the socket because of too much data!");
         socket_->flush();
       }
 
@@ -217,7 +221,8 @@ void TCPConnection::bufferToSocket()
 
   if(buffer_.size() > TOO_LARGE_AMOUNT_OF_DATA)
   {
-    qWarning() << "We are sending too much stuff to the other end:" << buffer_.size();
+    printDebugObject(DEBUG_WARNING, this, "TCP Sending", "We are sending too much stuff to the other end",
+                    {"Buffer size"}, {QString::number(buffer_.size())});
   }
 
   QString message = buffer_.front();
@@ -259,6 +264,8 @@ void TCPConnection::printError(int socketError, const QString &message)
 {
   qWarning() << "ERROR. Socket error" << socketError
              << "Error:" << message;
+  printDebugObject(DEBUG_ERROR, this, "TCP", "Socket Error",
+                  {"Code", "Message"}, {QString::number(socketError), message});
 }
 
 void TCPConnection::printBytesWritten(qint64 bytes)
diff --git a/src/video/cameraframegrabber.cpp b/src/video/cameraframegrabber.cpp
index b4b63fee..01137a17 100644
--- a/src/video/cameraframegrabber.cpp
+++ b/src/video/cameraframegrabber.cpp
@@ -1,5 +1,7 @@
 #include "cameraframegrabber.h"
 
+#include "common.h"
+
 #include <QDebug>
 
 CameraFrameGrabber::CameraFrameGrabber(QObject *parent) :
@@ -12,7 +14,7 @@ bool CameraFrameGrabber::present(const QVideoFrame &frame)
     emit frameAvailable(frame);
     return true;
   }
-  qWarning() << "Not a valid frame";
+  printDebugObject(DEBUG_WARNING, this, "Video process", "Not a valid frame");
   return false;
 }
 
diff --git a/src/video/displayfilter.cpp b/src/video/displayfilter.cpp
index 400415b9..1fd2e9b2 100644
--- a/src/video/displayfilter.cpp
+++ b/src/video/displayfilter.cpp
@@ -3,6 +3,8 @@
 #include "gui/videointerface.h"
 #include "statisticsinterface.h"
 
+#include "common.h"
+
 #include <QImage>
 #include <QtDebug>
 #include <QDateTime>
@@ -66,8 +68,9 @@ void DisplayFilter::process()
       format = QImage::Format_Invalid;
       break;
     default:
-      qCritical() << "DispF: Wrong type of display input:" << input->type;
-       format = QImage::Format_Invalid;
+      printDebugObject(DEBUG_ERROR, this, "Video",
+                       "Wrong type of display input.", {"Type"}, {QString::number(input->type)});
+      format = QImage::Format_Invalid;
       break;
     }
 
diff --git a/src/video/kvazaarfilter.cpp b/src/video/kvazaarfilter.cpp
index 04a9df65..f9532048 100644
--- a/src/video/kvazaarfilter.cpp
+++ b/src/video/kvazaarfilter.cpp
@@ -51,7 +51,7 @@ bool KvazaarFilter::init()
   api_ = kvz_api_get(8);
   if(!api_)
   {
-    qCritical() << getName() << "failed to retrieve Kvazaar API";
+    printDebugObject(DEBUG_ERROR, this, "Initiate Video", "Failed to retrieve Kvazaar API.");
     return false;
   }
   config_ = api_->config_alloc();
@@ -59,7 +59,7 @@ bool KvazaarFilter::init()
 
   if(!config_)
   {
-    qCritical() << getName() << "failed to allocate Kvazaar config";
+    printDebugObject(DEBUG_ERROR, this, "Initiate Video", "Failed to allocate Kvazaar config.");
     return false;
   }
   QSettings settings("kvazzup.ini", QSettings::IniFormat);
@@ -102,7 +102,7 @@ bool KvazaarFilter::init()
 
   if(!enc_)
   {
-    qCritical() << getName() << "failed to open Kvazaar encoder";
+    printDebugObject(DEBUG_ERROR, this, "Video Process", "Failed to open Kvazaar encoder.");
     return false;
   }
 
@@ -110,11 +110,11 @@ bool KvazaarFilter::init()
 
   if(!input_pic_)
   {
-    qCritical() << getName() << "could not allocate input picture";
+    printDebugObject(DEBUG_ERROR, this, "Initiate Video", "Could not allocate input picture.");
     return false;
   }
 
-  qDebug() << getName() << "iniation success";
+  qDebug() << getName() << "iniation succeeded.";
   return true;
 }
 
@@ -147,7 +147,7 @@ void KvazaarFilter::process()
   {
     if(!input_pic_)
     {
-      qCritical() << getName() << "input picture was not allocated correctly";
+      printDebugObject(DEBUG_ERROR, this, "Video Process", "Input picture was not allocated correctly.");
       break;
     }
 
diff --git a/src/video/openhevcfilter.cpp b/src/video/openhevcfilter.cpp
index ae3760a3..76afd112 100644
--- a/src/video/openhevcfilter.cpp
+++ b/src/video/openhevcfilter.cpp
@@ -1,5 +1,7 @@
 #include "openhevcfilter.h"
 
+#include "common.h"
+
 #include <QDebug>
 #include <QSettings>
 
@@ -21,7 +23,7 @@ bool OpenHEVCFilter::init()
   libOpenHevcSetDebugMode(handle_, 0);
   if(libOpenHevcStartDecoder(handle_) == -1)
   {
-    qCritical() << getName() << "ERROR: failed to start decoder.";
+    printDebugObject(DEBUG_ERROR, this, "Iniating Video", "Failed to start decoder.");
     return false;
   }
   libOpenHevcSetTemporalLayer_id(handle_, 0);
@@ -130,17 +132,20 @@ void OpenHEVCFilter::process()
         OpenHevc_Frame openHevcFrame;
         if( gotPicture == -1)
         {
-          qCritical() << getName() << " error while decoding.";
+          printDebugObject(DEBUG_ERROR, this, "Video Incoming", "Error while decoding.");
         }
         else if(!gotPicture && frame->data_size >= 2)
         {
           const unsigned char *buff2 = frame->data.get();
           qWarning() << "Warning: Could not decode video frame. NAL type:" <<
                         buff2[0] << buff2[1] << buff2[2] << buff2[3] << (buff2[4] >> 1);
+          printDebugObject(DEBUG_WARNING, this, "Video incoming", "Could not decode video frame.",
+                          {"NAL type"}, {QString() + QString(buff2[0]) + QString(buff2[1])
+                                         + QString(buff2[2]) + QString(buff2[3]) + QString(buff2[4] >> 1) });
         }
         else if( libOpenHevcGetOutput(handle_, gotPicture, &openHevcFrame) == -1 )
         {
-          qCritical() << getName() << " failed to get output.";
+          printDebugObject(DEBUG_ERROR, this, "Video Incoming", "Failed to get output.");
         }
         else
         {
diff --git a/ui/customSettings.ui b/ui/customSettings.ui
index 2d37a969..8380b0aa 100644
--- a/ui/customSettings.ui
+++ b/ui/customSettings.ui
@@ -291,29 +291,74 @@
        <string>HEVC</string>
       </attribute>
       <layout class="QGridLayout" name="gridLayout_2">
-       <item row="4" column="2">
-        <widget class="QSpinBox" name="qp">
-         <property name="maximumSize">
+       <item row="16" column="0" colspan="3">
+        <widget class="Line" name="line_4">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+        </widget>
+       </item>
+       <item row="8" column="0" colspan="2">
+        <widget class="QLabel" name="slice_label">
+         <property name="text">
+          <string>Slices (depends on WPP)</string>
+         </property>
+        </widget>
+       </item>
+       <item row="2" column="0" colspan="2">
+        <widget class="QLabel" name="Preset">
+         <property name="text">
+          <string>preset</string>
+         </property>
+        </widget>
+       </item>
+       <item row="18" column="1" colspan="2">
+        <spacer name="verticalSpacer_5">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeType">
+          <enum>QSizePolicy::Preferred</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
           <size>
-           <width>64</width>
-           <height>24</height>
+           <width>20</width>
+           <height>40</height>
           </size>
          </property>
-         <property name="toolTip">
-          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Quantization parameter&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+        </spacer>
+       </item>
+       <item row="12" column="1">
+        <widget class="QLineEdit" name="parameter_name"/>
+       </item>
+       <item row="17" column="0" colspan="2">
+        <widget class="QLabel" name="label_2">
+         <property name="text">
+          <string>Threads</string>
          </property>
-         <property name="maximum">
-          <number>51</number>
+        </widget>
+       </item>
+       <item row="1" column="0" colspan="3">
+        <widget class="Line" name="line">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
          </property>
-         <property name="value">
-          <number>27</number>
+        </widget>
+       </item>
+       <item row="11" column="2">
+        <widget class="QLabel" name="label_5">
+         <property name="text">
+          <string>Value</string>
          </property>
         </widget>
        </item>
-       <item row="16" column="0" colspan="2">
-        <widget class="QLabel" name="label_2">
+       <item row="8" column="2">
+        <widget class="QCheckBox" name="slices">
          <property name="text">
-          <string>Threads</string>
+          <string/>
+         </property>
+         <property name="checked">
+          <bool>true</bool>
          </property>
         </widget>
        </item>
@@ -324,14 +369,43 @@
          </property>
         </widget>
        </item>
-       <item row="7" column="0" colspan="2">
-        <widget class="QLabel" name="Intra">
+       <item row="12" column="0">
+        <widget class="QPushButton" name="add_parameter">
          <property name="text">
-          <string>Intra period</string>
+          <string>Add parameter</string>
          </property>
         </widget>
        </item>
-       <item row="14" column="0" colspan="2">
+       <item row="3" column="0" colspan="2">
+        <widget class="QLabel" name="kvz_threads_label">
+         <property name="text">
+          <string>Threads</string>
+         </property>
+        </widget>
+       </item>
+       <item row="12" column="2">
+        <widget class="QLineEdit" name="parameter_value"/>
+       </item>
+       <item row="4" column="2">
+        <widget class="QSpinBox" name="qp">
+         <property name="maximumSize">
+          <size>
+           <width>64</width>
+           <height>24</height>
+          </size>
+         </property>
+         <property name="toolTip">
+          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Quantization parameter&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+         </property>
+         <property name="maximum">
+          <number>51</number>
+         </property>
+         <property name="value">
+          <number>27</number>
+         </property>
+        </widget>
+       </item>
+       <item row="15" column="0" colspan="2">
         <widget class="QLabel" name="OpenHEVC">
          <property name="font">
           <font>
@@ -345,21 +419,7 @@
          </property>
         </widget>
        </item>
-       <item row="15" column="0" colspan="3">
-        <widget class="Line" name="line_4">
-         <property name="orientation">
-          <enum>Qt::Horizontal</enum>
-         </property>
-        </widget>
-       </item>
-       <item row="3" column="0" colspan="2">
-        <widget class="QLabel" name="kvz_threads_label">
-         <property name="text">
-          <string>Threads</string>
-         </property>
-        </widget>
-       </item>
-       <item row="9" column="0" colspan="3">
+       <item row="10" column="0" colspan="3">
         <widget class="QTableWidget" name="custom_parameters">
          <property name="columnCount">
           <number>2</number>
@@ -388,95 +448,46 @@
          </column>
         </widget>
        </item>
-       <item row="5" column="2">
-        <widget class="QCheckBox" name="wpp">
-         <property name="toolTip">
-          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Wavefront Parallel Processing&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-         </property>
-         <property name="text">
-          <string/>
-         </property>
-         <property name="checked">
-          <bool>true</bool>
-         </property>
-         <property name="tristate">
-          <bool>false</bool>
-         </property>
-        </widget>
-       </item>
-       <item row="6" column="2">
-        <widget class="QLineEdit" name="vps">
+       <item row="3" column="2">
+        <widget class="QLineEdit" name="kvz_threads">
          <property name="maximumSize">
           <size>
-           <width>24</width>
+           <width>48</width>
            <height>16777215</height>
           </size>
          </property>
          <property name="text">
-          <string>1</string>
-         </property>
-        </widget>
-       </item>
-       <item row="1" column="0" colspan="3">
-        <widget class="Line" name="line">
-         <property name="orientation">
-          <enum>Qt::Horizontal</enum>
+          <string>4</string>
          </property>
-        </widget>
-       </item>
-       <item row="5" column="0" colspan="2">
-        <widget class="QLabel" name="WPP">
-         <property name="text">
-          <string>WPP</string>
+         <property name="maxLength">
+          <number>4</number>
          </property>
         </widget>
        </item>
-       <item row="17" column="1" colspan="2">
-        <spacer name="verticalSpacer_5">
-         <property name="orientation">
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeType">
-          <enum>QSizePolicy::Preferred</enum>
+       <item row="5" column="2">
+        <widget class="QCheckBox" name="wpp">
+         <property name="toolTip">
+          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Wavefront Parallel Processing&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
          </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>20</width>
-           <height>40</height>
-          </size>
+         <property name="text">
+          <string/>
          </property>
-        </spacer>
-       </item>
-       <item row="7" column="2">
-        <widget class="QLineEdit" name="intra">
-         <property name="maximumSize">
-          <size>
-           <width>48</width>
-           <height>16777215</height>
-          </size>
+         <property name="checked">
+          <bool>true</bool>
          </property>
-         <property name="text">
-          <string>64</string>
+         <property name="tristate">
+          <bool>false</bool>
          </property>
         </widget>
        </item>
-       <item row="3" column="2">
-        <widget class="QLineEdit" name="kvz_threads">
-         <property name="maximumSize">
-          <size>
-           <width>48</width>
-           <height>16777215</height>
-          </size>
-         </property>
+       <item row="4" column="0" colspan="2">
+        <widget class="QLabel" name="QP">
          <property name="text">
-          <string>4</string>
-         </property>
-         <property name="maxLength">
-          <number>4</number>
+          <string>QP</string>
          </property>
         </widget>
        </item>
-       <item row="16" column="2">
+       <item row="17" column="2">
         <widget class="QLineEdit" name="openhevc_threads">
          <property name="minimumSize">
           <size>
@@ -498,37 +509,6 @@
          </property>
         </widget>
        </item>
-       <item row="4" column="0" colspan="2">
-        <widget class="QLabel" name="QP">
-         <property name="text">
-          <string>QP</string>
-         </property>
-        </widget>
-       </item>
-       <item row="8" column="2">
-        <widget class="QCheckBox" name="slices">
-         <property name="text">
-          <string/>
-         </property>
-         <property name="checked">
-          <bool>true</bool>
-         </property>
-        </widget>
-       </item>
-       <item row="8" column="0" colspan="2">
-        <widget class="QLabel" name="slice_label">
-         <property name="text">
-          <string>Slices (depends on WPP)</string>
-         </property>
-        </widget>
-       </item>
-       <item row="2" column="0" colspan="2">
-        <widget class="QLabel" name="Preset">
-         <property name="text">
-          <string>preset</string>
-         </property>
-        </widget>
-       </item>
        <item row="0" column="0" colspan="2">
         <widget class="QLabel" name="Kvazaar">
          <property name="font">
@@ -543,6 +523,20 @@
          </property>
         </widget>
        </item>
+       <item row="5" column="0" colspan="2">
+        <widget class="QLabel" name="WPP">
+         <property name="text">
+          <string>WPP</string>
+         </property>
+        </widget>
+       </item>
+       <item row="7" column="0" colspan="2">
+        <widget class="QLabel" name="Intra">
+         <property name="text">
+          <string>Intra period</string>
+         </property>
+        </widget>
+       </item>
        <item row="2" column="2">
         <widget class="QComboBox" name="preset">
          <property name="maximumSize">
@@ -608,30 +602,50 @@
          </item>
         </widget>
        </item>
-       <item row="10" column="1">
-        <widget class="QLabel" name="label_4">
+       <item row="7" column="2">
+        <widget class="QLineEdit" name="intra">
+         <property name="maximumSize">
+          <size>
+           <width>48</width>
+           <height>16777215</height>
+          </size>
+         </property>
          <property name="text">
-          <string>Parameter name</string>
+          <string>64</string>
          </property>
         </widget>
        </item>
-       <item row="10" column="2">
-        <widget class="QLabel" name="label_5">
+       <item row="6" column="2">
+        <widget class="QLineEdit" name="vps">
+         <property name="maximumSize">
+          <size>
+           <width>24</width>
+           <height>16777215</height>
+          </size>
+         </property>
          <property name="text">
-          <string>Value</string>
+          <string>1</string>
          </property>
         </widget>
        </item>
        <item row="11" column="1">
-        <widget class="QLineEdit" name="parameter_name"/>
-       </item>
-       <item row="11" column="2">
-        <widget class="QLineEdit" name="parameter_value"/>
+        <widget class="QLabel" name="label_4">
+         <property name="text">
+          <string>Parameter name</string>
+         </property>
+        </widget>
        </item>
-       <item row="11" column="0">
-        <widget class="QPushButton" name="add_parameter">
+       <item row="9" column="0" colspan="3">
+        <widget class="QLabel" name="label_3">
+         <property name="font">
+          <font>
+           <pointsize>11</pointsize>
+           <weight>75</weight>
+           <bold>true</bold>
+          </font>
+         </property>
          <property name="text">
-          <string>Add parameter</string>
+          <string>Custom Parameters</string>
          </property>
         </widget>
        </item>
@@ -750,6 +764,13 @@
   </layout>
  </widget>
  <tabstops>
+  <tabstop>format_box</tabstop>
+  <tabstop>resolution</tabstop>
+  <tabstop>framerate_box</tabstop>
+  <tabstop>yuv_threads</tabstop>
+  <tabstop>opengl</tabstop>
+  <tabstop>flip</tabstop>
+  <tabstop>live555Copy</tabstop>
   <tabstop>preset</tabstop>
   <tabstop>kvz_threads</tabstop>
   <tabstop>qp</tabstop>
@@ -759,20 +780,15 @@
   <tabstop>slices</tabstop>
   <tabstop>custom_parameters</tabstop>
   <tabstop>parameter_name</tabstop>
+  <tabstop>parameter_value</tabstop>
+  <tabstop>add_parameter</tabstop>
   <tabstop>openhevc_threads</tabstop>
+  <tabstop>channels</tabstop>
+  <tabstop>comboBox_2</tabstop>
+  <tabstop>comboBox</tabstop>
   <tabstop>custom_ok</tabstop>
   <tabstop>custom_close</tabstop>
-  <tabstop>opengl</tabstop>
-  <tabstop>resolution</tabstop>
-  <tabstop>framerate_box</tabstop>
-  <tabstop>live555Copy</tabstop>
-  <tabstop>format_box</tabstop>
   <tabstop>Advanced</tabstop>
-  <tabstop>flip</tabstop>
-  <tabstop>yuv_threads</tabstop>
-  <tabstop>comboBox</tabstop>
-  <tabstop>channels</tabstop>
-  <tabstop>comboBox_2</tabstop>
  </tabstops>
  <resources/>
  <connections/>

From 9b479156ca8740f010192e41234126862bb95a86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joni=20R=C3=A4s=C3=A4nen?= <joni.rasanen@tut.fi>
Date: Mon, 13 May 2019 11:07:08 +0300
Subject: [PATCH 23/24] refactor(Global): Renamed printDebugObject to just
 overload of printDebug.

---
 src/audio/audiocapturefilter.cpp | 14 +++++++-------
 src/audio/audiooutput.cpp        |  4 ++--
 src/audio/opusdecoderfilter.cpp  |  4 ++--
 src/audio/opusencoderfilter.cpp  |  6 +++---
 src/audio/speexaecfilter.cpp     |  2 +-
 src/common.cpp                   |  9 ++++-----
 src/common.h                     |  7 ++++---
 src/filter.cpp                   | 12 ++++++------
 src/gui/conferenceview.cpp       | 27 +++++++++++++--------------
 src/gui/contactlist.cpp          |  2 +-
 src/gui/statisticswindow.cpp     |  2 +-
 src/gui/videodrawhelper.cpp      |  2 +-
 src/mediamanager.cpp             |  8 ++++----
 src/scalefilter.cpp              |  2 +-
 src/sip/sipdialogclient.cpp      |  4 ++--
 src/sip/sipservertransaction.cpp |  4 ++--
 src/sip/siptransactions.cpp      | 10 +++++-----
 src/sip/siptransport.cpp         |  6 +++---
 src/tcpconnection.cpp            | 17 ++++++++---------
 src/video/cameraframegrabber.cpp |  2 +-
 src/video/displayfilter.cpp      |  4 ++--
 src/video/kvazaarfilter.cpp      | 10 +++++-----
 src/video/openhevcfilter.cpp     | 12 ++++++------
 23 files changed, 84 insertions(+), 86 deletions(-)

diff --git a/src/audio/audiocapturefilter.cpp b/src/audio/audiocapturefilter.cpp
index 71b1fad4..5b927355 100644
--- a/src/audio/audiocapturefilter.cpp
+++ b/src/audio/audiocapturefilter.cpp
@@ -25,17 +25,17 @@ AudioCaptureFilter::~AudioCaptureFilter(){}
 
 bool AudioCaptureFilter::init()
 {
-  printDebugObject(DEBUG_NORMAL, this, "Iniating", "Initializing audio capture filter.");
+  printDebug(DEBUG_NORMAL, this, "Iniating", "Initializing audio capture filter.");
   QAudioDeviceInfo info(deviceInfo_);
 
   for(auto device : QAudioDeviceInfo::availableDevices(QAudio::AudioInput))
   {
-    printDebugObject(DEBUG_NORMAL, this, "Iniating", "", {"Available audio recording devices"}, {device.deviceName()});
+    printDebug(DEBUG_NORMAL, this, "Iniating", "", {"Available audio recording devices"}, {device.deviceName()});
   }
-  printDebugObject(DEBUG_NORMAL, this, "Iniating", "", {"Chosen Device"}, {info.deviceName()});
+  printDebug(DEBUG_NORMAL, this, "Iniating", "", {"Chosen Device"}, {info.deviceName()});
 
   if (!info.isFormatSupported(format_)) {
-    printDebugObject(DEBUG_WARNING, this, "Iniating", "Default audio format not supported - trying to use nearest");
+    printDebug(DEBUG_WARNING, this, "Iniating", "Default audio format not supported - trying to use nearest");
     format_ = info.nearestFormat(format_);
   }
 
@@ -49,7 +49,7 @@ bool AudioCaptureFilter::init()
   device_  = new AudioCaptureDevice(format_, this);
 
   createAudioInput();
-  printDebugObject(DEBUG_NORMAL, this, "Iniating", "Audio initializing completed.");
+  printDebug(DEBUG_NORMAL, this, "Iniating", "Audio initializing completed.");
   return true;
 }
 
@@ -68,7 +68,7 @@ void AudioCaptureFilter::readMore()
 {
   if (!audioInput_)
   {
-    printDebugObject(DEBUG_WARNING, this, "Audio input", "No audio input in readMore");
+    printDebug(DEBUG_WARNING, this, "Audio input", "No audio input in readMore");
     return;
   }
   qint64 len = audioInput_->bytesReady();
@@ -136,7 +136,7 @@ void AudioCaptureFilter::stop()
 // changing of audio device mid stream.
 void AudioCaptureFilter::deviceChanged(int index)
 {
-  printDebugObject(DEBUG_WARNING, this, "Settings", "audiocapturefilter device change not implemented fully.");
+  printDebug(DEBUG_WARNING, this, "Settings", "audiocapturefilter device change not implemented fully.");
 
   device_->stop();
   audioInput_->stop();
diff --git a/src/audio/audiooutput.cpp b/src/audio/audiooutput.cpp
index edea19bf..050f9049 100644
--- a/src/audio/audiooutput.cpp
+++ b/src/audio/audiooutput.cpp
@@ -25,7 +25,7 @@ void AudioOutput::initializeAudio(QAudioFormat format)
 {
   QAudioDeviceInfo info(device_);
   if (!info.isFormatSupported(format)) {
-    printDebugObject(DEBUG_WARNING, this, "Iniating", "Default format not supported - trying to use nearest.");
+    printDebug(DEBUG_WARNING, this, "Iniating", "Default format not supported - trying to use nearest.");
     format_ = info.nearestFormat(format);
   }
   else
@@ -57,7 +57,7 @@ void AudioOutput::createAudioOutput()
 
 void AudioOutput::deviceChanged(int index)
 {
-  printDebugObject(DEBUG_WARNING, this, "Audio", "Audio output device change not implemented fully.",
+  printDebug(DEBUG_WARNING, this, "Audio", "Audio output device change not implemented fully.",
     {"Index"}, {QString::number(index)});
 
   //m_pushTimer->stop();
diff --git a/src/audio/opusdecoderfilter.cpp b/src/audio/opusdecoderfilter.cpp
index 080bb373..a4e62a04 100644
--- a/src/audio/opusdecoderfilter.cpp
+++ b/src/audio/opusdecoderfilter.cpp
@@ -28,7 +28,7 @@ bool OpusDecoderFilter::init()
 
   if(error)
   {
-    printDebugObject(DEBUG_WARNING, this, "Iniating", "Failed to initialize opus decoder.",
+    printDebug(DEBUG_WARNING, this, "Iniating", "Failed to initialize opus decoder.",
       {"Errorcode"}, {QString::number(error)});
     return false;
   }
@@ -62,7 +62,7 @@ void OpusDecoderFilter::process()
     }
     else
     {
-      printDebugObject(DEBUG_WARNING, this, "Process", "Failed to encode audio frame.", {"Error"}, {QString::number(len)});
+      printDebug(DEBUG_WARNING, this, "Process", "Failed to encode audio frame.", {"Error"}, {QString::number(len)});
     }
     input = getInput();
   }
diff --git a/src/audio/opusencoderfilter.cpp b/src/audio/opusencoderfilter.cpp
index eeab7f44..d6338fe1 100644
--- a/src/audio/opusencoderfilter.cpp
+++ b/src/audio/opusencoderfilter.cpp
@@ -35,7 +35,7 @@ bool OpusEncoderFilter::init()
 
   if(error)
   {
-    printDebugObject(DEBUG_WARNING, this, "Iniating", "Failed to initialize opus encoder.",
+    printDebug(DEBUG_WARNING, this, "Iniating", "Failed to initialize opus encoder.",
       {"Errorcode"}, {QString::number(error)});
     return false;
   }
@@ -60,7 +60,7 @@ void OpusEncoderFilter::process()
       len = opus_encode(enc_, (opus_int16*)input->data.get()+i/2, numberOfSamples_, opusOutput_ + pos, max_data_bytes_ - pos);
       if(len <= 0)
       {
-        printDebugObject(DEBUG_WARNING, this, "Process", "Failed to encode audio",
+        printDebug(DEBUG_WARNING, this, "Process", "Failed to encode audio",
           {"Errorcode:"}, {QString::number(len)});
         break;
       }
@@ -89,7 +89,7 @@ void OpusEncoderFilter::process()
     }
     else
     {
-      printDebugObject(DEBUG_WARNING, this, "Process", "Failed to encode audio frame.",
+      printDebug(DEBUG_WARNING, this, "Process", "Failed to encode audio frame.",
         {"Frame length"}, {QString::number(input->data_size)});
     }
     input = getInput();
diff --git a/src/audio/speexaecfilter.cpp b/src/audio/speexaecfilter.cpp
index 7c800bd1..2cfaf95f 100644
--- a/src/audio/speexaecfilter.cpp
+++ b/src/audio/speexaecfilter.cpp
@@ -74,7 +74,7 @@ void SpeexAECFilter::process()
       }
       else
       {
-        printDebugObject(DEBUG_WARNING, this, "Process", "AEC received too much output before input.",
+        printDebug(DEBUG_WARNING, this, "Process", "AEC received too much output before input.",
           {"input", "output"}, {QString::number(in_), QString::number(out_)});
         break;
       }
diff --git a/src/common.cpp b/src/common.cpp
index 74e59b17..e172d207 100644
--- a/src/common.cpp
+++ b/src/common.cpp
@@ -40,16 +40,15 @@ QString generateRandomString(uint32_t length)
 }
 
 
-void printDebugObject(DebugType type, QObject* object,
-                      QString context, QString description,
-                      QStringList valueNames, QStringList values)
+void printDebug(DebugType type, QObject* object,
+                QString context, QString description,
+                QStringList valueNames, QStringList values)
 {
   printDebug(type, object->metaObject()->className(), context, description, valueNames, values);
 }
 
 void printDebug(DebugType type, QString className, QString context, QString description, QStringList valueNames, QStringList values)
 {
-
   QString valueString = "";
   if (valueNames.size() == values.size())
   {
@@ -90,7 +89,7 @@ void printDebug(DebugType type, QString className, QString context, QString desc
     qWarning().nospace().noquote() << "WARNING: --------------------------------------------";
     qWarning().nospace().noquote() << context << ", " << className << ": "
                                  << description << " " << valueString;
-    qWarning().nospace().noquote() << "-------------------------------------------- WARNING";
+    qWarning().nospace() << "\r\n" << "-------------------------------------------- WARNING";
     break;
   }
   case DEBUG_PEER_ERROR:
diff --git a/src/common.h b/src/common.h
index 25a5f404..0bb6fe1b 100644
--- a/src/common.h
+++ b/src/common.h
@@ -15,9 +15,9 @@ enum DebugType{DEBUG_NORMAL, DEBUG_ERROR, DEBUG_WARNING, DEBUG_PEER_ERROR};
 
 
 // use this if printing happens inside class derived from QObject which is most Qt-classes
-void printDebugObject(DebugType type, QObject* object,
-                      QString context = "", QString description = "",
-                      QStringList valueNames = {}, QStringList values = {});
+void printDebug(DebugType type, QObject* object,
+                QString context = "", QString description = "",
+                QStringList valueNames = {}, QStringList values = {});
 
 // print debug information
 // DEBUG_NORMAL is for one time informational debug printing.
@@ -27,3 +27,4 @@ void printDebugObject(DebugType type, QObject* object,
 void printDebug(DebugType type, QString className,
                 QString context = "", QString description = "",
                 QStringList valueNames = {}, QStringList values = {});
+
diff --git a/src/filter.cpp b/src/filter.cpp
index 7a1fe830..a915835d 100644
--- a/src/filter.cpp
+++ b/src/filter.cpp
@@ -61,7 +61,7 @@ void Filter::removeOutConnection(std::shared_ptr<Filter> out)
 
   if(!removed)
   {
-    printDebugObject(DEBUG_WARNING, this, "Uninit", "Did not succeed at removing outconnection.");
+    printDebug(DEBUG_WARNING, this, "Uninit", "Did not succeed at removing outconnection.");
   }
 }
 
@@ -82,7 +82,7 @@ void Filter::putInput(std::unique_ptr<Data> data)
      || data->type == NONE
      || data->data_size == 0)
   {
-    printDebugObject(DEBUG_WARNING, this, "Processing", "Discarding bad data.");
+    printDebug(DEBUG_WARNING, this, "Processing", "Discarding bad data.");
     return;
   }
 
@@ -125,7 +125,7 @@ void Filter::putInput(std::unique_ptr<Data> data)
     {
       if(inBuffer_[0]->type == OPUSAUDIO)
       {
-        printDebugObject(DEBUG_WARNING, this, "Processing", "Should input Null pointer to decoder.");
+        printDebug(DEBUG_WARNING, this, "Processing", "Should input Null pointer to decoder.");
       }
       inBuffer_.pop_front(); // discard the oldest
     }
@@ -162,7 +162,7 @@ void Filter::sendOutput(std::unique_ptr<Data> output)
 
   if(outDataCallbacks_.size() == 0 && outConnections_.size() == 0)
   {
-    printDebugObject(DEBUG_WARNING, this, "Processing", "Trying to send output data without outconnections.");
+    printDebug(DEBUG_WARNING, this, "Processing", "Trying to send output data without outconnections.");
     return;
   }
 
@@ -245,7 +245,7 @@ Data* Filter::shallowDataCopy(Data* original)
 
     return copy;
   }
-  printDebugObject(DEBUG_WARNING, this, "Processing", "Trying to copy nullptr Data pointer.");
+  printDebug(DEBUG_WARNING, this, "Processing", "Trying to copy nullptr Data pointer.");
   return nullptr;
 }
 
@@ -260,7 +260,7 @@ Data* Filter::deepDataCopy(Data* original)
 
     return copy;
   }
-  printDebugObject(DEBUG_WARNING, this, "Processing", "Trying to copy nullptr Data pointer.");
+  printDebug(DEBUG_WARNING, this, "Processing", "Trying to copy nullptr Data pointer.");
   return nullptr;
 }
 
diff --git a/src/gui/conferenceview.cpp b/src/gui/conferenceview.cpp
index a7e8ed74..08dcb4c5 100644
--- a/src/gui/conferenceview.cpp
+++ b/src/gui/conferenceview.cpp
@@ -41,7 +41,7 @@ void ConferenceView::callingTo(uint32_t sessionID, QString name)
   Q_ASSERT(sessionID);
   if(activeCalls_.find(sessionID) != activeCalls_.end())
   {
-    printDebugObject(DEBUG_WARNING, this, "Outgoing Call", "Outgoing call already has an allocated view.");
+    printDebug(DEBUG_WARNING, this, "Outgoing Call", "Outgoing call already has an allocated view.");
     return;
   }
 
@@ -91,7 +91,7 @@ void ConferenceView::incomingCall(uint32_t sessionID, QString name)
 {
   if(activeCalls_.find(sessionID) != activeCalls_.end())
   {
-    printDebugObject(DEBUG_WARNING, this, "Incoming Call", "Incoming call already has an allocated view.",
+    printDebug(DEBUG_WARNING, this, "Incoming Call", "Incoming call already has an allocated view.",
       {"SessionID"}, {QString::number(sessionID)});
     return;
   }
@@ -188,9 +188,9 @@ void ConferenceView::attachWidget(uint32_t sessionID, QWidget* view)
   }
   else {
 
-    printDebugObject(DEBUG_ERROR, this, "Incoming Call",
-                     "Trying to attach fullscreenview back to layout when sessionID does not exist in conference view.",
-                    {"SessionID"}, {QString::number(sessionID)});
+    printDebug(DEBUG_ERROR, this, "Incoming Call",
+               "Trying to attach fullscreenview back to layout when sessionID does not exist in conference view.",
+               {"SessionID"}, {QString::number(sessionID)});
   }
   layoutMutex_.unlock();
 }
@@ -215,9 +215,9 @@ void ConferenceView::detachWidget(uint32_t sessionID, QWidget* view)
   }
   else
   {
-    printDebugObject(DEBUG_ERROR, this, "Remove Participant",
-                     "Trying to detach fullscreenview from the layout when the sessionID does not exist in  conference view.",
-                    {"SessionID"}, {QString::number(sessionID)});
+    printDebug(DEBUG_ERROR, this, "Remove Participant",
+               "Trying to detach fullscreenview from the layout when the sessionID does not exist in  conference view.",
+               {"SessionID"}, {QString::number(sessionID)});
   }
 
   layoutMutex_.unlock();
@@ -238,7 +238,7 @@ void ConferenceView::addVideoStream(uint32_t sessionID, std::shared_ptr<Videovie
   else if(activeCalls_[sessionID]->state != VIEWASKING
           && activeCalls_[sessionID]->state != VIEWWAITINGPEER)
   {
-    printDebugObject(DEBUG_WARNING, this, "Add Participant",
+    printDebug(DEBUG_WARNING, this, "Add Participant",
                      "Activating stream with wrong state.",
                     {"SessionID", "State"},
                     {QString::number(sessionID), QString::number(activeCalls_[sessionID]->state)});
@@ -278,7 +278,7 @@ void ConferenceView::ringing(uint32_t sessionID)
 
   if(activeCalls_.find(sessionID) == activeCalls_.end())
   {
-    printDebugObject(DEBUG_ERROR, this, "Ringing",
+    printDebug(DEBUG_ERROR, this, "Ringing",
                      "Ringing for nonexisting view. View should always exist if this function is called.",
                     {"SessionID"}, {QString::number(sessionID)});
     return;
@@ -291,7 +291,7 @@ void ConferenceView::ringing(uint32_t sessionID)
   }
   else
   {
-    printDebugObject(DEBUG_ERROR, this, "Ringing", "No incoming call widget exists when it should be ringing.",
+    printDebug(DEBUG_ERROR, this, "Ringing", "No incoming call widget exists when it should be ringing.",
       {"SessionID"},{QString::number(sessionID)});
   }
 }
@@ -301,7 +301,7 @@ bool ConferenceView::removeCaller(uint32_t sessionID)
   if(activeCalls_.find(sessionID) == activeCalls_.end())
   {
     Q_ASSERT(false);
-    printDebugObject(DEBUG_ERROR, this, "Remove Participant",
+    printDebug(DEBUG_ERROR, this, "Remove Participant",
                      "Tried to remove the view of non-existing sessionID!");
   }
   else
@@ -435,8 +435,7 @@ void ConferenceView::accept()
   }
   else
   {
-    qCritical() << "ERROR," << metaObject()->className() << "Couldn't find the invoker for accept";
-    printDebugObject(DEBUG_ERROR, this, "Accept", "Couldn't find the invoker for accept.");
+    printDebug(DEBUG_ERROR, this, "Accept", "Couldn't find the invoker for accept.");
   }
 }
 
diff --git a/src/gui/contactlist.cpp b/src/gui/contactlist.cpp
index 7f55bf97..a5a6f57d 100644
--- a/src/gui/contactlist.cpp
+++ b/src/gui/contactlist.cpp
@@ -143,7 +143,7 @@ void ContactList::removeContact(int index)
 
   if(index == -1  || index >= items_.size())
   {
-    printDebugObject(DEBUG_WARNING, this, "Remove Participant", "Tried to remove a nonexisting contact");
+    printDebug(DEBUG_WARNING, this, "Remove Participant", "Tried to remove a nonexisting contact");
     return;
   }
 
diff --git a/src/gui/statisticswindow.cpp b/src/gui/statisticswindow.cpp
index b5aced91..0f8c5366 100644
--- a/src/gui/statisticswindow.cpp
+++ b/src/gui/statisticswindow.cpp
@@ -88,7 +88,7 @@ void StatisticsWindow::addNextInterface(StatisticsInterface* next)
 {
   Q_UNUSED(next)
   Q_ASSERT(false && "NOT IMPLEMENTED");
-  printDebugObject(DEBUG_ERROR, this, "Stats", "addNextInterface has not been implemented in stat window");
+  printDebug(DEBUG_ERROR, this, "Stats", "addNextInterface has not been implemented in stat window");
 }
 
 void StatisticsWindow::videoInfo(double framerate, QSize resolution)
diff --git a/src/gui/videodrawhelper.cpp b/src/gui/videodrawhelper.cpp
index 0100a1b8..a3b9a377 100644
--- a/src/gui/videodrawhelper.cpp
+++ b/src/gui/videodrawhelper.cpp
@@ -115,7 +115,7 @@ void VideoDrawHelper::updateTargetRect(QWidget* widget)
     Q_ASSERT(lastImage_.data_ptr());
     if(lastImage_.data_ptr() == nullptr)
     {
-      printDebugObject(DEBUG_ERROR, this, "Drawing", "Null pointer in current image!");
+      printDebug(DEBUG_ERROR, this, "Drawing", "Null pointer in current image!");
       return;
     }
 
diff --git a/src/mediamanager.cpp b/src/mediamanager.cpp
index 3ab9c8eb..8a997ff0 100644
--- a/src/mediamanager.cpp
+++ b/src/mediamanager.cpp
@@ -66,7 +66,7 @@ void MediaManager::addParticipant(uint32_t sessionID, std::shared_ptr<SDPMessage
 
   if(peerInfo->timeDescriptions.at(0).startTime != 0 || localInfo->timeDescriptions.at(0).startTime != 0)
   {
-    printDebugObject(DEBUG_ERROR, this, "Add Participant", "Nonzero start-time not supported!");
+    printDebug(DEBUG_ERROR, this, "Add Participant", "Nonzero start-time not supported!");
   }
 
 #if 0
@@ -108,19 +108,19 @@ void MediaManager::addParticipant(uint32_t sessionID, std::shared_ptr<SDPMessage
       // TODO: Make it possible to have a separate ip address for each mediastream by fixing this.
       if(!streamer_->addPeer(ip, sessionID))
       {
-        printDebugObject(DEBUG_ERROR, this, "Add Participant", "Error creating RTP peer. Simultaneous destruction?.");
+        printDebug(DEBUG_ERROR, this, "Add Participant", "Error creating RTP peer. Simultaneous destruction?.");
         return;
       }
     }
     else {
-      printDebugObject(DEBUG_ERROR, this, "Add Participant", "Not supported in media creation.",
+      printDebug(DEBUG_ERROR, this, "Add Participant", "Not supported in media creation.",
                       {"Media type", "address"}, {peerInfo->connection_addrtype, address.toString()});
       return;
     }
   }
   else
   {
-    printDebugObject(DEBUG_ERROR, this, "Add Participant", "What are we using if not the internet!?");
+    printDebug(DEBUG_ERROR, this, "Add Participant", "What are we using if not the internet!?");
     return;
   }
 
diff --git a/src/scalefilter.cpp b/src/scalefilter.cpp
index 120081e2..a9f41389 100644
--- a/src/scalefilter.cpp
+++ b/src/scalefilter.cpp
@@ -46,7 +46,7 @@ void ScaleFilter::process()
       }
       default:
       {
-        printDebugObject(DEBUG_ERROR, this, "Video Process", "Wrong video format for scaler.",
+        printDebug(DEBUG_ERROR, this, "Video Process", "Wrong video format for scaler.",
                         {"Input type"},{QString::number(input->type)});
         format = QImage::Format_Invalid;
         break;
diff --git a/src/sip/sipdialogclient.cpp b/src/sip/sipdialogclient.cpp
index 7bfe01b2..4e365067 100644
--- a/src/sip/sipdialogclient.cpp
+++ b/src/sip/sipdialogclient.cpp
@@ -27,7 +27,7 @@ bool SIPDialogClient::processResponse(SIPResponse &response)
   qDebug() << "Client starts processing response";
   if(!sessionID_)
   {
-    printDebugObject(DEBUG_WARNING, this, "SIP Client Transaction not initialized.");
+    printDebug(DEBUG_WARNING, this, "SIP Client Transaction not initialized.");
     return true;
   }
 
@@ -98,7 +98,7 @@ bool SIPDialogClient::startCall(QString callee)
   Q_ASSERT(sessionID_ != 0);
   if(!sessionID_)
   {
-    printDebugObject(DEBUG_WARNING, this, "SIP Client Transaction not initialized.");
+    printDebug(DEBUG_WARNING, this, "SIP Client Transaction not initialized.");
     return false;
   }
 
diff --git a/src/sip/sipservertransaction.cpp b/src/sip/sipservertransaction.cpp
index a19c16cf..adbe6f3e 100644
--- a/src/sip/sipservertransaction.cpp
+++ b/src/sip/sipservertransaction.cpp
@@ -29,7 +29,7 @@ bool SIPServerTransaction::processRequest(SIPRequest &request)
   Q_ASSERT(transactionUser_ && sessionID_);
   if(!transactionUser_ || sessionID_ == 0)
   {
-    printDebugObject(DEBUG_ERROR, this, "SIP Process Response", "SIP Server transaction not initialized.");
+    printDebug(DEBUG_ERROR, this, "SIP Process Response", "SIP Server transaction not initialized.");
     return false;
   }
 
@@ -94,7 +94,7 @@ void SIPServerTransaction::getResponseMessage(std::shared_ptr<SIPMessageInfo> &o
 {
   if(receivedRequest_ == nullptr)
   {
-    printDebugObject(DEBUG_ERROR, this, "SIP Send Response", "The received request was not set before trying to use it!");
+    printDebug(DEBUG_ERROR, this, "SIP Send Response", "The received request was not set before trying to use it!");
     return;
   }
   copyMessageDetails(receivedRequest_, outMessage);
diff --git a/src/sip/siptransactions.cpp b/src/sip/siptransactions.cpp
index 87a2f8e4..219f46e3 100644
--- a/src/sip/siptransactions.cpp
+++ b/src/sip/siptransactions.cpp
@@ -453,7 +453,7 @@ void SIPTransactions::processSIPRequest(SIPRequest request,
       {
         if(!content.isValid())
         {
-          printDebugObject(DEBUG_ERROR, this, "SIP Process Request",
+          printDebug(DEBUG_ERROR, this, "SIP Process Request",
                            "The SDP content is not valid at processing. Should be detected earlier.");
           return;
         }
@@ -565,7 +565,7 @@ bool SIPTransactions::processSDP(uint32_t sessionID, QVariant& content, QHostAdd
 {
   if(!content.isValid() || dialogs_.find(sessionID) == dialogs_.end())
   {
-    printDebugObject(DEBUG_ERROR, this, "SIP Process SDP",
+    printDebug(DEBUG_ERROR, this, "SIP Process SDP",
                      "The SDP content is not valid at processing. Should be detected earlier.");
     return false;
   }
@@ -705,11 +705,11 @@ void SIPTransactions::sendNonDialogRequest(SIP_URI& uri, RequestType type)
     transport->sendRequest(request, content);
   }
   else if (type == SIP_OPTIONS) {
-    printDebugObject(DEBUG_ERROR, this, "SIP Request Sending",
+    printDebug(DEBUG_ERROR, this, "SIP Request Sending",
                      "Trying to send unimplemented non-dialog request OPTIONS!");
   }
   else {
-    printDebugObject(DEBUG_ERROR, this, "SIP Request Sending",
+    printDebug(DEBUG_ERROR, this, "SIP Request Sending",
                      "Trying to send a non-dialog request of type which is a dialog request!");
   }
 }
@@ -742,7 +742,7 @@ void SIPTransactions::destroyDialog(std::shared_ptr<SIPDialogData> dialog)
   Q_ASSERT(dialog != nullptr);
   if(dialog == nullptr)
   {
-    printDebugObject(DEBUG_ERROR, this, "Remove Participant SIP",
+    printDebug(DEBUG_ERROR, this, "Remove Participant SIP",
                      "Bad sessionID for destruction.");
     return;
   }
diff --git a/src/sip/siptransport.cpp b/src/sip/siptransport.cpp
index 7dbc4a88..ea9a09e3 100644
--- a/src/sip/siptransport.cpp
+++ b/src/sip/siptransport.cpp
@@ -271,8 +271,8 @@ void SIPTransport::networkPackage(QString package)
 
     if(request_match.hasMatch() && response_match.hasMatch())
     {
-      printDebugObject(DEBUG_ERROR, this, "SIP Receive",
-                       "Both the request and response matched, which should not be possible!");
+      printDebug(DEBUG_ERROR, this, "SIP Receive",
+                 "Both the request and response matched, which should not be possible!");
       return;
     }
 
@@ -590,7 +590,7 @@ QString SIPTransport::addContent(QList<SIPField>& fields, bool haveContent, cons
   }
   else if(!includeContentLengthField(fields, 0))
   {
-    printDebugObject(DEBUG_ERROR, this, "SIP Send Content", "Could not add content-length field to sip message!");
+    printDebug(DEBUG_ERROR, this, "SIP Send Content", "Could not add content-length field to sip message!");
   }
   return sdp_str;
 }
diff --git a/src/tcpconnection.cpp b/src/tcpconnection.cpp
index 77de99ad..38a498a6 100644
--- a/src/tcpconnection.cpp
+++ b/src/tcpconnection.cpp
@@ -75,7 +75,7 @@ void TCPConnection::sendPacket(const QString &data)
   }
   else
   {
-    printDebugObject(DEBUG_WARNING, this, "TCP Send",
+    printDebug(DEBUG_WARNING, this, "TCP Send",
                      "Not sending message, because sender has been shut down.");
   }
 }
@@ -98,7 +98,7 @@ bool TCPConnection::connectLoop()
 
   if (!socket_)
   {
-    printDebugObject(DEBUG_ERROR, this, "TCP Connect", "Socket not initialized before connection");
+    printDebug(DEBUG_ERROR, this, "TCP Connect", "Socket not initialized before connection");
     return false;
   }
 
@@ -107,8 +107,7 @@ bool TCPConnection::connectLoop()
     qDebug() << "Setting existing socket:" << socketDescriptor_;
     if(!socket_->setSocketDescriptor(socketDescriptor_))
     {
-      qCritical() << "ERROR: Could not set socket descriptor for existing connection";
-      printDebugObject(DEBUG_ERROR, this, "Video Process", "Could not set socket descriptor for existing connection.");
+      printDebug(DEBUG_ERROR, this, "Video Process", "Could not set socket descriptor for existing connection.");
       return false;
     }
   }
@@ -146,7 +145,7 @@ void TCPConnection::run()
 
   if(eventDispatcher() == nullptr)
   {
-    printDebugObject(DEBUG_WARNING, this, "TCP Connect", "No event dispatcher for this connection.");
+    printDebug(DEBUG_WARNING, this, "TCP Connect", "No event dispatcher for this connection.");
     return;
   }
   while(active_)
@@ -183,7 +182,7 @@ void TCPConnection::run()
       }
       else if(socket_->bytesAvailable() > TOO_LARGE_AMOUNT_OF_DATA)
       {
-        printDebugObject(DEBUG_WARNING, this, "TCP Receive", "Flushing the socket because of too much data!");
+        printDebug(DEBUG_WARNING, this, "TCP Receive", "Flushing the socket because of too much data!");
         socket_->flush();
       }
 
@@ -221,7 +220,7 @@ void TCPConnection::bufferToSocket()
 
   if(buffer_.size() > TOO_LARGE_AMOUNT_OF_DATA)
   {
-    printDebugObject(DEBUG_WARNING, this, "TCP Sending", "We are sending too much stuff to the other end",
+    printDebug(DEBUG_WARNING, this, "TCP Sending", "We are sending too much stuff to the other end",
                     {"Buffer size"}, {QString::number(buffer_.size())});
   }
 
@@ -264,8 +263,8 @@ void TCPConnection::printError(int socketError, const QString &message)
 {
   qWarning() << "ERROR. Socket error" << socketError
              << "Error:" << message;
-  printDebugObject(DEBUG_ERROR, this, "TCP", "Socket Error",
-                  {"Code", "Message"}, {QString::number(socketError), message});
+  printDebug(DEBUG_ERROR, this, "TCP", "Socket Error",
+             {"Code", "Message"}, {QString::number(socketError), message});
 }
 
 void TCPConnection::printBytesWritten(qint64 bytes)
diff --git a/src/video/cameraframegrabber.cpp b/src/video/cameraframegrabber.cpp
index 01137a17..5f60f963 100644
--- a/src/video/cameraframegrabber.cpp
+++ b/src/video/cameraframegrabber.cpp
@@ -14,7 +14,7 @@ bool CameraFrameGrabber::present(const QVideoFrame &frame)
     emit frameAvailable(frame);
     return true;
   }
-  printDebugObject(DEBUG_WARNING, this, "Video process", "Not a valid frame");
+  printDebug(DEBUG_WARNING, this, "Video process", "Not a valid frame");
   return false;
 }
 
diff --git a/src/video/displayfilter.cpp b/src/video/displayfilter.cpp
index 1fd2e9b2..6c601551 100644
--- a/src/video/displayfilter.cpp
+++ b/src/video/displayfilter.cpp
@@ -68,8 +68,8 @@ void DisplayFilter::process()
       format = QImage::Format_Invalid;
       break;
     default:
-      printDebugObject(DEBUG_ERROR, this, "Video",
-                       "Wrong type of display input.", {"Type"}, {QString::number(input->type)});
+      printDebug(DEBUG_ERROR, this, "Video",
+                 "Wrong type of display input.", {"Type"}, {QString::number(input->type)});
       format = QImage::Format_Invalid;
       break;
     }
diff --git a/src/video/kvazaarfilter.cpp b/src/video/kvazaarfilter.cpp
index f9532048..643749c2 100644
--- a/src/video/kvazaarfilter.cpp
+++ b/src/video/kvazaarfilter.cpp
@@ -51,7 +51,7 @@ bool KvazaarFilter::init()
   api_ = kvz_api_get(8);
   if(!api_)
   {
-    printDebugObject(DEBUG_ERROR, this, "Initiate Video", "Failed to retrieve Kvazaar API.");
+    printDebug(DEBUG_ERROR, this, "Initiate Video", "Failed to retrieve Kvazaar API.");
     return false;
   }
   config_ = api_->config_alloc();
@@ -59,7 +59,7 @@ bool KvazaarFilter::init()
 
   if(!config_)
   {
-    printDebugObject(DEBUG_ERROR, this, "Initiate Video", "Failed to allocate Kvazaar config.");
+    printDebug(DEBUG_ERROR, this, "Initiate Video", "Failed to allocate Kvazaar config.");
     return false;
   }
   QSettings settings("kvazzup.ini", QSettings::IniFormat);
@@ -102,7 +102,7 @@ bool KvazaarFilter::init()
 
   if(!enc_)
   {
-    printDebugObject(DEBUG_ERROR, this, "Video Process", "Failed to open Kvazaar encoder.");
+    printDebug(DEBUG_ERROR, this, "Video Process", "Failed to open Kvazaar encoder.");
     return false;
   }
 
@@ -110,7 +110,7 @@ bool KvazaarFilter::init()
 
   if(!input_pic_)
   {
-    printDebugObject(DEBUG_ERROR, this, "Initiate Video", "Could not allocate input picture.");
+    printDebug(DEBUG_ERROR, this, "Initiate Video", "Could not allocate input picture.");
     return false;
   }
 
@@ -147,7 +147,7 @@ void KvazaarFilter::process()
   {
     if(!input_pic_)
     {
-      printDebugObject(DEBUG_ERROR, this, "Video Process", "Input picture was not allocated correctly.");
+      printDebug(DEBUG_ERROR, this, "Video Process", "Input picture was not allocated correctly.");
       break;
     }
 
diff --git a/src/video/openhevcfilter.cpp b/src/video/openhevcfilter.cpp
index 76afd112..509aacae 100644
--- a/src/video/openhevcfilter.cpp
+++ b/src/video/openhevcfilter.cpp
@@ -23,7 +23,7 @@ bool OpenHEVCFilter::init()
   libOpenHevcSetDebugMode(handle_, 0);
   if(libOpenHevcStartDecoder(handle_) == -1)
   {
-    printDebugObject(DEBUG_ERROR, this, "Iniating Video", "Failed to start decoder.");
+    printDebug(DEBUG_ERROR, this, "Iniating Video", "Failed to start decoder.");
     return false;
   }
   libOpenHevcSetTemporalLayer_id(handle_, 0);
@@ -132,20 +132,20 @@ void OpenHEVCFilter::process()
         OpenHevc_Frame openHevcFrame;
         if( gotPicture == -1)
         {
-          printDebugObject(DEBUG_ERROR, this, "Video Incoming", "Error while decoding.");
+          printDebug(DEBUG_ERROR, this, "Video Incoming", "Error while decoding.");
         }
         else if(!gotPicture && frame->data_size >= 2)
         {
           const unsigned char *buff2 = frame->data.get();
-          qWarning() << "Warning: Could not decode video frame. NAL type:" <<
-                        buff2[0] << buff2[1] << buff2[2] << buff2[3] << (buff2[4] >> 1);
-          printDebugObject(DEBUG_WARNING, this, "Video incoming", "Could not decode video frame.",
+          //qWarning() << "Warning: Could not decode video frame. NAL type:" <<
+          //              buff2[0] << buff2[1] << buff2[2] << buff2[3] << (buff2[4] >> 1);
+          printDebug(DEBUG_WARNING, this, "Video incoming", "Could not decode video frame.",
                           {"NAL type"}, {QString() + QString(buff2[0]) + QString(buff2[1])
                                          + QString(buff2[2]) + QString(buff2[3]) + QString(buff2[4] >> 1) });
         }
         else if( libOpenHevcGetOutput(handle_, gotPicture, &openHevcFrame) == -1 )
         {
-          printDebugObject(DEBUG_ERROR, this, "Video Incoming", "Failed to get output.");
+          printDebug(DEBUG_ERROR, this, "Video Incoming", "Failed to get output.");
         }
         else
         {

From 5376181841d0f42925b0036ffd00b50ac234ff38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joni=20R=C3=A4s=C3=A4nen?= <joni.rasanen@tut.fi>
Date: Mon, 13 May 2019 12:57:16 +0300
Subject: [PATCH 24/24] refactor(Global): Converted more error prints to new
 format.

---
 src/common.h                |  4 ++--
 src/kvazzupcore.cpp         | 10 +++++++---
 src/mediamanager.cpp        | 16 ++++++++++------
 src/scalefilter.cpp         |  6 +++---
 src/sip/sipdialogstate.cpp  | 16 ++++++++++------
 src/sip/siptransactions.cpp | 20 +++++++++++++-------
 src/tcpconnection.cpp       |  2 --
 src/video/camerainfo.cpp    |  6 ++++--
 src/video/displayfilter.cpp |  3 ++-
 src/video/yuvtorgb32.cpp    |  5 ++++-
 10 files changed, 55 insertions(+), 33 deletions(-)

diff --git a/src/common.h b/src/common.h
index 0bb6fe1b..357e6c26 100644
--- a/src/common.h
+++ b/src/common.h
@@ -21,8 +21,8 @@ void printDebug(DebugType type, QObject* object,
 
 // print debug information
 // DEBUG_NORMAL is for one time informational debug printing.
-// DEBUG_ERROR is for events that should not be able to happen in Kvazzup and result in problems
-// DEBUG_WARNING is for events that should not be able to happen in Kvazzup which do not result in problems
+// DEBUG_WARNING is for events that should not be able to happen in Kvazzup which do not cause problems.
+// DEBUG_ERROR is for events that should not be able to happen in Kvazzup and results in problems.
 // DEBUG_PEER_ERROR is for events that are errors in behavior of entities that are not us.
 void printDebug(DebugType type, QString className,
                 QString context = "", QString description = "",
diff --git a/src/kvazzupcore.cpp b/src/kvazzupcore.cpp
index fd70e456..3d8b7c43 100644
--- a/src/kvazzupcore.cpp
+++ b/src/kvazzupcore.cpp
@@ -4,6 +4,8 @@
 
 #include "globalsdpstate.h"
 
+#include "common.h"
+
 #include <QHostAddress>
 
 
@@ -129,17 +131,19 @@ void KvazzupCore::peerAccepted(uint32_t sessionID)
   {
     if(states_[sessionID] == CALLRINGINWITHTHEM || states_[sessionID] == CALLINGTHEM)
     {
-      qDebug() << "Accepting," << metaObject()->className() << ": They accepted our call!";
+      printDebug(DEBUG_NORMAL, this, "Accepting", "They accepted our call!");
       states_[sessionID] = CALLNEGOTIATING;
     }
     else
     {
-      qDebug() << "PEER ERROR, accepting" << metaObject()->className() << ": Got an accepted call even though we have not yet called them!";
+      printDebug(DEBUG_PEER_ERROR, this, "Accepting",
+                 "Got an accepted call even though we have not yet called them!");
     }
   }
   else
   {
-    qDebug() << "ERROR, accepting" << metaObject()->className() << ": : Peer accepted a session which is not in Call manager";
+    printDebug(DEBUG_ERROR, this, "Accepting",
+               "Peer accepted a session which is not in Core.");
   }
 }
 
diff --git a/src/mediamanager.cpp b/src/mediamanager.cpp
index 8a997ff0..0c9c357b 100644
--- a/src/mediamanager.cpp
+++ b/src/mediamanager.cpp
@@ -169,17 +169,19 @@ void MediaManager::createOutgoingMedia(uint32_t sessionID, const MediaInfo& remo
       }
       else
       {
-        qDebug() << "ERROR: Unsupported media type in :" << remoteMedia.type;
+        printDebug(DEBUG_ERROR, this, "Add Participant", "Unsupported media type!",
+                  {"type"}, QStringList() << remoteMedia.type);
       }
     }
     else
     {
-      qDebug() << "ERROR: SDP transport protocol not supported.";
+      printDebug(DEBUG_ERROR, this, "Add Participant", "SDP transport protocol not supported.");
     }
   }
   else
   {
-    qDebug() << "Not creating media because they don't seem to want any according to attribute";
+    printDebug(DEBUG_NORMAL, this, "Add Participant",
+               "Not creating media because they don't seem to want any according to attribute.");
   }
 }
 
@@ -212,17 +214,19 @@ void MediaManager::createIncomingMedia(uint32_t sessionID, const MediaInfo &loca
       }
       else
       {
-        qDebug() << "ERROR: Unsupported media type in :" << localMedia.type;
+        printDebug(DEBUG_ERROR, this, "Add Participant", "Unsupported incoming media type!",
+                  {"type"}, QStringList() << localMedia.type);
       }
     }
     else
     {
-      qDebug() << "ERROR: SDP transport protocol not supported.";
+      printDebug(DEBUG_ERROR, this, "Add Participant", "Incoming SDP transport protocol not supported.");
     }
   }
   else
   {
-    qDebug() << "Not creating media because they don't seem to want any according to attribute";
+    printDebug(DEBUG_NORMAL, this, "Add Participant",
+               "Not creating media because they don't seem to want any according to attribute.");
   }
 }
 
diff --git a/src/scalefilter.cpp b/src/scalefilter.cpp
index a9f41389..16c00704 100644
--- a/src/scalefilter.cpp
+++ b/src/scalefilter.cpp
@@ -21,7 +21,7 @@ void ScaleFilter::process()
 {
   if(newSize_ == QSize(0,0))
   {
-    qDebug() << "ERROR: Size not set for scaler";
+    printDebug(DEBUG_ERROR, this, "Initiate Video", "Size not set for scaler.");
     return;
   }
 
@@ -30,8 +30,8 @@ void ScaleFilter::process()
   {
     if(input->height == 0 || input->width == 0 || input->data_size == 0)
     {
-      qDebug() << "ERROR: The resolution of input image for scaler is not set:"
-               << input->width << "x" << input->height;
+      printDebug(DEBUG_ERROR, this, "Initiate Video", "The resolution of input image for scaler is not set.",
+                {"Width", "Height"}, {QString::number(input->width), QString::number(input->height)});
       return;
     }
 
diff --git a/src/sip/sipdialogstate.cpp b/src/sip/sipdialogstate.cpp
index 23e73ba8..317fa99b 100644
--- a/src/sip/sipdialogstate.cpp
+++ b/src/sip/sipdialogstate.cpp
@@ -85,19 +85,22 @@ void SIPDialogState::createDialogFromINVITE(std::shared_ptr<SIPMessageInfo> &inM
   {
     if(correctRequestDialog(inMessage->dialog, SIP_INVITE, inMessage->cSeq))
     {
-      qDebug() << "ERROR: Re-INVITE should be processed differently.";
+      printDebug(DEBUG_ERROR, "SIPDialogState", "SIP Create Dialog",
+                 "Re-INVITE should be processed differently.");
       return;
     }
     else
     {
-      qDebug() << "PEER_ERROR: Got a request not belonging to this dialog";
+      printDebug(DEBUG_PEER_ERROR, "SIPDialogState", "SIP Create Dialog",
+                 "Got a request not belonging to this dialog.");
     }
   }
 
   remoteTag_ = inMessage->dialog->fromTag;
   if(remoteTag_ == "")
   {
-    qDebug() << "PEER_ERROR: They did not provide their tag in INVITE!";
+    printDebug(DEBUG_PEER_ERROR, "SIPDialogState", "SIP Create Dialog",
+               "They did not provide their tag in INVITE!");
     // TODO: send an error response.
   }
 
@@ -129,9 +132,10 @@ void SIPDialogState::getRequestDialogInfo(SIPRequest &outRequest, QString localA
   if(localUri_.username == "" || localUri_.host == "" ||
      remoteUri_.username == "" || remoteUri_.host == "")
   {
-    qDebug() << "ERROR: The dialog state info has not been set, but we are using it." <<
-                "username:" << localUri_.username << "host" << localUri_.host <<
-                "remote username:" << remoteUri_.username << "host:" << remoteUri_.host;
+    printDebug(DEBUG_ERROR, "SIPDialogState", "SIP Send Request",
+               "The dialog state info has not been set, but we are using it.",
+                {"username", "host", "remote username", "remote host"},
+                {localUri_.username, localUri_.host, remoteUri_.username, remoteUri_.host});
   }
 
   outRequest.requestURI = requestUri_;
diff --git a/src/sip/siptransactions.cpp b/src/sip/siptransactions.cpp
index 219f46e3..3c333c20 100644
--- a/src/sip/siptransactions.cpp
+++ b/src/sip/siptransactions.cpp
@@ -40,8 +40,9 @@ void SIPTransactions::init(SIPTransactionUser *callControl)
            << ": Listening to SIP TCP connections on port:" << sipPort_;
   if (!tcpServer_.listen(QHostAddress::Any, sipPort_))
   {
-    qDebug() << "ERROR," << metaObject()->className()
-             << "failed to listen to socket. Is it reserved?";
+    printDebug(DEBUG_ERROR, this, "Initiate SIP",
+               "Failed to listen to socket. Is it reserved?");
+
     // TODO announce it to user!
   }
 
@@ -160,7 +161,8 @@ void SIPTransactions::startCall(Contact &address)
 
   if(isServer)
   {
-    qDebug() << "ERROR: Proxy calling has not been yet implemented";
+    printDebug(DEBUG_ERROR, this, "SIP Start Call",
+               "Proxy calling has not been yet implemented");
   }
   else
   {
@@ -196,7 +198,8 @@ void SIPTransactions::startPeerToPeerCall(quint32 transportID, Contact &remote)
   // this start call will commence once the connection has been established
   if(!dialogData->client->startCall(remote.realName))
   {
-    qDebug() << "WARNING: Could not start a call according to session.";
+    printDebug(DEBUG_WARNING, this, "SIP Start Call",
+               "Could not start a call according to session.");
   }
 }
 
@@ -655,7 +658,8 @@ void SIPTransactions::sendDialogRequest(uint32_t sessionID, RequestType type)
     {
       if(dialogs_[sessionID]->localSdp_ == nullptr)
       {
-        qDebug() << "ERROR: Missing local final SDP when its supposed to be sent.";
+        printDebug(DEBUG_ERROR, this, "SIP Send Request",
+                   "Missing local final SDP when its supposed to be sent.");
         // TODO: send client error.
         return;
       }
@@ -679,8 +683,10 @@ void SIPTransactions::sendNonDialogRequest(SIP_URI& uri, RequestType type)
   {
     if (registrations_.find(uri.host) == registrations_.end())
     {
-      qDebug() << "ERROR: Registration information should have been created "
-                  "already before sending REGISTER message!";
+      printDebug(DEBUG_ERROR, this, "SIP Send Request",
+                 "Registration information should have been created "
+                 "already before sending REGISTER message!");
+
       return;
     }
 
diff --git a/src/tcpconnection.cpp b/src/tcpconnection.cpp
index 38a498a6..1e33e33a 100644
--- a/src/tcpconnection.cpp
+++ b/src/tcpconnection.cpp
@@ -261,8 +261,6 @@ void TCPConnection::disconnected()
 
 void TCPConnection::printError(int socketError, const QString &message)
 {
-  qWarning() << "ERROR. Socket error" << socketError
-             << "Error:" << message;
   printDebug(DEBUG_ERROR, this, "TCP", "Socket Error",
              {"Code", "Message"}, {QString::number(socketError), message});
 }
diff --git a/src/video/camerainfo.cpp b/src/video/camerainfo.cpp
index 0bea8fbc..15ff5160 100644
--- a/src/video/camerainfo.cpp
+++ b/src/video/camerainfo.cpp
@@ -1,9 +1,10 @@
 #include "camerainfo.h"
 
+#include "common.h"
+
 #include <QCameraInfo>
 #include <QDebug>
 
-
 const std::map<QVideoFrame::PixelFormat, QString> pixelFormatStrings = {{QVideoFrame::Format_Invalid, "INVALID"},
                                                          {QVideoFrame::Format_ARGB32, "ARGB32"},
                                                          {QVideoFrame::Format_ARGB32_Premultiplied, "ARGB32_Premultiplied"},
@@ -149,7 +150,8 @@ std::unique_ptr<QCamera> CameraInfo::loadCamera(int deviceID)
   QList<QCameraInfo> cameras = QCameraInfo::availableCameras();
   if(deviceID == -1 || deviceID >= cameras.size())
   {
-    qDebug() << "ERROR: Invalid deviceID for getVideoCapabilities";
+    printDebug(DEBUG_ERROR, "CameraInfo", "SIP Send Request",
+               "Invalid deviceID for getVideoCapabilities");
     return std::unique_ptr<QCamera> (nullptr);
   }
 
diff --git a/src/video/displayfilter.cpp b/src/video/displayfilter.cpp
index 6c601551..8ef078c3 100644
--- a/src/video/displayfilter.cpp
+++ b/src/video/displayfilter.cpp
@@ -42,7 +42,8 @@ void DisplayFilter::updateSettings()
   }
   else
   {
-    qDebug() << "ERROR: Missing settings value flip threads";
+    printDebug(DEBUG_ERROR, "CameraInfo", "SIP Send Request",
+               "Missing settings value flip threads.");
   }
 
   Filter::updateSettings();
diff --git a/src/video/yuvtorgb32.cpp b/src/video/yuvtorgb32.cpp
index 7d6e8a87..88666369 100644
--- a/src/video/yuvtorgb32.cpp
+++ b/src/video/yuvtorgb32.cpp
@@ -2,6 +2,8 @@
 
 #include "optimized/yuv2rgb.h"
 
+#include "common.h"
+
 #include <QSettings>
 #include <QDebug>
 
@@ -36,7 +38,8 @@ void YUVtoRGB32::updateSettings()
   }
   else
   {
-    qDebug() << "ERROR: Missing settings value YUV threads";
+    printDebug(DEBUG_ERROR, "CameraInfo", "SIP Send Request",
+               "Missing settings value YUV threads.");
   }
 
   Filter::updateSettings();