[VCM] add more logging/error checking

microsoft · Apr 12, 2021 · 2599489 · 2599489
1 parent 55a3062
commit 2599489
Showing 1 changed file with 27 additions and 2 deletions.
diff --git a/src/modules/videoconference/VideoConferenceProxyFilter/VideoCaptureProxyFilter.cpp b/src/modules/videoconference/VideoConferenceProxyFilter/VideoCaptureProxyFilter.cpp
@@ -384,9 +384,19 @@ void OverwriteFrame(IMediaSample* frame, wil::com_ptr_nothrow<IMFSample>& image)
     const DWORD frameSize = frame->GetSize();
 
     image->GetBufferByIndex(0, &imageBuf);
+    if (!imageBuf)
+    {
+        LOG("Error: couldn't get imageBuffer");
+        return;
+    }
     BYTE* imageData = nullptr;
     DWORD _ = 0, imageSize = 0;
     imageBuf->Lock(&imageData, &_, &imageSize);
+    if (!imageData)
+    {
+        LOG("Error: couldn't lock imageBuffer");
+        return;
+    }
 
     if (imageSize > frameSize)
     {
@@ -627,20 +637,35 @@ HRESULT VideoCaptureProxyFilter::EnumPins(IEnumPins** ppEnum)
                 {
                     maxFrameSize = allocatorProperties.cbBuffer;
                 }
+                if (maxFrameSize)
+                {
+                    LOG("Obtained maxFrameSize");
+                }
+                else
+                {
+                    LOG("Couldn't obtain maxFrameSize");
+                }
 
                 size_t selectedModeIdx = 0;
                 constexpr std::array<float, 3> jpgQualityModes = { 0.5f, 0.25f, 0.1f };
                 _overlayImage = LoadImageAsSample(newSettings.overlayImage, targetMediaType.get(), jpgQualityModes[selectedModeIdx]);
                 long imageSize = GetImageSize(_overlayImage);
                 while (maxFrameSize && maxFrameSize < imageSize && selectedModeIdx < size(jpgQualityModes))
                 {
+                    LOG("Trying lower jpg quality");
                     _overlayImage = LoadImageAsSample(newSettings.overlayImage, targetMediaType.get(), jpgQualityModes[++selectedModeIdx]);
                     imageSize = GetImageSize(_overlayImage);
                 }
+                if (maxFrameSize < imageSize)
+                {
+                    LOG("Couldn't lower jpg quality enough");
+                }
+                else
+                {
+                    LOG("Successfully lowered jpg quality to fit into image frame");
+                }
             }
 
-            LOG("Loaded images");
-
             LOG("Capture device created successfully");
         }
         else