14665ff7d4
Clang version changed 223108:230914
Details: e144d30..6fdb142/tools/clang/scripts/update.sh
Removes the OVERRIDE macro defined in:
* webrtc/base/common.h
* webrtc/typedefs.h
The majority of the source changes were done by running this in src/:
perl -0pi -e "s/virtual\s([^({;]*(\([^({;]*\)[^({;]*))(OVERRIDE|override)/\1override/sg" `find {talk,webrtc} -name "*.h" -o -name "*.cc*" -o -name "*.mm*"`
which converted all:
virtual Foo() OVERRIDE
functions to:
Foo() override
Then I manually edited:
* talk/media/webrtc/fakewebrtccommon.h
* webrtc/test/fake_common.h
Remaining uses of OVERRIDE was fixed by search+replace.
Manual edits were done to fix virtual destructors that were
overriding inherited ones.
Finally a build error related to the pure virtual definitions of
Read, Write and Rewind in common_types.h required a bit of
refactoring in:
* webrtc/common_types.cc
* webrtc/common_types.h
* webrtc/system_wrappers/interface/file_wrapper.h
* webrtc/system_wrappers/source/file_impl.cc
This roll should make it possible for us to finally re-enable deadlock
detection for TSan on the buildbots.
BUG=4106
R=pbos@webrtc.org, tommi@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/41069004
Cr-Commit-Position: refs/heads/master@{#8596}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8596 4adac7df-926f-26a2-2b94-8c16560cd09d
124 lines
3.2 KiB
C++
124 lines
3.2 KiB
C++
/*
|
|
* 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
|
|
* 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 WEBRTC_MODULES_AUDIO_CODING_MAIN_TEST_ENCODEDECODETEST_H_
|
|
#define WEBRTC_MODULES_AUDIO_CODING_MAIN_TEST_ENCODEDECODETEST_H_
|
|
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
|
|
#include "webrtc/modules/audio_coding/main/interface/audio_coding_module.h"
|
|
#include "webrtc/modules/audio_coding/main/test/ACMTest.h"
|
|
#include "webrtc/modules/audio_coding/main/test/PCMFile.h"
|
|
#include "webrtc/modules/audio_coding/main/test/RTPFile.h"
|
|
#include "webrtc/typedefs.h"
|
|
|
|
namespace webrtc {
|
|
|
|
#define MAX_INCOMING_PAYLOAD 8096
|
|
|
|
// TestPacketization callback which writes the encoded payloads to file
|
|
class TestPacketization : public AudioPacketizationCallback {
|
|
public:
|
|
TestPacketization(RTPStream *rtpStream, uint16_t frequency);
|
|
~TestPacketization();
|
|
int32_t SendData(const FrameType frameType,
|
|
const uint8_t payloadType,
|
|
const uint32_t timeStamp,
|
|
const uint8_t* payloadData,
|
|
const size_t payloadSize,
|
|
const RTPFragmentationHeader* fragmentation) override;
|
|
|
|
private:
|
|
static void MakeRTPheader(uint8_t* rtpHeader, uint8_t payloadType,
|
|
int16_t seqNo, uint32_t timeStamp, uint32_t ssrc);
|
|
RTPStream* _rtpStream;
|
|
int32_t _frequency;
|
|
int16_t _seqNo;
|
|
};
|
|
|
|
class Sender {
|
|
public:
|
|
Sender();
|
|
void Setup(AudioCodingModule *acm, RTPStream *rtpStream,
|
|
std::string in_file_name, int sample_rate, int channels);
|
|
void Teardown();
|
|
void Run();
|
|
bool Add10MsData();
|
|
|
|
//for auto_test and logging
|
|
uint8_t testMode;
|
|
uint8_t codeId;
|
|
|
|
protected:
|
|
AudioCodingModule* _acm;
|
|
|
|
private:
|
|
PCMFile _pcmFile;
|
|
AudioFrame _audioFrame;
|
|
TestPacketization* _packetization;
|
|
};
|
|
|
|
class Receiver {
|
|
public:
|
|
Receiver();
|
|
virtual ~Receiver() {};
|
|
void Setup(AudioCodingModule *acm, RTPStream *rtpStream,
|
|
std::string out_file_name, int channels);
|
|
void Teardown();
|
|
void Run();
|
|
virtual bool IncomingPacket();
|
|
bool PlayoutData();
|
|
|
|
//for auto_test and logging
|
|
uint8_t codeId;
|
|
uint8_t testMode;
|
|
|
|
private:
|
|
PCMFile _pcmFile;
|
|
int16_t* _playoutBuffer;
|
|
uint16_t _playoutLengthSmpls;
|
|
int32_t _frequency;
|
|
bool _firstTime;
|
|
|
|
protected:
|
|
AudioCodingModule* _acm;
|
|
uint8_t _incomingPayload[MAX_INCOMING_PAYLOAD];
|
|
RTPStream* _rtpStream;
|
|
WebRtcRTPHeader _rtpInfo;
|
|
size_t _realPayloadSizeBytes;
|
|
size_t _payloadSizeBytes;
|
|
uint32_t _nextTime;
|
|
};
|
|
|
|
class EncodeDecodeTest : public ACMTest {
|
|
public:
|
|
EncodeDecodeTest();
|
|
explicit EncodeDecodeTest(int testMode);
|
|
void Perform() override;
|
|
|
|
uint16_t _playoutFreq;
|
|
uint8_t _testMode;
|
|
|
|
private:
|
|
std::string EncodeToFile(int fileType,
|
|
int codeId,
|
|
int* codePars,
|
|
int testMode);
|
|
|
|
protected:
|
|
Sender _sender;
|
|
Receiver _receiver;
|
|
};
|
|
|
|
} // namespace webrtc
|
|
|
|
#endif // WEBRTC_MODULES_AUDIO_CODING_MAIN_TEST_ENCODEDECODETEST_H_
|