Changeset 4661

Timestamp:

03/02/10 12:44:50 (3 years ago)

Author:

douglask

Message:

Removed dependency on ATL and atlbase.h in grabber-decklink.cpp.

Added code to ignore old captured frames in grabber-decklink.cpp.

Location:

vic/branches/mpeg4

Files:

• vic.2008.vcproj (modified) (4 diffs)
• video/grabber-decklink.cpp (modified) (9 diffs)

vic/branches/mpeg4/vic.2008.vcproj

@@ -75 +75 @@
                         <Tool
                                 Name="VCLinkerTool"
-                                AdditionalDependencies="tcl85.lib tk85.lib uclmm.lib ws2_32.lib iphlpapi.lib vfw32.lib ddraw.lib dxguid.lib strmiids.lib quartz.lib"
+                                AdditionalDependencies="tcl85.lib tk85.lib uclmm.lib ws2_32.lib comsuppwd.lib iphlpapi.lib vfw32.lib ddraw.lib dxguid.lib strmiids.lib quartz.lib"
                                 LinkIncremental="2"
                                 AdditionalLibraryDirectories="C:\Tcl\lib;&quot;$(DXSDK_DIR)\Lib\x86&quot;;&quot;$(SolutionDir)Debug&quot;"
@@ -158 +158 @@
                         <Tool
                                 Name="VCLinkerTool"
-                                AdditionalDependencies="tcl85.lib tk85.lib uclmm.lib ws2_32.lib iphlpapi.lib vfw32.lib ddraw.lib dxguid.lib strmiids.lib quartz.lib"
+                                AdditionalDependencies="tcl85.lib tk85.lib uclmm.lib ws2_32.lib comsuppwd.lib iphlpapi.lib vfw32.lib ddraw.lib dxguid.lib strmiids.lib quartz.lib"
                                 LinkIncremental="1"
                                 AdditionalLibraryDirectories="C:\Tcl\lib;&quot;$(DXSDK_DIR)\Lib\x86&quot;;&quot;$(SolutionDir)Release&quot;"
@@ -242 +242 @@
                         <Tool
                                 Name="VCLinkerTool"
-                                AdditionalDependencies="tcl85.lib tk85.lib uclmm.lib ws2_32.lib iphlpapi.lib vfw32.lib ddraw.lib dxguid.lib strmiids.lib quartz.lib libgcc.a libmingwex.a libavcodec.a libavutil.a libpostproc.a libswscale.a libpthread.a libx264.a libz.a"
+                                AdditionalDependencies="tcl85.lib tk85.lib uclmm.lib ws2_32.lib comsuppwd.lib iphlpapi.lib vfw32.lib ddraw.lib dxguid.lib strmiids.lib quartz.lib libgcc.a libmingwex.a libavcodec.a libavutil.a libpostproc.a libswscale.a libpthread.a libx264.a libz.a"
                                 LinkIncremental="2"
                                 AdditionalLibraryDirectories="C:\Tcl\lib;&quot;$(DXSDK_DIR)\Lib\x86&quot;;C:\msys\1.0\lib;&quot;C:\mingw\lib\gcc\mingw32\4.2.1-sjlj&quot;;c:\mingw\local\lib;c:\mingw\local\bin;c:\mingw\lib;C:\msys\lib;&quot;$(SolutionDir)Debug&quot;;C:\msys\1.0\local\lib;C:\msys\local\lib;C:\msys\1.0\lib\gcc\mingw32\4.4.0;C:\msys\1.0\lib\gcc\mingw32\4.2.0;C:\msys\lib\gcc\mingw32\4.4.0;C:\msys\lib\gcc\mingw32\4.2.0"
@@ -328 +328 @@
                         <Tool
                                 Name="VCLinkerTool"
-                                AdditionalDependencies="tcl85.lib tk85.lib uclmm.lib ws2_32.lib iphlpapi.lib vfw32.lib ddraw.lib dxguid.lib strmiids.lib quartz.lib libgcc.a libmingwex.a libavcodec.a libavutil.a libpostproc.a libswscale.a libpthread.a libx264.a libz.a"
+                                AdditionalDependencies="tcl85.lib tk85.lib uclmm.lib ws2_32.lib comsuppwd.lib iphlpapi.lib vfw32.lib ddraw.lib dxguid.lib strmiids.lib quartz.lib libgcc.a libmingwex.a libavcodec.a libavutil.a libpostproc.a libswscale.a libpthread.a libx264.a libz.a"
                                 LinkIncremental="1"
                                 AdditionalLibraryDirectories="C:\Tcl\lib;&quot;$(DXSDK_DIR)\Lib\x86&quot;;C:\msys\1.0\lib;&quot;C:\mingw\lib\gcc\mingw32\4.2.1-sjlj&quot;;c:\mingw\local\lib;c:\mingw\local\bin;c:\mingw\lib;C:\msys\lib;&quot;$(SolutionDir)Release&quot;;C:\msys\1.0\local\lib;C:\msys\local\lib;C:\msys\1.0\lib\gcc\mingw32\4.4.0;C:\msys\1.0\lib\gcc\mingw32\4.2.0;C:\msys\lib\gcc\mingw32\4.4.0;C:\msys\lib\gcc\mingw32\4.2.0"

