microsoft#4

Author: yuyoyuppe

tools/WebcamReportTool/DirectShowUtils.cpp

@@ -1,6 +1,6 @@
 #include "DirectShowUtils.h"
 
-void MyFreeMediaTypeHelper(AM_MEDIA_TYPE& mt)
+void FreeMediaTypeHelper(AM_MEDIA_TYPE& mt)
 {
     if (mt.cbFormat != 0)
     {
@@ -15,12 +15,12 @@ void MyFreeMediaTypeHelper(AM_MEDIA_TYPE& mt)
     }
 }
 
-void MyDeleteMediaTypeHelper(AM_MEDIA_TYPE* pmt)
+void DeleteMediaTypeHelper(AM_MEDIA_TYPE* pmt)
 {
     if (!pmt)
     {
         return;
     }
-    MyFreeMediaTypeHelper(*pmt);
+    FreeMediaTypeHelper(*pmt);
     CoTaskMemFree(const_cast<AM_MEDIA_TYPE*>(pmt));
 }

tools/WebcamReportTool/DirectShowUtils.h

@@ -16,7 +16,7 @@ std::ofstream& log();
 #define TRACE log() << __FUNCTION__ << '\n';
 #define LOG(msg) log() << msg << '\n';
 
-void MyDeleteMediaTypeHelper(AM_MEDIA_TYPE* pmt);
+void DeleteMediaTypeHelper(AM_MEDIA_TYPE* pmt);
 
 using unique_media_type_ptr =
-    wistd::unique_ptr<AM_MEDIA_TYPE, wil::function_deleter<decltype(&MyDeleteMediaTypeHelper), MyDeleteMediaTypeHelper>>;
+    wistd::unique_ptr<AM_MEDIA_TYPE, wil::function_deleter<decltype(&DeleteMediaTypeHelper), DeleteMediaTypeHelper>>;

tools/WebcamReportTool/main.cpp

@@ -20,7 +20,7 @@ std::ofstream& log()
     return report;
 }
 
-const char* GetMediaSubTypeString(const GUID& guid)
+std::string GetMediaSubTypeString(const GUID& guid)
 {
     if (guid == MEDIASUBTYPE_RGB24)
     {
@@ -56,7 +56,23 @@ const char* GetMediaSubTypeString(const GUID& guid)
     }
     else
     {
-        return "MEDIASUBTYPE_UNKNOWN";
+        OLECHAR* guidString = nullptr;
+        StringFromCLSID(guid, &guidString);
+        if (guidString)
+        {
+            std::wstring_view wideView{guidString};
+            std::string result;
+            for (const auto c :wideView)
+            {
+                result += static_cast<char>(c);
+            }
+            ::CoTaskMemFree(guidString);
+            return result;
+        }
+        else
+        {
+            return "MEDIASUBTYPE_UNKNOWN";
+        }
     }
 }