fix(video): fix CoreAV and VideoSurface to conform to new VideoFrame

qTox · Aug 3, 2016 · 277ddc3 · 277ddc3
1 parent 38b1a9b
commit 277ddc3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/core/coreav.cpp b/src/core/coreav.cpp
@@ -362,7 +362,12 @@ void CoreAV::sendCallVideo(uint32_t callId, std::shared_ptr<VideoFrame> vframe)
 
     // This frame shares vframe's buffers, we don't call vpx_img_free but just delete it
     vpx_image* frame = vframe->toVpxImage();
-    if (frame->fmt == VPX_IMG_FMT_NONE)
+
+    if(!frame)
+    {
+        return;
+    }
+    if(frame->fmt == VPX_IMG_FMT_NONE)
     {
         qWarning() << "Invalid frame";
         vpx_img_free(frame);

diff --git a/src/video/videosurface.cpp b/src/video/videosurface.cpp
@@ -146,7 +146,7 @@ void VideoSurface::onNewFrameAvailable(std::shared_ptr<VideoFrame> newFrame)
 
     lock();
     lastFrame = newFrame;
-    newSize = lastFrame->getSize();
+    newSize = lastFrame->getSourceDimensions().size();
     unlock();
 
     float newRatio = getSizeRatio(newSize);