Changeset 143 for trunk

Timestamp:

Nov 15, 2012, 12:09:33 PM (11 years ago)

Author:

roman

Message:

 

Location:

trunk/Utilities/DumpMediaSamples

Files:

• DumpMediaSamples.cpp (modified) (9 diffs)
• DumpMediaSamples.vcxproj.filters (modified) (1 diff)
• Release/DumpMediaSamples.exe (modified) (previous)

trunk/Utilities/DumpMediaSamples/DumpMediaSamples.cpp

@@ -167 +167 @@
 
         private:
+                CModule* m_pModule;
                 CString m_sName;
                 CString m_sNamePrefix;
@@ -174 +175 @@
         public:
         // CSampleGrabberCallback
+                CSampleGrabberCallback() :
+                        m_pModule(NULL)
+                {
+                        _Z4(atlTraceRefcount, 4, _T("this 0x%p\n"), this);
+                }
+                ~CSampleGrabberCallback()
+                {
+                        _Z4(atlTraceRefcount, 4, _T("this 0x%p\n"), this);
+                }
+                VOID Initialize(CModule* pModule)
+                {
+                        _A(!m_pModule && pModule);
+                        m_pModule = pModule;
+                }
                 VOID SetName(const CString& sName)
                 {
@@ -186 +201 @@
                         m_pMediaType = pMediaType;
                 }
-                static VOID PrintMediaType(const CMediaType& pMediaType)
-                {
-                        _tprintf(_T("Media Type:\n\n"));
+                VOID PrintMediaType(const CMediaType& pMediaType)
+                {
+                        _tprintf(_T("%s") _T("Media Type:\n\n"), m_sNamePrefix);
                         _tprintf(_T("majortype %ls, subtype %ls, pUnk 0x%08x\n"), _PersistHelper::StringFromIdentifier(pMediaType->majortype), _PersistHelper::StringFromIdentifier(pMediaType->subtype), (LONG) (LONG_PTR) pMediaType->pUnk);
                         _tprintf(_T("bFixedSizeSamples %d, bTemporalCompression %d, lSampleSize %d\n"), pMediaType->bFixedSizeSamples, pMediaType->bTemporalCompression, pMediaType->lSampleSize);
@@ -241 +256 @@
 
         // ISampleGrabberCB
-        STDMETHOD(SampleCB)(DOUBLE fSampleTime, IMediaSample* pMediaSample) throw()
+        STDMETHOD(SampleCB)(DOUBLE fSampleTime, IMediaSample* pMediaSample)
                 {
                         _A(pMediaSample);
@@ -248 +263 @@
                                 CMediaSampleProperties Properties(pMediaSample);
                                 _A(!Properties.pMediaType);
+                                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"), 
                                         m_sNamePrefix,
@@ -283 +299 @@
                         return S_OK;
                 }
-        STDMETHOD(BufferCB)(DOUBLE fSampleTime, BYTE* pnBuffer, LONG nBufferSize) throw()
+        STDMETHOD(BufferCB)(DOUBLE fSampleTime, BYTE* pnBuffer, LONG nBufferSize)
                 {
                         return S_OK;
@@ -294 +310 @@
         CPath m_sPath;
         BOOL m_bNoReferenceClock;
+        mutable CRoCriticalSection m_PrintCriticalSection;
 
 public:
@@ -319 +336 @@
                 return pszPath;
         }
-        CModule() throw()
+        CModule()
         {
                 //m_sPath = GetDefaultPath();
                 m_bNoReferenceClock = FALSE;
         }
-        ~CModule() throw()
+        ~CModule()
         {
         }
@@ -349 +366 @@
                         CObjectPtr<CSampleGrabberCallback> pSampleGrabberCallback;
                         pSampleGrabberCallback.Construct();
+                        pSampleGrabberCallback->Initialize(this);
                         if(FilterArray.GetCount() > 1)
                                 pSampleGrabberCallback->SetName(AtlFormatString(_T("%c"), 'A' + nSampleGrabberIndex));

trunk/Utilities/DumpMediaSamples/DumpMediaSamples.vcxproj.filters

@@ -3 +3 @@
   <ItemGroup>
     <Filter Include="Source Files">
-      <UniqueIdentifier>{107cb1f6-e3bf-4bb8-bea5-8d5990c208fd}</UniqueIdentifier>
+      <UniqueIdentifier>{0399a72a-f850-4b5d-a481-3e32e763561e}</UniqueIdentifier>
       <Extensions>cpp;c;cxx;def;odl;idl;hpj;bat;asm</Extensions>
     </Filter>
     <Filter Include="Header Files">
-      <UniqueIdentifier>{a595f9cc-033d-4760-abad-3fc43fd8c042}</UniqueIdentifier>
+      <UniqueIdentifier>{16237c05-6860-49ec-a0cf-fa7c9efefbfe}</UniqueIdentifier>
       <Extensions>h;hpp;hxx;hm;inl;inc</Extensions>
     </Filter>
     <Filter Include="Resource Files">
-      <UniqueIdentifier>{d711e111-1804-4c3c-88c4-660ec21a1d5c}</UniqueIdentifier>
+      <UniqueIdentifier>{a7c3bd78-bfbe-4980-8cb7-96c550521289}</UniqueIdentifier>
       <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>
     </Filter>