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

Revert 7338 "Fixed the android build by making the interface pur..."

Browse Source 
> Fixed the android build by making the interface pure virtual.
> 
> TBR=asapersson@webrtc.org, bjornv@webrtc.org,
> 
> Review URL: https://webrtc-codereview.appspot.com/24789004

TBR=xians@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@7341 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
xians@webrtc.org 2014-09-30 15:26:15 +00:00
parent d0bb5862f5
commit 7aad5e5cce
3 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
talk/media/webrtc/fakewebrtcvoiceengine.h
View File

@ -38,7 +38,6 @@
#include "talk/media/webrtc/fakewebrtccommon.h"
#include "talk/media/webrtc/webrtcvoe.h"
#include "webrtc/base/basictypes.h"
#include "webrtc/base/fileutils.h"
#include "webrtc/base/gunit.h"
#include "webrtc/base/stringutils.h"
#ifdef USE_WEBRTC_DEV_BRANCH
@ -129,7 +128,6 @@ class FakeAudioProcessing : public webrtc::AudioProcessing {
WEBRTC_STUB_CONST(delay_offset_ms, ());
WEBRTC_STUB(StartDebugRecording, (const char filename[kMaxFilenameSize]));
WEBRTC_STUB(StartDebugRecording, (FILE* handle));
WEBRTC_STUB(StartDebugRecording, (rtc::PlatformFile handle));
WEBRTC_STUB(StopDebugRecording, ());
virtual webrtc::EchoCancellation* echo_cancellation() const OVERRIDE {
return NULL;

2
webrtc/modules/audio_processing/include/audio_processing.h
View File

@ -329,7 +329,7 @@ class AudioProcessing {
// Same as above but uses an existing PlatformFile handle. Takes ownership
// of |handle| and closes it at StopDebugRecording().
// TODO(xians): Make this interface pure virtual.
virtual int StartDebugRecording(rtc::PlatformFile handle) = 0;
virtual int StartDebugRecording(rtc::PlatformFile handle) { return -1; }
// Stops recording debugging information, and closes the file. Recording
// cannot be resumed in the same file (without overwriting it).

2
webrtc/modules/audio_processing/include/mock_audio_processing.h
View File

@ -239,8 +239,6 @@ class MockAudioProcessing : public AudioProcessing {
int(const char filename[kMaxFilenameSize]));
MOCK_METHOD1(StartDebugRecording,
int(FILE* handle));
MOCK_METHOD1(StartDebugRecording,
int(rtc::PlatformFile handle));
MOCK_METHOD0(StopDebugRecording,
int());
virtual MockEchoCancellation* echo_cancellation() const {