Fixed msmf preview cleanup and bump to version 0.17.1

Author: gabime

include/RealSenseID/Version.h

@@ -9,7 +9,7 @@
 
 #define RSID_VER_MAJOR 0
 #define RSID_VER_MINOR 17
-#define RSID_VER_PATCH 0
+#define RSID_VER_PATCH 1
 
 #define RSID_VERSION (RSID_VER_MAJOR * 10000 + RSID_VER_MINOR * 100 + RSID_VER_PATCH)
 

release_notes.txt

@@ -1,3 +1,7 @@
+Realsense ID version 0.17.1
+--------------------------
+Fixed preview resource cleanup in windows
+
 Realsense ID version 0.17.0
 --------------------------
 * Database import/export support [Device mode only]:

src/Capture/MSMFCapture.cc

@@ -4,6 +4,7 @@
 #include <evr.h>
 #include <mfapi.h>
 #include <mfreadwrite.h>
+#include <stdexcept>
 
 #include <string>
 #include <sstream>
@@ -23,41 +24,37 @@ static const char* LOG_TAG = "MSMFCapture";
 static const DWORD STREAM_NUMBER = MF_SOURCE_READER_FIRST_VIDEO_STREAM;
 static const GUID W10_FORMAT = {FCC('pBAA'), 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}};
 
-class MsmfInitializer
+
+MsmfInitializer::MsmfInitializer()
 {
-public:
-    ~MsmfInitializer()
+    auto ok = SUCCEEDED(CoInitializeEx(nullptr, COINIT_APARTMENTTHREADED));
+    if (!ok)
     {
-        try
-        {
-            if (startup)
-                MFShutdown();
-            if (init)
-                CoUninitialize();
-        }
-        catch (...)
-        {
-            LOG_ERROR(LOG_TAG, "uninit MSMFbackend failed");
-        }
+        throw std::runtime_error("CoInitializeEx failed");
     }
-    static MsmfInitializer& getInstance()
+
+    ok = SUCCEEDED(MFStartup(MF_VERSION, MFSTARTUP_NOSOCKET));
+    if (!ok)
     {
-        static MsmfInitializer Instance;
-        return Instance;
+        CoUninitialize();
+        throw std::runtime_error("init MSMFbackend failed");
     }
+}
+
 
-private:
-    MsmfInitializer()
+MsmfInitializer::~MsmfInitializer()
+{
+    try
     {
-        init = SUCCEEDED(CoInitializeEx(nullptr, COINIT_APARTMENTTHREADED));
-        startup = SUCCEEDED(MFStartup(MF_VERSION, MFSTARTUP_NOSOCKET));
-        if (!init || !startup)
-            LOG_ERROR(LOG_TAG, "init MSMFbackend failed");
+        MFShutdown();
+        CoUninitialize();
     }
+    catch (...)
+    {
+        LOG_ERROR(LOG_TAG, "uninit MSMFbackend failed");
+    }
+}
 
