generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

VAD Refactoring: Removed assign calls

Browse Source 
These calls are not used anywhere in WebRTC and there is no plan on using them.
Removed them and updated corresponding unit tests.

Tested on trybots, vad_unittests, audioproc_unittest

BUG=None
TEST=None

Review URL: https://webrtc-codereview.appspot.com/608004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@2306 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
bjornv@webrtc.org
2012-05-28 12:25:07 +00:00
parent 0de1ee3830
commit 4e12d3065e
3 changed files with 0 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/common_audio/vad/include/webrtc_vad.h
View File

@@ -26,23 +26,6 @@ typedef struct WebRtcVadInst VadInst;
extern "C" { extern "C" {
#endif #endif
// TODO(bjornv): Investigate if we need the Assign calls below at all.
// Gets the size needed for storing the instance for the VAD.
//
// returns : The size in bytes needed to allocate memory for the VAD instance.
size_t WebRtcVad_AssignSize();
// Assigns memory for the instances at a given address. It is assumed that the
// memory for the VAD instance is allocated at |memory| in accordance with
// WebRtcVad_AssignSize().
//
// - memory [i] : Address to where the memory is assigned.
// - handle [o] : Pointer to the instance that should be created.
//
// returns : 0 - (OK), -1 (NULL pointer in)
int WebRtcVad_Assign(void* memory, VadInst** handle);
// Creates an instance to the VAD structure. // Creates an instance to the VAD structure.
// //
// - handle [o] : Pointer to the VAD instance that should be created. // - handle [o] : Pointer to the VAD instance that should be created.

13
src/common_audio/vad/vad_unittest.cc
View File

@@ -65,23 +65,10 @@ TEST_F(VadTest, ApiTest) {
// NULL instance tests // NULL instance tests
EXPECT_EQ(-1, WebRtcVad_Create(NULL)); EXPECT_EQ(-1, WebRtcVad_Create(NULL));
EXPECT_EQ(-1, WebRtcVad_Init(NULL)); EXPECT_EQ(-1, WebRtcVad_Init(NULL));
EXPECT_EQ(-1, WebRtcVad_Assign(NULL, NULL));
EXPECT_EQ(-1, WebRtcVad_Free(NULL)); EXPECT_EQ(-1, WebRtcVad_Free(NULL));
EXPECT_EQ(-1, WebRtcVad_set_mode(NULL, kModes[0])); EXPECT_EQ(-1, WebRtcVad_set_mode(NULL, kModes[0]));
EXPECT_EQ(-1, WebRtcVad_Process(NULL, kRates[0], speech, kFrameLengths[0])); EXPECT_EQ(-1, WebRtcVad_Process(NULL, kRates[0], speech, kFrameLengths[0]));
// WebRtcVad_AssignSize() test.
size_t handle_size_bytes = WebRtcVad_AssignSize();
EXPECT_EQ(576u, handle_size_bytes);
// WebRtcVad_Assign() tests.
void* tmp_handle = malloc(handle_size_bytes);
EXPECT_EQ(-1, WebRtcVad_Assign(NULL, &handle));
EXPECT_EQ(-1, WebRtcVad_Assign(tmp_handle, NULL));
EXPECT_EQ(0, WebRtcVad_Assign(tmp_handle, &handle));
EXPECT_EQ(handle, tmp_handle);
free(tmp_handle);
// WebRtcVad_Create() // WebRtcVad_Create()
ASSERT_EQ(0, WebRtcVad_Create(&handle)); ASSERT_EQ(0, WebRtcVad_Create(&handle));

13
src/common_audio/vad/webrtc_vad.c
View File

@@ -16,19 +16,6 @@
static const int kInitCheck = 42; static const int kInitCheck = 42;
size_t WebRtcVad_AssignSize() {
return sizeof(VadInstT);
}
int WebRtcVad_Assign(void* memory, VadInst** handle) {
if (handle == NULL || memory == NULL) {
return -1;
}
*handle = (VadInst*) memory;
return 0;
}
int WebRtcVad_Create(VadInst** handle) { int WebRtcVad_Create(VadInst** handle) {
VadInstT* self = NULL; VadInstT* self = NULL;