Bug 1322459 part 1 - Remove duplicate mRefCnt in CaptureSinkFilter. r?ehsan draft
authorTing-Yu Chou <janus926@gmail.com>
Tue, 13 Dec 2016 15:48:18 +0800
changeset 448936 50b2cbccdeea0e9c7eb45b245ec2b448c500075d
parent 448717 f46f85dcfbc2b3098ea758825d18be6fab33cbc6
child 448937 af5e620e2aeb2a8196ac82c7fe442addec2b39ff
child 449836 60132266d417d52564d5d245ba63940c0a72d63b
push id38489
push userbmo:janus926@gmail.com
push dateTue, 13 Dec 2016 09:12:11 +0000
reviewersehsan
bugs1322459
milestone53.0a1
Bug 1322459 part 1 - Remove duplicate mRefCnt in CaptureSinkFilter. r?ehsan MozReview-Commit-ID: IdIjzeMI9fI
media/webrtc/trunk/webrtc/modules/video_capture/windows/sink_filter_ds.h
--- a/media/webrtc/trunk/webrtc/modules/video_capture/windows/sink_filter_ds.h
+++ b/media/webrtc/trunk/webrtc/modules/video_capture/windows/sink_filter_ds.h
@@ -76,31 +76,16 @@ public:
     void SetFilterGraph(IGraphBuilder* graph); // Used if EVR
 
     //  --------------------------------------------------------------------
     //  COM interfaces
     STDMETHODIMP QueryInterface(REFIID aIId, void **aInterface)
     {
       return mozilla::media::BaseFilter::QueryInterface(aIId, aInterface);
     }
-    STDMETHODIMP_(ULONG) AddRef()
-    {
-      return ::InterlockedIncrement(&mRefCnt);
-    }
-
-    STDMETHODIMP_(ULONG) Release()
-    {
-      unsigned long newRefCnt = ::InterlockedDecrement(&mRefCnt);
-
-      if (!newRefCnt) {
-        delete this;
-      }
-
-      return newRefCnt;
-    }
 
     STDMETHODIMP SetMatchingMediaType(const VideoCaptureCapability& capability);
 
     //  --------------------------------------------------------------------
     //  CBaseFilter methods
     int GetPinCount ();
     mozilla::media::BasePin * GetPin ( IN int Index);
     STDMETHODIMP Pause ();
@@ -110,13 +95,12 @@ public:
     //  class factory calls this
     static IUnknown * CreateInstance (IN LPUNKNOWN punk, OUT HRESULT * phr);
 private:
     mozilla::CriticalSection m_crtFilter; //  filter lock
     mozilla::CriticalSection m_crtRecv;  //  receiver lock; always acquire before filter lock
     CaptureInputPin * m_pInput;
     VideoCaptureExternal& _captureObserver;
     int32_t _moduleId;
-    unsigned long mRefCnt;
 };
 }  // namespace videocapturemodule
 }  // namespace webrtc
 #endif // WEBRTC_MODULES_VIDEO_CAPTURE_MAIN_SOURCE_WINDOWS_SINK_FILTER_DS_H_