1 files changed, 10 insertions, 35 deletions
diff --git a/video_engine/vie_shared_data.cc b/video_engine/vie_shared_data.cc
index bdcc0ef2..6e2ef136 100644
--- a/video_engine/vie_shared_data.cc
+++ b/video_engine/vie_shared_data.cc
@@ -19,50 +19,30 @@
 
 namespace webrtc {
 
-// Active instance counter
-int ViESharedData::instance_counter_ = 0;
-
 ViESharedData::ViESharedData(const Config& config)
-    : instance_id_(++instance_counter_),
-      initialized_(false),
-      number_cores_(CpuInfo::DetectNumberOfCores()),
-      over_use_detector_options_(),
-      channel_manager_(*new ViEChannelManager(instance_id_, number_cores_,
-                                              config)),
-      input_manager_(*new ViEInputManager(instance_id_, config)),
-      render_manager_(*new ViERenderManager(instance_id_)),
+    : number_cores_(CpuInfo::DetectNumberOfCores()),
+      channel_manager_(new ViEChannelManager(0, number_cores_, config)),
+      input_manager_(new ViEInputManager(0, config)),
+      render_manager_(new ViERenderManager(0)),
       module_process_thread_(ProcessThread::CreateProcessThread()),
       last_error_(0) {
   Trace::CreateTrace();
-  channel_manager_.SetModuleProcessThread(module_process_thread_);
-  input_manager_.SetModuleProcessThread(module_process_thread_);
+  channel_manager_->SetModuleProcessThread(module_process_thread_);
+  input_manager_->SetModuleProcessThread(module_process_thread_);
   module_process_thread_->Start();
 }
 
 ViESharedData::~ViESharedData() {
-  delete &input_manager_;
-  delete &channel_manager_;
-  delete &render_manager_;
+  // Release these ones before the process thread and the trace.
+  input_manager_.reset();
+  channel_manager_.reset();
+  render_manager_.reset();
 
   module_process_thread_->Stop();
   ProcessThread::DestroyProcessThread(module_process_thread_);
   Trace::ReturnTrace();
 }
 
-bool ViESharedData::Initialized() const {
-  return initialized_;
-}
-
-int ViESharedData::SetInitialized() {
-  initialized_ = true;
-  return 0;
-}
-
-int ViESharedData::SetUnInitialized() {
-  initialized_ = false;
-  return 0;
-}
-
 void ViESharedData::SetLastError(const int error) const {
   last_error_ = error;
 }
@@ -73,11 +53,6 @@ int ViESharedData::LastErrorInternal() const {
   return error;
 }
 
-void ViESharedData::SetOverUseDetectorOptions(
-    const OverUseDetectorOptions& options) {
-  over_use_detector_options_ = options;
-}
-
 int ViESharedData::NumberOfCores() const {
   return number_cores_;
 }