unit_test ONLY: CSRIAPI: use libass rendering

jesec · Feb 11, 2019 · 17a8b6f · 17a8b6f
1 parent d1ede28
commit 17a8b6f
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 1 deletion.
diff --git a/src/filters/transform/vsfilter/VSFilter.vcxproj b/src/filters/transform/vsfilter/VSFilter.vcxproj
@@ -99,6 +99,7 @@
       <PrecompiledHeader>Create</PrecompiledHeader>
     </ClCompile>
     <ClCompile Include="StyleEditorDialog.cpp" />
+    <ClCompile Include="SubFrame.cpp" />
     <ClCompile Include="SubRenderOptionsImpl.cpp" />
     <ClCompile Include="Systray.cpp" />
     <ClCompile Include="TextInputPin.cpp" />
@@ -119,6 +120,7 @@
     <ClInclude Include="resource.h" />
     <ClInclude Include="StdAfx.h" />
     <ClInclude Include="StyleEditorDialog.h" />
+    <ClInclude Include="SubFrame.h" />
     <ClInclude Include="SubRenderOptionsImpl.h" />
     <ClInclude Include="Systray.h" />
     <ClInclude Include="TextInputPin.h" />

diff --git a/src/filters/transform/vsfilter/VSFilter.vcxproj.filters b/src/filters/transform/vsfilter/VSFilter.vcxproj.filters
@@ -80,6 +80,9 @@
     <ClCompile Include="DirectVobSubFilterDll.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="SubFrame.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="csri.h">
@@ -145,6 +148,9 @@
     <ClInclude Include="XyOptionsImpl.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="SubFrame.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="VSFilter.def">

diff --git a/src/filters/transform/vsfilter/csriapi.cpp b/src/filters/transform/vsfilter/csriapi.cpp
@@ -41,6 +41,7 @@ extern "C" struct csri_vsfilter_inst {
 };
 typedef struct csri_vsfilter_inst csri_inst;
 #include "csri.h"
+#include "SubFrame.h"
 static csri_rend csri_vsfilter = "vsfilter";
 
 
@@ -154,7 +155,14 @@ CSRIAPI void csri_render(csri_inst *inst, struct csri_frame *frame, double time)
 	}
 	spd.vidrect = inst->video_rect;
 
-	inst->rts->Render(spd, (REFERENCE_TIME)(time*10000000), arbitrary_framerate, inst->video_rect);
+    if (inst->rts->m_assloaded) {
+        ass_set_frame_size(inst->rts->m_renderer.get(), inst->video_rect.right, inst->video_rect.bottom);
+        CComPtr<ISubRenderFrame> sub_render_frame = new SubFrame(inst->video_rect, 0, ass_render_frame(inst->rts->m_renderer.get(), inst->rts->m_track.get(), time * 1000, 0));
+    }
+    else
+    {
+        inst->rts->Render(spd, (REFERENCE_TIME)(time * 10000000), arbitrary_framerate, inst->video_rect);
+    }
 }