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

Unified Diff: modules/audio_conference_mixer/source/memory_pool.h

Issue 3015553002: Remove voe::OutputMixer and AudioConferenceMixer. (Closed)
Patch Set: remove conference mixer from presubmit.py Created 3 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: modules/audio_conference_mixer/source/memory_pool.h
diff --git a/modules/audio_conference_mixer/source/memory_pool.h b/modules/audio_conference_mixer/source/memory_pool.h
deleted file mode 100644
index 4e93596380f7f358fad2b83dfcd357170eae9309..0000000000000000000000000000000000000000
--- a/modules/audio_conference_mixer/source/memory_pool.h
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- * Use of this source code is governed by a BSD-style license
- * that can be found in the LICENSE file in the root of the source
- * tree. An additional intellectual property rights grant can be found
- * in the file PATENTS. All contributing project authors may
- * be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_AUDIO_CONFERENCE_MIXER_SOURCE_MEMORY_POOL_H_
-#define MODULES_AUDIO_CONFERENCE_MIXER_SOURCE_MEMORY_POOL_H_
-
-#include <assert.h>
-
-#include "typedefs.h" // NOLINT(build/include)
-
-#ifdef _WIN32
-#include "modules/audio_conference_mixer/source/memory_pool_win.h"
-#else
-#include "modules/audio_conference_mixer/source/memory_pool_posix.h"
-#endif
-
-namespace webrtc {
-
-template<class MemoryType>
-class MemoryPool
-{
-public:
- // Factory method, constructor disabled.
- static int32_t CreateMemoryPool(MemoryPool*& memoryPool,
- uint32_t initialPoolSize);
-
- // Try to delete the memory pool. Fail with return value -1 if there is
- // outstanding memory.
- static int32_t DeleteMemoryPool(
- MemoryPool*& memoryPool);
-
- // Get/return unused memory.
- int32_t PopMemory(MemoryType*& memory);
- int32_t PushMemory(MemoryType*& memory);
-private:
- MemoryPool(int32_t initialPoolSize);
- ~MemoryPool();
-
- MemoryPoolImpl<MemoryType>* _ptrImpl;
-};
-
-template<class MemoryType>
-MemoryPool<MemoryType>::MemoryPool(int32_t initialPoolSize)
-{
- _ptrImpl = new MemoryPoolImpl<MemoryType>(initialPoolSize);
-}
-
-template<class MemoryType>
-MemoryPool<MemoryType>::~MemoryPool()
-{
- delete _ptrImpl;
-}
-
-template<class MemoryType> int32_t
-MemoryPool<MemoryType>::CreateMemoryPool(MemoryPool*& memoryPool,
- uint32_t initialPoolSize)
-{
- memoryPool = new MemoryPool(initialPoolSize);
- if(memoryPool == NULL)
- {
- return -1;
- }
- if(memoryPool->_ptrImpl == NULL)
- {
- delete memoryPool;
- memoryPool = NULL;
- return -1;
- }
- if(!memoryPool->_ptrImpl->Initialize())
- {
- delete memoryPool;
- memoryPool = NULL;
- return -1;
- }
- return 0;
-}
-
-template<class MemoryType>
-int32_t MemoryPool<MemoryType>::DeleteMemoryPool(MemoryPool*& memoryPool)
-{
- if(memoryPool == NULL)
- {
- return -1;
- }
- if(memoryPool->_ptrImpl == NULL)
- {
- return -1;
- }
- if(memoryPool->_ptrImpl->Terminate() == -1)
- {
- return -1;
- }
- delete memoryPool;
- memoryPool = NULL;
- return 0;
-}
-
-template<class MemoryType>
-int32_t MemoryPool<MemoryType>::PopMemory(MemoryType*& memory)
-{
- return _ptrImpl->PopMemory(memory);
-}
-
-template<class MemoryType>
-int32_t MemoryPool<MemoryType>::PushMemory(MemoryType*& memory)
-{
- if(memory == NULL)
- {
- return -1;
- }
- return _ptrImpl->PushMemory(memory);
-}
-} // namespace webrtc
-
-#endif // MODULES_AUDIO_CONFERENCE_MIXER_SOURCE_MEMORY_POOL_H_

Powered by Google App Engine
This is Rietveld 408576698