Fix embedded fonts code if no fonts are available

ffmpeginteropx · Jan 3, 2025 · a6ba012 · a6ba012
1 parent 0994926
commit a6ba012
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 19 deletions.
diff --git a/Source/AttachedFileHelper.h b/Source/AttachedFileHelper.h
@@ -31,7 +31,20 @@ class AttachedFileHelper
     }
 
     std::vector<std::shared_ptr<AttachedFile>> AttachedFiles() { return attachedFiles; }
-    winrt::hstring InstanceId() { return instanceId; }
+    winrt::hstring InstanceId()
+    {
+        if (this->instanceId.empty())
+        {
+            GUID gdn;
+            auto hr = CoCreateGuid(&gdn);
+            if (FAILED(hr))
+            {
+                winrt::throw_hresult(hr);
+            }
+            instanceId = winrt::to_hstring(winrt::guid(gdn));
+        }
+        return instanceId;
+    }
 
     void AddAttachedFile(std::shared_ptr<AttachedFile> const& file)
     {
@@ -47,20 +60,9 @@ class AttachedFileHelper
         }
         else
         {
-            if (this->instanceId.empty())
-            {
-                GUID gdn;
-                auto hr = CoCreateGuid(&gdn);
-                if (FAILED(hr))
-                {
-                    winrt::throw_hresult(hr);
-                }
-                instanceId = winrt::to_hstring(winrt::guid(gdn));
-            }
-
             auto folder = co_await ApplicationData::Current().TemporaryFolder().CreateFolderAsync(
                 config.General().AttachmentCacheFolderName(), CreationCollisionOption::OpenIfExists);
-            auto instanceFolder = co_await folder.CreateFolderAsync(instanceId, CreationCollisionOption::OpenIfExists);
+            auto instanceFolder = co_await folder.CreateFolderAsync(InstanceId(), CreationCollisionOption::OpenIfExists);
             file = (co_await instanceFolder.CreateFileAsync(attachment->Name(), CreationCollisionOption::ReplaceExisting));
             co_await FileIO::WriteBufferAsync(file, attachment->GetBuffer());
 
@@ -92,7 +94,7 @@ class AttachedFileHelper
     {
         auto folder = co_await ApplicationData::Current().TemporaryFolder().CreateFolderAsync(
             config.General().AttachmentCacheFolderName(), CreationCollisionOption::OpenIfExists);
-        auto instanceFolder = co_await folder.CreateFolderAsync(instanceId, CreationCollisionOption::OpenIfExists);
+        auto instanceFolder = co_await folder.CreateFolderAsync(InstanceId(), CreationCollisionOption::OpenIfExists);
         co_return instanceFolder;
     }
 

diff --git a/Source/SubtitleProviderLibass.h b/Source/SubtitleProviderLibass.h
@@ -113,6 +113,7 @@ class SubtitleProviderLibass : public SubtitleProvider
 
     virtual SoftwareBitmap RenderSubtitles(winrt::Windows::Foundation::TimeSpan videoPosition, Size const& renderSize) override
     {
+        std::lock_guard lock(mutex);
         if (!assRenderer)
             return GetDummyBitmap();
 
@@ -470,10 +471,12 @@ class SubtitleProviderLibass : public SubtitleProvider
     void SetFonts()
     {
         try {
-            ExtractFonts();
-            /*auto fontFolder = attachedFileHelper->GetInstanceFolder().get();
-            auto fontDirectory = StringUtils::PlatformStringToUtf8String(fontFolder.Path());
-            ass_set_fonts_dir(assLibrary, fontDirectory.data());*/
+            if (ExtractFonts())
+            {
+                auto fontFolder = attachedFileHelper->GetInstanceFolder().get();
+                auto fontDirectory = StringUtils::PlatformStringToUtf8String(fontFolder.Path());
+                ass_set_fonts_dir(assLibrary, fontDirectory.data());
+            }
             ass_set_fonts(assRenderer, NULL, "Segoe UI", ASS_FONTPROVIDER_AUTODETECT, nullptr, 0);
         }
         catch (exception e)
@@ -483,8 +486,9 @@ class SubtitleProviderLibass : public SubtitleProvider
     }
 
 
-    void ExtractFonts()
+    bool ExtractFonts()
     {
+        bool hasFonts = false;
         try
         {
             if (m_config.Subtitles().UseEmbeddedSubtitleFonts())
@@ -495,13 +499,15 @@ class SubtitleProviderLibass : public SubtitleProvider
                     if (mime.find(L"font") != mime.npos)
                     {
                         attachedFileHelper->ExtractFileAsync(attachment).get();
+                        hasFonts = true;
                     }
                 }
             }
         }
         catch (...)
         {
         }
+        return hasFonts;
     }