-    bool init = false;
-    bool startup = false;
-};
 
 static void ThrowIfFailed(const char* what, HRESULT hr)
 {
@@ -75,7 +72,9 @@ bool CreateMediaSource(IMFMediaSource** media_device, IMFAttributes** cap_config
     UINT32 count = 0;
 
     ThrowIfFailed(stage_tag, MFCreateAttributes(cap_config, 10));
-    ThrowIfFailed(stage_tag,(*cap_config)->SetGUID(MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE, MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE_VIDCAP_GUID));
+    ThrowIfFailed(
+        stage_tag,
+        (*cap_config)->SetGUID(MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE, MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE_VIDCAP_GUID));
     ThrowIfFailed(stage_tag, MFEnumDeviceSources((*cap_config), &ppDevices, &count));
 
     if (capture_number < 0 || static_cast<UINT32>(capture_number) >= count)
@@ -93,7 +92,7 @@ bool CreateMediaSource(IMFMediaSource** media_device, IMFAttributes** cap_config
     return true;
 }
 
-CaptureHandle::CaptureHandle(const PreviewConfig& config) : _config(config), _mf(MsmfInitializer::getInstance())
+CaptureHandle::CaptureHandle(const PreviewConfig& config) : _config(config)
 {
     IMFMediaSource* media_device = nullptr;
     IMFAttributes* cap_config = nullptr;
@@ -102,24 +101,26 @@ CaptureHandle::CaptureHandle(const PreviewConfig& config) : _config(config), _mf
 
     try
     {
-    ThrowIfFailed("create media source", HRESULT(CreateMediaSource(&media_device, &cap_config, _config.cameraNumber)));
-    ThrowIfFailed("create source reader", MFCreateSourceReaderFromMediaSource(media_device, cap_config, &_video_src));
-
-    GUID stream_format = _config.previewMode == PreviewMode::VGA ? MFVideoFormat_YUY2 : W10_FORMAT;
-
-    ThrowIfFailed("create mediatype ",MFCreateMediaType(&mediaType));
-    ThrowIfFailed("set mediaType guid",mediaType->SetGUID(MF_MT_MAJOR_TYPE, MFMediaType_Video));
-    ThrowIfFailed("set mediaType minor type", mediaType->SetGUID(MF_MT_SUBTYPE, stream_format));
-    if (_config.previewMode == PreviewMode::VGA)
-        ThrowIfFailed("set size", MFSetAttributeSize(mediaType, MF_MT_FRAME_SIZE, VGA_WIDTH, VGA_HEIGHT));
-    ThrowIfFailed("set stream ", _video_src->SetCurrentMediaType(0, NULL, mediaType));
-
-    // save stream attributes
-    UINT64 width_height;
-    ThrowIfFailed(" get stream attributes ", _video_src->GetCurrentMediaType(STREAM_NUMBER, &mediaType));
-    mediaType->GetUINT64(MF_MT_FRAME_SIZE, &width_height);
-
-    _stream_converter.InitStream((UINT32)(width_height >> 32), (UINT32)(width_height), _config.previewMode);
+        ThrowIfFailed("create media source",
+                      HRESULT(CreateMediaSource(&media_device, &cap_config, _config.cameraNumber)));
+        ThrowIfFailed("create source reader",
+                      MFCreateSourceReaderFromMediaSource(media_device, cap_config, &_video_src));
+
+        GUID stream_format = _config.previewMode == PreviewMode::VGA ? MFVideoFormat_YUY2 : W10_FORMAT;
+
+        ThrowIfFailed("create mediatype ", MFCreateMediaType(&mediaType));
+        ThrowIfFailed("set mediaType guid", mediaType->SetGUID(MF_MT_MAJOR_TYPE, MFMediaType_Video));
+        ThrowIfFailed("set mediaType minor type", mediaType->SetGUID(MF_MT_SUBTYPE, stream_format));
+        if (_config.previewMode == PreviewMode::VGA)
+            ThrowIfFailed("set size", MFSetAttributeSize(mediaType, MF_MT_FRAME_SIZE, VGA_WIDTH, VGA_HEIGHT));
+        ThrowIfFailed("set stream ", _video_src->SetCurrentMediaType(0, NULL, mediaType));
+
+        // save stream attributes
+        UINT64 width_height;
+        ThrowIfFailed(" get stream attributes ", _video_src->GetCurrentMediaType(STREAM_NUMBER, &mediaType));
+        mediaType->GetUINT64(MF_MT_FRAME_SIZE, &width_height);
+
+        _stream_converter.InitStream((UINT32)(width_height >> 32), (UINT32)(width_height), _config.previewMode);
     }
     catch (const std::exception& ex)
     {
@@ -133,6 +134,7 @@ CaptureHandle::CaptureHandle(const PreviewConfig& config) : _config(config), _mf
             _video_src->Release();
         throw ex;
     }
+
     if (mediaType)
         mediaType->Release();
     if (cap_config)
@@ -165,9 +167,9 @@ bool CaptureHandle::Read(RealSenseID::Image* res)
     {
         ThrowIfFailed("ConvertToContiguousBuffer", sample->ConvertToContiguousBuffer(&_buf));
         _buf->Lock(&tmpBuffer, &maxsize, &cursize);
-        
+
         valid_read = _stream_converter.Buffer2Image(res, tmpBuffer, cursize);
-            
+
         if (_buf)
         {
             _buf->Unlock();

src/Capture/MSMFCapture.h

@@ -10,12 +10,17 @@ namespace RealSenseID
 {
 namespace Capture
 {
-class MsmfInitializer;
+class MsmfInitializer
+{
+public:
+    MsmfInitializer();
+    ~MsmfInitializer();
+};
 
 class CaptureHandle
 {
 public:
-    explicit CaptureHandle(const PreviewConfig& config); 
+    explicit CaptureHandle(const PreviewConfig& config);
     ~CaptureHandle();
     bool Read(RealSenseID::Image* res);
 
@@ -25,11 +30,11 @@ class CaptureHandle
     void operator=(const CaptureHandle&) = delete;
 
 private:
+    MsmfInitializer _mf;
     IMFSourceReader* _video_src = nullptr;
     IMFMediaBuffer* _buf = nullptr;
     StreamConverter _stream_converter;
     PreviewConfig _config;
-    MsmfInitializer& _mf;
 };
 } // namespace Capture
 } // namespace RealSenseID

src/PreviewImpl.cc

@@ -6,21 +6,14 @@
 #include "RealSenseID/DiscoverDevices.h"
 #include <chrono>
 
-#ifdef ANDROID
-#include "AndroidCapture.h"
-#elif LINUX
-#include "LinuxCapture.h"
-#elif _WIN32
-#include "MSMFCapture.h"
-#endif
-
 static const char* LOG_TAG = "Preview";
 
 namespace RealSenseID
 {
 PreviewImpl::PreviewImpl(const PreviewConfig& config) : _config(config)
 {
-    if(config.cameraNumber == -1) {
+    if (config.cameraNumber == -1)
+    {
         std::vector<int> camera_numbers;
         try
         {
@@ -30,7 +23,7 @@ PreviewImpl::PreviewImpl(const PreviewConfig& config) : _config(config)
         {
         }
         _config.cameraNumber = (camera_numbers.size() > 0) ? camera_numbers[0] : 0;
-     }
+    }
 };
 
 PreviewImpl::~PreviewImpl()
@@ -59,17 +52,18 @@ bool PreviewImpl::StartPreview(PreviewImageReadyCallback& callback)
     _worker_thread = std::thread([&]() {
         try
         {
+            _capture = std::make_unique<Capture::CaptureHandle>(_config);
             unsigned int frameNumber = 0;
-            Capture::CaptureHandle capture(_config);
             LOG_DEBUG(LOG_TAG, "Preview started!");
             while (!_canceled)
             {
-                if (_paused) {
-                    std::this_thread::sleep_for(std::chrono::milliseconds{100});
+                if (_paused)
+                {
+                    std::this_thread::sleep_for(std::chrono::milliseconds {100});
                     continue;
                 }
                 RealSenseID::Image container;
-                bool res = capture.Read(&container);
+                bool res = _capture->Read(&container);
                 if (_canceled)
                 {
                     break;

src/PreviewImpl.h

@@ -8,6 +8,14 @@
 #include <thread>
 #include <atomic>
 
+#ifdef ANDROID
+#include "AndroidCapture.h"
+#elif LINUX
+#include "LinuxCapture.h"
+#elif _WIN32
+#include "MSMFCapture.h"
+#endif
+
 namespace RealSenseID
 {
 class PreviewImpl
@@ -26,5 +34,6 @@ class PreviewImpl
     std::atomic_bool _canceled {false};
     std::atomic_bool _paused {false};
     PreviewImageReadyCallback* _callback = nullptr;
+    std::unique_ptr<Capture::CaptureHandle> _capture;
 };
 } // namespace RealSenseID