Subtitle system for streaming audo/video

Source/Core/Common/CommonPaths.h

@@ -94,6 +94,7 @@
 #define DYNAMICINPUT_DIR "DynamicInputTextures"
 #define GRAPHICSMOD_DIR "GraphicMods"
 #define WIISDSYNC_DIR "WiiSDSync"
+#define SUBTITLE_DIR "Subtitles"
 
 // This one is only used to remove it if it was present
 #define SHADERCACHE_LEGACY_DIR "ShaderCache"

Source/Core/Common/FileUtil.cpp

@@ -864,6 +864,7 @@ static void RebuildUserDirectories(unsigned int dir_index)
     s_user_paths[D_WFSROOT_IDX] = s_user_paths[D_USER_IDX] + WFSROOT_DIR DIR_SEP;
     s_user_paths[D_BACKUP_IDX] = s_user_paths[D_USER_IDX] + BACKUP_DIR DIR_SEP;
     s_user_paths[D_RESOURCEPACK_IDX] = s_user_paths[D_USER_IDX] + RESOURCEPACK_DIR DIR_SEP;
+    s_user_paths[D_SUBTITLES_IDX] = s_user_paths[D_LOAD_IDX] + SUBTITLE_DIR DIR_SEP;
     s_user_paths[D_DYNAMICINPUT_IDX] = s_user_paths[D_LOAD_IDX] + DYNAMICINPUT_DIR DIR_SEP;
     s_user_paths[D_GRAPHICSMOD_IDX] = s_user_paths[D_LOAD_IDX] + GRAPHICSMOD_DIR DIR_SEP;
     s_user_paths[D_WIISDCARDSYNCFOLDER_IDX] = s_user_paths[D_LOAD_IDX] + WIISDSYNC_DIR DIR_SEP;

Source/Core/Common/FileUtil.h

@@ -62,6 +62,7 @@ enum
   D_WFSROOT_IDX,
   D_BACKUP_IDX,
   D_RESOURCEPACK_IDX,
+  D_SUBTITLES_IDX,
   D_DYNAMICINPUT_IDX,
   D_GRAPHICSMOD_IDX,
   D_GBAUSER_IDX,

Source/Core/Common/Logging/Log.h

@@ -31,6 +31,7 @@ enum class LogType : int
   DYNA_REC,
   EXPANSIONINTERFACE,
   FILEMON,
+  SUBTITLES,
   FRAMEDUMP,
   GDB_STUB,
   GPFIFO,

Source/Core/Common/Logging/LogManager.cpp

@@ -115,6 +115,7 @@ LogManager::LogManager()
   m_log[LogType::DYNA_REC] = {"JIT", "JIT Dynamic Recompiler"};
   m_log[LogType::EXPANSIONINTERFACE] = {"EXI", "Expansion Interface"};
   m_log[LogType::FILEMON] = {"FileMon", "File Monitor"};
+  m_log[LogType::SUBTITLES] = {"Subtitles", "Subtitles"};
   m_log[LogType::FRAMEDUMP] = {"FRAMEDUMP", "FrameDump"};
   m_log[LogType::GDB_STUB] = {"GDB_STUB", "GDB Stub"};
   m_log[LogType::GPFIFO] = {"GP", "GatherPipe FIFO"};

Source/Core/Core/Boot/Boot.cpp

