Small fixes for the publication tests. Removed some old osip referenc…

…es, resolution setting for qcamera, disabled speex aec, because it does not work properly at this point, update Qt every 30 ms instead of every 10, draw only if there is something new to draw in videowidget and print out TID:s to make reading process explorer much easier. Removed unhelpful readme.

HEVC_conference.pro

@@ -91,12 +91,10 @@ QT+=network
 
 QMAKE_CXXFLAGS += -std=c++11
 
-#CONFIG += console
+CONFIG += console
 
-INCLUDEPATH += $$PWD/../include/kvazaar/src
-INCLUDEPATH += $$PWD/../include/openHEVC/gpac/modules/openhevc_dec
-INCLUDEPATH += $$PWD/../include/opus/include
-INCLUDEPATH += $$PWD/../include/libosip2/include
+INCLUDEPATH += $$PWD/../include/openhevc_dec
+INCLUDEPATH += $$PWD/../include/opus
 INCLUDEPATH += $$PWD/../include/live/liveMedia/include
 INCLUDEPATH += $$PWD/../include/live/groupsock/include
 INCLUDEPATH += $$PWD/../include/live/UsageEnvironment/include
@@ -110,7 +108,6 @@ win32: LIBS += -llibLibOpenHevcWrapper.dll
 win32: LIBS += -llivemedia.dll
 win32: LIBS += -llibspeexdsp.dll
 win32: LIBS += -lws2_32
-win32: LIBS += -llibosip2.dll
 
 INCLUDEPATH += $$PWD/../
 DEPENDPATH += $$PWD/../

src/callwindow.cpp

