Changeset 217 for trunk/Utilities/DumpMediaSamples/DumpMediaSamples.cpp

Timestamp:

Sep 20, 2013, 6:30:04 AM (10 years ago)

Author:

roman

Message:

Custom graph loading option (made earlier) and stub to CSV print sample times

File:

• trunk/Utilities/DumpMediaSamples/DumpMediaSamples.cpp (modified) (9 diffs)

trunk/Utilities/DumpMediaSamples/DumpMediaSamples.cpp

@@ -172 +172 @@
                 CMediaType m_pMediaType;
                 CComPtr<CAbstractHandler> m_pHandler;
+                DWORD m_nPreviousFlags;
+                REFERENCE_TIME m_nPreviousStartTime;
+                REFERENCE_TIME m_nPreviousStopTime;
 
         public:
@@ -188 +191 @@
                         _A(!m_pModule && pModule);
                         m_pModule = pModule;
+                        m_nPreviousFlags = 0;
                 }
                 VOID SetName(const CString& sName)
@@ -268 +272 @@
                                 CMediaSampleProperties Properties(pMediaSample);
                                 _A(!Properties.pMediaType);
+                                CRoArrayT<CString> TimeArray;
+                                if(Properties.dwSampleFlags & AM_SAMPLE_TIMEVALID)
+                                {
+                                        CRoCriticalSectionLock DataLock(m_DataCriticalSection);
+                                        TimeArray.Add(_FilterGraphHelper::FormatReferenceTime(Properties.tStart));
+                                        if(m_nPreviousFlags & AM_SAMPLE_TIMEVALID)
+                                                TimeArray.Add(_FilterGraphHelper::FormatReferenceTime(Properties.tStart - m_nPreviousStartTime));
+                                        else
+                                                TimeArray.Add(_T(""));
+                                        if(m_nPreviousFlags & AM_SAMPLE_STOPVALID)
+                                                TimeArray.Add(_FilterGraphHelper::FormatReferenceTime(Properties.tStart - m_nPreviousStopTime));
+                                        else
+                                                TimeArray.Add(_T(""));
+                                        if(Properties.dwSampleFlags & AM_SAMPLE_STOPVALID)
+                                        {
+                                                TimeArray.Add(_FilterGraphHelper::FormatReferenceTime(Properties.tStop));
+                                                TimeArray.Add(_FilterGraphHelper::FormatReferenceTime(Properties.tStop - Properties.tStart));
+                                        }
+                                }
                                 CRoCriticalSectionLock PrintLock(m_pModule->m_PrintCriticalSection);
                                 _tprintf(_T("%s") _T("fSampleTime %s, .dwTypeSpecificFlags 0x%08x%s, .dwSampleFlags 0x%08x%s, .tStart %s, .tStop %s, .dwStreamId %d\n"), 
@@ -275 +298 @@
                                         Properties.dwSampleFlags, Properties.dwSampleFlags ? (LPCTSTR) AtlFormatString(_T(" (%s)"), StringFromSampleFlags(Properties.dwSampleFlags)) : _T(""),
                                         _FilterGraphHelper::FormatReferenceTime(Properties.tStart), 
-                                        _FilterGraphHelper::FormatReferenceTime(Properties.tStop),
+                                        _FilterGraphHelper::FormatReferenceTime(Properties.tStop), 
                                         Properties.dwStreamId,
                                         0);
@@ -296 +319 @@
                                                 0);
                                 }
+                                //_tprintf(_T("%s") _T("Time, %s") _T("\n"),
+                                //      m_sNamePrefix,
+                                //      _StringHelper::Join(TimeArray, _T(", ")), 
+                                //      0);
                                 if(m_pHandler)
                                         m_pHandler->HandleSample(Properties);
                                 _tprintf(_T("\n"));
+                                m_nPreviousFlags = Properties.dwSampleFlags;
+                                m_nPreviousStartTime = Properties.tStart;
+                                m_nPreviousStopTime = Properties.tStop;
+
                         }
                         _ATLCATCH(Exception)
@@ -317 +348 @@
         CPath m_sPath;
         BOOL m_bNoReferenceClock;
+        BOOL m_bSuppressLoadFailure;
         mutable CRoCriticalSection m_PrintCriticalSection;
 
@@ -347 +379 @@
                 //m_sPath = GetDefaultPath();
                 m_bNoReferenceClock = FALSE;
+                m_bSuppressLoadFailure = FALSE;
         }
         ~CModule()
@@ -360 +393 @@
                 CGenericFilterGraph FilterGraph;
                 FilterGraph.CoCreateInstance();
-                LoadGraphBuilderFromFile(FilterGraph.m_pFilterGraph, m_sPath);
+                _ATLTRY
+                {
+                        LoadGraphBuilderFromFile(FilterGraph.m_pFilterGraph, m_sPath);
+                }
+                _ATLCATCH(Exception)
+                {
+                        _tprintf(_T("Error loading filter graph: %s\n"), Ds::FormatResult(Exception));
+                        if(!m_bSuppressLoadFailure)
+                                _ATLRETHROW;
+                }
                 #pragma region Sample Grabbers
                 _FilterGraphHelper::CFilterArray FilterArray;
@@ -493 +535 @@
                                 {
                                         Module.m_bNoReferenceClock = TRUE;
+                                } else
+                                if(_tcschr(_T("Ee"), sArgument[0])) // Suppress Load Failure
+                                {
+                                        Module.m_bSuppressLoadFailure = TRUE;
                                 }
                                 continue;