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

Removed versions in module/audio_processing and common_audio/vad.

Browse Source 
Affected vad_unittest only.
In addition changed to correct header guards.
Review URL: https://webrtc-codereview.appspot.com/367019

git-svn-id: http://webrtc.googlecode.com/svn/trunk@1567 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
bjornv@webrtc.org
2012-01-30 09:39:08 +00:00
parent 2fd1e1e40d
commit 0c6f931420
28 changed files with 62 additions and 341 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13,8 +13,8 @@
* This header file includes the VAD API calls. Specific function calls are given below.
*/
#ifndef WEBRTC_VAD_WEBRTC_VAD_H_
#define WEBRTC_VAD_WEBRTC_VAD_H_
#ifndef WEBRTC_COMMON_AUDIO_VAD_INCLUDE_WEBRTC_VAD_H_
#define WEBRTC_COMMON_AUDIO_VAD_INCLUDE_WEBRTC_VAD_H_
#include "typedefs.h"
@@ -25,20 +25,6 @@ extern "C"
{
#endif
/****************************************************************************
* WebRtcVad_get_version(...)
*
* This function returns the version number of the code.
*
* Output:
* - version : Pointer to a buffer where the version info will
* be stored.
* Input:
* - size_bytes : Size of the buffer.
*
*/
WebRtc_Word16 WebRtcVad_get_version(char *version, size_t size_bytes);
/****************************************************************************
* WebRtcVad_AssignSize(...)
*
@@ -156,4 +142,4 @@ WebRtc_Word16 WebRtcVad_Process(VadInst *vad_inst,
}
#endif
#endif // WEBRTC_VAD_WEBRTC_VAD_H_
#endif // WEBRTC_COMMON_AUDIO_VAD_INCLUDE_WEBRTC_VAD_H_

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

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
* Copyright (c) 2012 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
@@ -61,12 +61,6 @@ TEST_F(VadTest, ApiTest) {
speech[i] = (i * i);
}
// WebRtcVad_get_version() tests
char version[32];
EXPECT_EQ(-1, WebRtcVad_get_version(NULL, sizeof(version)));
EXPECT_EQ(-1, WebRtcVad_get_version(version, 1));
EXPECT_EQ(0, WebRtcVad_get_version(version, sizeof(version)));
// Null instance tests
EXPECT_EQ(-1, WebRtcVad_Create(NULL));
EXPECT_EQ(-1, WebRtcVad_Init(NULL));

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

@@ -22,24 +22,6 @@
static const int kInitCheck = 42;
WebRtc_Word16 WebRtcVad_get_version(char *version, size_t size_bytes)
{
const char my_version[] = "VAD 1.2.0";
if (version == NULL)
{
return -1;
}
if (size_bytes < sizeof(my_version))
{
return -1;
}
memcpy(version, my_version, sizeof(my_version));
return 0;
}
WebRtc_Word16 WebRtcVad_AssignSize(int *size_in_bytes)
{
*size_in_bytes = sizeof(VadInstT) * 2 / sizeof(WebRtc_Word16);