@@ -31,7 +31,7 @@ CallWindow::CallWindow(QWidget *parent, uint16_t width, uint16_t height, QString
   currentResolution_ = QSize(width, height);
 
   // GUI updates are handled solely by timer
-  timer_->setInterval(10);
+  timer_->setInterval(30);
   timer_->setSingleShot(false);
   connect(timer_, SIGNAL(timeout()), this, SLOT(update()));
   connect(timer_, SIGNAL(timeout()), stats_, SLOT(update()));

src/camerafilter.cpp

@@ -26,14 +26,12 @@ CameraFilter::CameraFilter(QString id, StatisticsInterface *stats, QSize resolut
 
   connect(cameraFrameGrabber_, SIGNAL(frameAvailable(QVideoFrame)), this, SLOT(handleFrame(QVideoFrame)));
 
-  camera_->start();
+  QCameraViewfinderSettings settings = camera_->viewfinderSettings();
 
-  if( camera_->state() == QCamera::ActiveState)
-  {
-    QCameraViewfinderSettings settings = camera_->viewfinderSettings();
-    stats_->videoInfo(settings.maximumFrameRate(), settings.resolution());
-    framerate_ = settings.maximumFrameRate();
-  }
+  settings.setResolution(QSize(640, 480));
+  settings.setPixelFormat(QVideoFrame::Format_Jpeg);
+  camera_->setViewfinderSettings(settings);
+  camera_->start();
 }
 
 CameraFilter::~CameraFilter()
@@ -66,6 +64,25 @@ void CameraFilter::stop()
 
 void CameraFilter::handleFrame(const QVideoFrame &frame)
 {
+  if(framerate_ == 0)
+  {
+    QCameraViewfinderSettings settings = camera_->viewfinderSettings();
+    QList<QVideoFrame::PixelFormat> formats = camera_->supportedViewfinderPixelFormats();
+    /*
+    for(auto format : formats)
+    {
+      qDebug() << "QCamera supported format:" << format;
+    }
+
+    QList<QSize> resolutions = camera_->supportedViewfinderResolutions();
+    for(auto reso : resolutions)
+    {
+      qDebug() << "QCamera supported resolutions:" << reso;
+    }
+    */
+    stats_->videoInfo(settings.maximumFrameRate(), settings.resolution());
+    framerate_ = settings.maximumFrameRate();
+  }
 
   QVideoFrame cloneFrame(frame);
   cloneFrame.map(QAbstractVideoBuffer::ReadOnly);
@@ -95,7 +112,7 @@ void CameraFilter::handleFrame(const QVideoFrame &frame)
   newImage->height = cloneFrame.height();
   newImage->source = LOCAL;
   newImage->framerate = framerate_;
-
+/*
   // scale the image and copy to new data
   if(resolution_ != cloneFrame.size())
   {
@@ -117,7 +134,7 @@ void CameraFilter::handleFrame(const QVideoFrame &frame)
     newImage->data_size = image2.byteCount();
     newImage->framerate = 30; // TODO Input this using settings.
   }
-
+*/
   //qDebug() << "Frame generated. Format: " << pf
   //         << " width: " << newImage->width << ", height: " << newImage->height;
 

src/common.h

@@ -57,4 +57,4 @@ struct SDPMessageInfo
 void qSleep(int ms);
 
 // TODO fix AEC bugs and faulty operating.
-const bool AEC = true;
+const bool AEC = false;

src/filter.cpp

@@ -172,6 +172,7 @@ void Filter::stop()
 
 void Filter::run()
 {
+  qDebug() << name_ << "TID:" << (uint64_t)currentThreadId();
   running_ = true;
   while(running_)
   {

src/filtergraph.cpp

@@ -30,7 +30,7 @@ FilterGraph::FilterGraph(StatisticsInterface* stats):
   Q_ASSERT(stats);
   // TODO negotiate these values with all included filters
   format_.setSampleRate(48000);
-  format_.setChannelCount(2);
+  format_.setChannelCount(1);
   format_.setSampleSize(16);
   format_.setSampleType(QAudioFormat::SignedInt);
   format_.setByteOrder(QAudioFormat::LittleEndian);

src/kvazaarfilter.cpp

@@ -43,8 +43,8 @@ int KvazaarFilter::init(QSize resolution,
 
   api_->config_init(config_);
   api_->config_parse(config_, "preset", "ultrafast");
-  config_->width = resolution.width();
-  config_->height = resolution.height();
+  config_->width = 640;
+  config_->height = 480;
   config_->threads = 4;
   config_->qp = 32;
   config_->wpp = 1;

src/opusencoderfilter.cpp

@@ -30,7 +30,7 @@ OpusEncoderFilter::~OpusEncoderFilter()
 void OpusEncoderFilter::init(QAudioFormat format)
 {
   int error = 0;
-  enc_ = opus_encoder_create(format.sampleRate(), format.channelCount(), OPUS_APPLICATION_AUDIO, &error);
+  enc_ = opus_encoder_create(format.sampleRate(), format.channelCount(), OPUS_APPLICATION_VOIP, &error);
 
   if(error)
     qWarning() << "Failed to initialize opus encoder with errorcode:" << error;

src/rtpstreamer.cpp

@@ -37,6 +37,8 @@ RTPStreamer::RTPStreamer(StatisticsInterface* stats):
 
 void RTPStreamer::run()
 {
+  qDebug() << "Live555 TID:" << (uint64_t)currentThreadId();
+
   // QThread run function
   qDebug() << "Iniating RTP streamer";
   iniated_.lock();

src/statisticswindow.cpp

@@ -164,7 +164,7 @@ uint32_t StatisticsWindow::bitrate(std::vector<PacketInfo*>& packets, uint32_t i
   uint32_t currentTime = QDateTime::currentMSecsSinceEpoch();
   uint32_t timeInterval = 0;
   uint32_t bitrate = 0;
-  uint32_t bitrateInterval = 2000;
+  uint32_t bitrateInterval = 5000;
 
   uint32_t i = index - 1;
 

src/videowidget.cpp

@@ -8,7 +8,8 @@ unsigned int VideoWidget::number_ = 0;
 
 VideoWidget::VideoWidget(QWidget* parent): QWidget(parent),
   hasImage_(false),
-  id_(number_)
+  id_(number_),
+  updated_(false)
 {
   ++number_;
   setAutoFillBackground(false);
@@ -33,6 +34,7 @@ void VideoWidget::inputImage(std::unique_ptr<uchar[]> input,
   currentImage_ = image;
   hasImage_ = true;
   drawMutex_.unlock();
+  updated_ = true;
 
   updateTargetRect();
 }
@@ -46,11 +48,14 @@ void VideoWidget::paintEvent(QPaintEvent *event)
 
   if(hasImage_)
   {
-    drawMutex_.lock();
-    Q_ASSERT(input_);
+    if(updated_)
+    {
+      drawMutex_.lock();
+      Q_ASSERT(input_);
 
-    painter.drawImage(targetRect_, currentImage_);
-    drawMutex_.unlock();
+      painter.drawImage(targetRect_, currentImage_);
+      drawMutex_.unlock();
+    }
   }
   else
   {

src/videowidget.h

@@ -37,5 +37,7 @@ class VideoWidget : public QWidget
   QImage currentImage_;
   std::unique_ptr<uchar[]> input_;
 
+  bool updated_;
+
   unsigned int id_;
 };