diff --git a/.gitignore b/.gitignore index 83a0083..dfb8881 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ BuildResults -xcuserdata \ No newline at end of file +xcuserdata +.DS_Store + diff --git a/Sources/Extras/CoreMediaIO/DeviceAbstractionLayer/Devices/Sample/Assistant/Server/Device/CMIO_DPA_Sample_Server_VCamDevice.cpp b/Sources/Extras/CoreMediaIO/DeviceAbstractionLayer/Devices/Sample/Assistant/Server/Device/CMIO_DPA_Sample_Server_VCamDevice.cpp index fe13dd5..8738521 100644 --- a/Sources/Extras/CoreMediaIO/DeviceAbstractionLayer/Devices/Sample/Assistant/Server/Device/CMIO_DPA_Sample_Server_VCamDevice.cpp +++ b/Sources/Extras/CoreMediaIO/DeviceAbstractionLayer/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/Sources/Extras/CoreMediaIO/DeviceAbstractionLayer/Devices/Sample/Assistant/com.apple.cmio.DPA.SampleVCam.plist b/Sources/Extras/CoreMediaIO/DeviceAbstractionLayer/Devices/Sample/Assistant/com.apple.cmio.DPA.SampleVCam.plist index f0d2846..a099c77 100644 --- a/Sources/Extras/CoreMediaIO/DeviceAbstractionLayer/Devices/Sample/Assistant/com.apple.cmio.DPA.SampleVCam.plist +++ b/Sources/Extras/CoreMediaIO/DeviceAbstractionLayer/Devices/Sample/Assistant/com.apple.cmio.DPA.SampleVCam.plist @@ -6,7 +6,7 @@ com.apple.cmio.DPA.SampleVCam ProgramArguments - /Library/CoreMediaIO/Plug-Ins/DAL/Sample.plugin/Contents/Resources/SampleVCamAssistant + /Library/CoreMediaIO/Plug-Ins/DAL/SampleVCam.plugin/Contents/Resources/SampleVCamAssistant MachServices