Skip to content

Fix two small issues #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lvsti merged 3 commits into from
Mar 27, 2020
Merged

Fix two small issues #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a65dbe1
Fix SampleVCam.plist to point to the SampleVCam.plugin
johnboiles Mar 26, 2020
a4a785a
Fix issue with 0 timestamp in VCamDevice
johnboiles Mar 26, 2020
1779488
Add .DS_Store to .gitignore
johnboiles Mar 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
BuildResults
xcuserdata
xcuserdata
.DS_Store

5 changes: 3 additions & 2 deletions ...ractionLayer/Devices/Sample/Assistant/Server/Device/CMIO_DPA_Sample_Server_VCamDevice.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@

// Internal Includes
#include "CMIO_DPA_Sample_Server_VCamInputStream.h"
#include "CAHostTimeBase.h"

namespace CMIO { namespace DPA { namespace Sample { namespace Server
{
Expand Down Expand Up @@ -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);
}

Expand Down
2 changes: 1 addition & 1 deletion ...diaIO/DeviceAbstractionLayer/Devices/Sample/Assistant/com.apple.cmio.DPA.SampleVCam.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down