Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(220)

Unified Diff: webrtc/modules/video_processing/main/source/video_processing_impl.h

Issue 1346643002: Remove id from VideoProcessingModule. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: webrtc/modules/video_processing/main/source/video_processing_impl.h
diff --git a/webrtc/modules/video_processing/main/source/video_processing_impl.h b/webrtc/modules/video_processing/main/source/video_processing_impl.h
index 437d1d63589b9ceb544070cb98255486c1bcbc01..fed5197f4976315db5578fcdec4f6dd9b0fd2cfa 100644
--- a/webrtc/modules/video_processing/main/source/video_processing_impl.h
+++ b/webrtc/modules/video_processing/main/source/video_processing_impl.h
@@ -11,6 +11,7 @@
#ifndef WEBRTC_MODULE_VIDEO_PROCESSING_IMPL_H
#define WEBRTC_MODULE_VIDEO_PROCESSING_IMPL_H
+#include "webrtc/base/criticalsection.h"
#include "webrtc/modules/video_processing/main/interface/video_processing.h"
#include "webrtc/modules/video_processing/main/source/brighten.h"
#include "webrtc/modules/video_processing/main/source/brightness_detection.h"
@@ -22,9 +23,8 @@ class CriticalSectionWrapper;
class VideoProcessingModuleImpl : public VideoProcessingModule {
public:
- VideoProcessingModuleImpl(int32_t id);
-
- virtual ~VideoProcessingModuleImpl();
+ VideoProcessingModuleImpl();
+ ~VideoProcessingModuleImpl() override;
void Reset() override;
@@ -64,8 +64,8 @@ class VideoProcessingModuleImpl : public VideoProcessingModule {
VideoContentMetrics* ContentMetrics() const override;
private:
- CriticalSectionWrapper& mutex_;
- VPMDeflickering deflickering_;
+ mutable rtc::CriticalSection mutex_;
+ VPMDeflickering deflickering_ GUARDED_BY(mutex_);
VPMBrightnessDetection brightness_detection_;
VPMFramePreprocessor frame_pre_processor_;
};

Powered by Google App Engine
This is Rietveld 408576698