Changeset 103

Timestamp:

Aug 26, 2012, 6:21:32 AM (11 years ago)

Author:

roman

Message:

 

Location:

trunk/Utilities/CaptureClock

Files:

• CaptureClock.rc (modified) (previous)
• CaptureClock_i.c (modified) (1 diff)
• CaptureClock_i.h (modified) (1 diff)
• MainDialog.h (modified) (6 diffs)
• _Bin/Release Trace/CaptureClock.exe (modified) (previous)

trunk/Utilities/CaptureClock/CaptureClock_i.c

@@ -7 +7 @@
 
  /* File created by MIDL compiler version 7.00.0555 */
-/* at Sun Aug 26 15:46:09 2012
+/* at Sun Aug 26 16:17:50 2012
  */
 /* Compiler settings for CaptureClock.idl:

trunk/Utilities/CaptureClock/CaptureClock_i.h

@@ -5 +5 @@
 
  /* File created by MIDL compiler version 7.00.0555 */
-/* at Sun Aug 26 15:46:09 2012
+/* at Sun Aug 26 16:17:50 2012
  */
 /* Compiler settings for CaptureClock.idl:

trunk/Utilities/CaptureClock/MainDialog.h

@@ -470 +470 @@
                                 const BOOL bLog = ++m_nTimerEventIndex % 30 == 0;
                                 CRoArrayT<CString> Array;
+                                REFERENCE_TIME nSystemTime;
+                                if(m_pReferenceClock)
+                                {
+                                        _V(m_pReferenceClock->GetTime(&nSystemTime));
+                                        nSystemTime -= m_nAnchorTime;
+                                        m_SystemTimeEdit.SetValue(AtlFormatString(_T("%s"), _FilterGraphHelper::FormatReferenceTime(nSystemTime)));
+                                        if(bLog)
+                                                Array.Add(AtlFormatString(_T("%I64d"), (nSystemTime + 5000i64 - 1) / 10000i64));
+                                }
                                 if(m_pVideoRendererFilter)
                                 {
@@ -480 +489 @@
                                                 Array.Add(AtlFormatString(_T("%d"), nCount));
                                                 Array.Add(AtlFormatString(_T("%I64d"), (nTime + 5000i64 - 1) / 10000i64));
+                                                Array.Add(AtlFormatString(_T("%I64d"), ((nTime - nSystemTime) + 5000i64 - 1) / 10000i64));
                                         }
                                 }
@@ -492 +502 @@
                                                 Array.Add(AtlFormatString(_T("%d"), nCount));
                                                 Array.Add(AtlFormatString(_T("%I64d"), (nTime + 5000i64 - 1) / 10000i64));
+                                                Array.Add(AtlFormatString(_T("%I64d"), ((nTime - nSystemTime) + 5000i64 - 1) / 10000i64));
                                         }
                                 }
-                                if(m_pReferenceClock)
-                                {
-                                        REFERENCE_TIME nTime;
-                                        _V(m_pReferenceClock->GetTime(&nTime));
-                                        nTime -= m_nAnchorTime;
-                                        m_SystemTimeEdit.SetValue(AtlFormatString(_T("%s"), _FilterGraphHelper::FormatReferenceTime(nTime)));
-                                        if(bLog)
-                                                Array.InsertAt(0, AtlFormatString(_T("%I64d"), (nTime + 5000i64 - 1) / 10000i64));
-                                }
-                                if(bLog && Array.GetCount() == 5)
+                                if(bLog && Array.GetCount() == 1 + 3 + 3)
                                 {
                                         if(m_sLog.IsEmpty())
@@ -512 +514 @@
                                                         _T("Video Sample Count"),
                                                         _T("Video Sample Time"),
+                                                        _T("Relative Video Sample Time"),
                                                         _T("Audio Sample Count"),
                                                         _T("Audio Sample Time"),
+                                                        _T("Relative Audio Sample Time"),
                                                 };
                                                 m_sLog.Append(_StringHelper::Join(g_ppszHeader, _T("\t")) + _T("\r\n"));
@@ -579 +583 @@
                                 pRendererFilter->Initialize(MEDIATYPE_Audio);
                                 __C(m_FilterGraph->AddFilter(pRendererFilter, CT2CW(_T("Audio Renderer"))));
-                                __C(m_FilterGraph->Connect(GetCapturePin(pSourceBaseFilter), pRendererFilter->GetInputPin()));
+                                const CComPtr<IPin> pCapturePin = GetCapturePin(pSourceBaseFilter);
+                                _ATLTRY
+                                {
+                                        const CComQIPtr<IAMBufferNegotiation> pAmBufferNegotiation = pCapturePin;
+                                        __D(pAmBufferNegotiation, E_NOINTERFACE);
+                                        const CComQIPtr<IAMStreamConfig> pAmStreamConfig = pCapturePin;
+                                        __D(pAmStreamConfig, E_NOINTERFACE);
+                                        CMediaType pMediaType;
+                                        __C(pAmStreamConfig->GetFormat(&pMediaType));
+                                        const CWaveFormatEx* pWaveFormatEx = pMediaType.GetWaveFormatEx();
+                                        __D(pWaveFormatEx, E_UNNAMED);
+                                        ALLOCATOR_PROPERTIES Properties;
+                                        Properties.cbAlign = -1;
+                                        Properties.cbBuffer = pWaveFormatEx->nAvgBytesPerSec / 10; // 100 millisecond
+                                        Properties.cbPrefix = -1;
+                                        Properties.cBuffers = 50; // 50 buffers (5 seconds in total)
+                                        __C(pAmBufferNegotiation->SuggestAllocatorProperties(&Properties));
+                                }
+                                _ATLCATCHALL()
+                                {
+                                        _Z_EXCEPTION();
+                                }
+                                __C(m_FilterGraph->Connect(pCapturePin, pRendererFilter->GetInputPin()));
                                 m_pAudioRendererFilter = pRendererFilter;
                         }
@@ -616 +642 @@
                 if(!m_sLog.IsEmpty())
                 {
-                        SetClipboardText(m_hWnd, m_sLog);
+                        CString sLog;
+                        OSVERSIONINFO VersionInformation = { sizeof VersionInformation };
+                        _W(GetVersionEx(&VersionInformation));
+                        _A(VersionInformation.dwPlatformId == VER_PLATFORM_WIN32_NT);
+                        sLog += AtlFormatString(_T("Windows Version") _T("\t") _T("%d.%d.%d %s") _T("\r\n"), VersionInformation.dwMajorVersion, VersionInformation.dwMinorVersion, VersionInformation.dwBuildNumber, VersionInformation.szCSDVersion);
+                        CFilterData& VideoFilterData = m_VideoDeviceComboBox.GetItemData(m_VideoDeviceComboBox.GetCurSel());
+                        sLog += AtlFormatString(_T("Video Device") _T("\t") _T("%ls") _T("\t") _T("%ls") _T("\r\n"), VideoFilterData.GetFriendlyName(), VideoFilterData.GetMonikerDisplayName());
+                        CFilterData& AudioFilterData = m_AudioDeviceComboBox.GetItemData(m_AudioDeviceComboBox.GetCurSel());
+                        sLog += AtlFormatString(_T("Audio Device") _T("\t") _T("%ls") _T("\t") _T("%ls") _T("\r\n"), AudioFilterData.GetFriendlyName(), AudioFilterData.GetMonikerDisplayName());
+                        sLog += _T("\r\n");
+                        sLog += m_sLog;
+                        SetClipboardText(m_hWnd, sLog);
                         MessageBeep(MB_OK);
                 }