vic/branches/mpeg4/video/grabber-decklink.cpp

@@ -47 +47 @@
 
 #if defined(_WIN32) || defined(_WIN64)
-#include <atlbase.h>
+#include <objbase.h>
+#include <comutil.h>
 #include "DeckLinkAPI_h.h"
 #include "inttypes.h"
@@ -90 +91 @@
         mReadIndex = 0;
         mWriteIndex = 0;
+        mLastReadFrameNum = 0;
+        mLastWriteFrameNum = 0;
 #ifdef HAVE_SWSCALE
         sws_context = NULL;
@@ -113 +116 @@
             return NULL;
         }
+
+                // ignore older frames
+                if (mLastReadFrameNum >= mBufferFrameNum[mReadIndex] && mLastReadFrameNum <= 0xFFFFFFFF - mBufferSize) {
+            return NULL;
+        }
+        mLastReadFrameNum = mBufferFrameNum[mReadIndex];
 
         uint8_t *retval = (uint8_t *)(mBuffer[mReadIndex]);
@@ -236 +245 @@
 
 // fprintf(stderr, "*push* mBuffer[%i] = 0x%lx\n", mWriteIndex, mBuffer[mWriteIndex]);
+                        mBufferFrameNum[mWriteIndex] = ++mLastWriteFrameNum;
             mWriteIndex = nextElementIndex;
-
         }
 
@@ -253 +262 @@
     static const int32_t mBufferSize = 4;
     volatile uint8_t *mBuffer[mBufferSize];
+    volatile int32_t mLastReadFrameNum;
+    volatile int32_t mLastWriteFrameNum;
+    volatile uint32_t mBufferFrameNum[mBufferSize];
 #ifdef HAVE_SWSCALE
     SwsContext *sws_context;
@@ -324 +336 @@
     }
 
-    CComPtr<IDeckLinkIterator> deckLinkIterator = NULL;
-    if (CoCreateInstance(CLSID_CDeckLinkIterator, NULL, CLSCTX_INPROC_SERVER, IID_IDeckLinkIterator, (void**)&deckLinkIterator) != S_OK || deckLinkIterator == NULL) {
+    IDeckLinkIterator* deckLinkIterator;
+    result = CoCreateInstance(CLSID_CDeckLinkIterator, NULL, CLSCTX_INPROC_SERVER, IID_IDeckLinkIterator, (void**)&deckLinkIterator);
+    if (FAILED(result)) {
         debug_msg("DeckLinkScanner: DeckLink iterator instance could not be created\n");
         CoUninitialize();
@@ -345 +358 @@
 #if defined(_WIN32) || defined(_WIN64) 
         char deviceNameString[64] = {};
-        CComBSTR cardNameBSTR;
+        BSTR cardNameBSTR;
 
         result = deckLink->GetModelName(&cardNameBSTR);
         if (result == S_OK) {
-            CW2A tmpstr1(cardNameBSTR);
+            _bstr_t tmpstr1(cardNameBSTR);
             strncpy_s(deviceNameString, sizeof(deviceNameString), tmpstr1, _TRUNCATE);
         }
@@ -463 +476 @@
 #if defined(_WIN32) || defined(_WIN64) 
         char displayModeString[64] = {};
-        CComBSTR displayModeNameBSTR;
+        BSTR displayModeNameBSTR;
 
         result = displayMode->GetName(&displayModeNameBSTR);
         if (result == S_OK) {
-            CW2A tmpstr1(displayModeNameBSTR);
+            _bstr_t tmpstr1(displayModeNameBSTR);
             strncpy_s(displayModeString, sizeof(displayModeString), tmpstr1, _TRUNCATE);
         }
@@ -643 +656 @@
 #if defined(_WIN32) || defined(_WIN64) 
                 char displayModeString[64] = {};
-                CComBSTR displayModeNameBSTR;
+                BSTR displayModeNameBSTR;
 
                 result = displayMode->GetName(&displayModeNameBSTR);
                 if (result == S_OK) {
-                    CW2A tmpstr1(displayModeNameBSTR);
+                    _bstr_t tmpstr1(displayModeNameBSTR);
                     strncpy_s(displayModeString, sizeof(displayModeString), tmpstr1, _TRUNCATE);
                 }