Merge pull request #10 from johnboiles/master

Fix two small issues
lvsti · Mar 27, 2020 · c759f19 · c759f19
2 parents c22ebc2 + 1779488
commit c759f19
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,4 @@
 BuildResults
-xcuserdata
+xcuserdata
+.DS_Store
+
diff --git a/...ractionLayer/Devices/Sample/Assistant/Server/Device/CMIO_DPA_Sample_Server_VCamDevice.cpp b/...ractionLayer/Devices/Sample/Assistant/Server/Device/CMIO_DPA_Sample_Server_VCamDevice.cpp
@@ -14,6 +14,7 @@
 
 // Internal Includes
 #include "CMIO_DPA_Sample_Server_VCamInputStream.h"
+#include "CAHostTimeBase.h"
 
 namespace CMIO { namespace DPA { namespace Sample { namespace Server
 {
@@ -83,8 +84,8 @@ namespace CMIO { namespace DPA { namespace Sample { namespace Server
             fseek(vcamDevice->mSequenceFile, (vcamDevice->mFrameIndex % vcamDevice->mFrameCount) * vcamDevice->mFrameSize, SEEK_SET);
             fread(framebuffer, 1, vcamDevice->mFrameSize, vcamDevice->mSequenceFile);
             ++vcamDevice->mFrameIndex;
-
-            UInt64 vbiTime = vcamDevice->mInputStream->GetTimecode() * 1000000000.0;
+            // Hack because it seems that vcamDevice->mInputStream->GetTimecode() is always 0
+            UInt64 vbiTime = CAHostTimeBase::GetCurrentTimeInNanos();
             vcamDevice->mInputStream->FrameArrived(vcamDevice->mFrameSize, framebuffer, vbiTime);
         }
 

diff --git a/...diaIO/DeviceAbstractionLayer/Devices/Sample/Assistant/com.apple.cmio.DPA.SampleVCam.plist b/...diaIO/DeviceAbstractionLayer/Devices/Sample/Assistant/com.apple.cmio.DPA.SampleVCam.plist
@@ -6,7 +6,7 @@
 	<string>com.apple.cmio.DPA.SampleVCam</string>
 	<key>ProgramArguments</key>
 	<array>
-		<string>/Library/CoreMediaIO/Plug-Ins/DAL/Sample.plugin/Contents/Resources/SampleVCamAssistant</string>
+		<string>/Library/CoreMediaIO/Plug-Ins/DAL/SampleVCam.plugin/Contents/Resources/SampleVCamAssistant</string>
 	</array>
 	<key>MachServices</key>
 	<dict>