@@ -510,6 +510,7 @@ bool CBoot::BootUp(Core::System& system, const Core::CPUThreadGuard& guard,
     bool operator()(BootParameters::Disc& disc) const
     {
       NOTICE_LOG_FMT(BOOT, "Booting from disc: {}", disc.path);
+
       const DiscIO::VolumeDisc* volume =
           SetDisc(std::move(disc.volume), disc.auto_disc_change_paths);
 
@@ -520,6 +521,7 @@ bool CBoot::BootUp(Core::System& system, const Core::CPUThreadGuard& guard,
         return false;
 
       SConfig::OnNewTitleLoad(guard);
+
       return true;
     }
 

Source/Core/Core/ConfigManager.cpp

@@ -60,6 +60,8 @@
 #include "DiscIO/Volume.h"
 #include "DiscIO/VolumeWad.h"
 
+#include <Subtitles\Subtitles.h>
+
 SConfig* SConfig::m_Instance;
 
 SConfig::SConfig()
@@ -209,6 +211,7 @@ void SConfig::OnNewTitleLoad(const Core::CPUThreadGuard& guard)
   PatchEngine::Reload();
   HiresTexture::Update();
   WC24PatchEngine::Reload();
+  Subtitles::Reload();
 }
 
 void SConfig::LoadDefaults()

Source/Core/Core/HW/DVD/DVDThread.cpp

@@ -33,6 +33,7 @@
 
 #include "DiscIO/Enums.h"
 #include "DiscIO/Volume.h"
+#include <Subtitles\Subtitles.h>
 
 namespace DVD
 {
@@ -343,6 +344,7 @@ void DVDThread::DVDThreadMain()
     while (m_request_queue.Pop(request))
     {
       m_file_logger.Log(*m_disc, request.partition, request.dvd_offset);
+      Subtitles::OnFileAccess(*m_disc, request.partition, request.dvd_offset);
 
       std::vector<u8> buffer(request.length);
       if (!m_disc->Read(request.dvd_offset, request.length, buffer.data(), request.partition))

Source/Core/Core/HW/DVD/FileMonitor.cpp

@@ -45,6 +45,19 @@ static bool IsSoundFile(const std::string& filename)
 
   return extensions.find(extension) != extensions.end();
 }
+// Filtered files
+static bool IsVideoFile(const std::string& filename)
+{
+  std::string extension;
+  SplitPath(filename, nullptr, nullptr, &extension);
+  Common::ToLower(&extension);
+
+  static const std::unordered_set<std::string> extensions = {
+      ".thp",  // 1Wii/Game Cube Video File
+  };
+
+  return extensions.find(extension) != extensions.end();
+}
 
 FileLogger::FileLogger() = default;
 
@@ -79,9 +92,16 @@ void FileLogger::Log(const DiscIO::Volume& volume, const DiscIO::Partition& part
 
   const std::string size_string = Common::ThousandSeparate(file_info->GetSize() / 1000, 7);
   const std::string path = file_info->GetPath();
-  const std::string log_string = fmt::format("{} kB {}", size_string, path);
+  const std::string log_string = fmt::format("{} kB {} offset {}", size_string, path, offset);
+
+  //if (path.contains("BGM") || path.contains("bgm"))
+  //  return;
+
+  //TODO just use colors instead of this horrid hack
   if (IsSoundFile(path))
     INFO_LOG_FMT(FILEMON, "{}", log_string);
+  else if (IsVideoFile(path))
+    NOTICE_LOG_FMT(FILEMON, "{}", log_string);
   else
     WARN_LOG_FMT(FILEMON, "{}", log_string);
 

Source/Core/DolphinLib.vcxproj

@@ -69,31 +69,33 @@
   <ItemGroup>
     <Text Include="$(BuildInfoTemplate)" />
   </ItemGroup>
-  <UsingTask TaskName="GetProductVersion"
-    TaskFactory="CodeTaskFactory"
-    AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.Core.dll">
+  <ItemGroup>
+    <ClInclude Include="Subtitles\Helpers.h" />
+    <ClInclude Include="Subtitles\WebColors.h" />
+    <ClInclude Include="Subtitles\TranslationEntry.h" />
+    <ClInclude Include="Subtitles\Subtitles.h" />
+    <ClInclude Include="VideoCommon\OnScreenDisplay.enum.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="Subtitles\Subtitles.cpp" />
+  </ItemGroup>
+  <UsingTask TaskName="GetProductVersion" TaskFactory="CodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.Core.dll">
     <ParameterGroup>
       <Path ParameterType="System.String" Required="true" />
       <ProductVersion ParameterType="System.String" Output="true" />
     </ParameterGroup>
     <Task>
-      <Using Namespace="System.Diagnostics"/>
-      <Code Type="Fragment" Language="cs">
-        <![CDATA[
+      <Using Namespace="System.Diagnostics" />
+      <Code Type="Fragment" Language="cs"><![CDATA[
           ProductVersion = FileVersionInfo.GetVersionInfo(Path).ProductVersion;
-        ]]>
-      </Code>
+        ]]></Code>
     </Task>
   </UsingTask>
   <Target Name="WriteBuildInfo" AfterTargets="Build" Inputs="$(BuildInfoTemplate)" Outputs="$(BuildInfoOutput)">
     <GetProductVersion Path="$(VCToolsRedistInstallDir)vc_redist.x64.exe">
       <Output PropertyName="VCToolsProductVersion" TaskParameter="ProductVersion" />
     </GetProductVersion>
     <Message Text="VCToolsProductVersion $(VCToolsProductVersion)" Importance="High" />
-    <WriteLinesToFile
-      File="$(BuildInfoOutput)"
-      Lines="$([System.IO.File]::ReadAllText($(BuildInfoTemplate)).Replace('${VC_TOOLS_VERSION}', $(VCToolsProductVersion)))"
-      Overwrite="true"
-    />
+    <WriteLinesToFile File="$(BuildInfoOutput)" Lines="$([System.IO.File]::ReadAllText($(BuildInfoTemplate)).Replace('${VC_TOOLS_VERSION}', $(VCToolsProductVersion)))" Overwrite="true" />
   </Target>
 </Project>

Source/Core/Subtitles/Helpers.h

@@ -0,0 +1,69 @@
+#pragma once
+#include <string>
+#include <Common/CommonTypes.h>
+#include <Common/StringUtil.h>
+#include <VideoCommon/OnScreenDisplay.h>
+#include <picojson.h>
+#include "WebColors.h"
+
+namespace Subtitles
+{
+
+void Info(std::string msg)
+{
+  OSD::AddMessage(msg, 2000, OSD::Color::GREEN);
+  INFO_LOG_FMT(SUBTITLES, "{}", msg);
+}
+void Error(std::string err)
+{
+  OSD::AddMessage(err, 2000, OSD::Color::RED);
+  ERROR_LOG_FMT(SUBTITLES, "{}", err);
+}
+
+u32 TryParsecolor(picojson::value raw, u32 defaultColor)
+{
+  if (raw.is<double>())
+    return raw.get<double>();
+  else
+  {
+    auto str = raw.to_str();
+    Common::ToLower(&str);
+
+    if (str.starts_with("0x"))
+      // hex string
+      return std::stoul(str, nullptr, 16);
+    else if (WebColors.count(str) == 1)
+      // html color name
+      return WebColors[str];
+    else
+      // color noted with 3 or 4 base10 numers (rgb/argb)
+      try  // string parsing suucks
+      {
+        // try parse (a)rgb space delimited color
+        u32 a, r, g, b;
+        auto parts = SplitString(str, ' ');
+        if (parts.size() == 4)
+        {
+          a = std::stoul(parts[0], nullptr, 10);
+          r = std::stoul(parts[1], nullptr, 10);
+          g = std::stoul(parts[2], nullptr, 10);
+          b = std::stoul(parts[3], nullptr, 10);
+          return a << 24 | r << 16 | g << 8 | b;
+        }
+        else if (parts.size() == 3)
+        {
+          a = 255;
+          r = std::stoul(parts[0], nullptr, 10);
+          g = std::stoul(parts[1], nullptr, 10);
+          b = std::stoul(parts[2], nullptr, 10);
+          return a << 24 | r << 16 | g << 8 | b;
+        }
+      }
+      catch (std::exception x)
+      {
+        Error("Invalid color: " + str);
+      }
+  }
+  return defaultColor;
+}
+}  // namespace Subtitles