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
127 lines
3.3 KiB
C++
127 lines
3.3 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_RTPFILE_H_
|
|
#define WEBRTC_MODULES_AUDIO_CODING_MAIN_TEST_RTPFILE_H_
|
|
|
|
#include <stdio.h>
|
|
#include <queue>
|
|
|
|
#include "webrtc/modules/audio_coding/main/interface/audio_coding_module.h"
|
|
#include "webrtc/modules/interface/module_common_types.h"
|
|
#include "webrtc/system_wrappers/interface/rw_lock_wrapper.h"
|
|
#include "webrtc/typedefs.h"
|
|
|
|
namespace webrtc {
|
|
|
|
class RTPStream {
|
|
public:
|
|
virtual ~RTPStream() {
|
|
}
|
|
|
|
virtual void Write(const uint8_t payloadType, const uint32_t timeStamp,
|
|
const int16_t seqNo, const uint8_t* payloadData,
|
|
const size_t payloadSize, uint32_t frequency) = 0;
|
|
|
|
// Returns the packet's payload size. Zero should be treated as an
|
|
// end-of-stream (in the case that EndOfFile() is true) or an error.
|
|
virtual size_t Read(WebRtcRTPHeader* rtpInfo, uint8_t* payloadData,
|
|
size_t payloadSize, uint32_t* offset) = 0;
|
|
virtual bool EndOfFile() const = 0;
|
|
|
|
protected:
|
|
void MakeRTPheader(uint8_t* rtpHeader, uint8_t payloadType, int16_t seqNo,
|
|
uint32_t timeStamp, uint32_t ssrc);
|
|
|
|
void ParseRTPHeader(WebRtcRTPHeader* rtpInfo, const uint8_t* rtpHeader);
|
|
};
|
|
|
|
class RTPPacket {
|
|
public:
|
|
RTPPacket(uint8_t payloadType, uint32_t timeStamp, int16_t seqNo,
|
|
const uint8_t* payloadData, size_t payloadSize,
|
|
uint32_t frequency);
|
|
|
|
~RTPPacket();
|
|
|
|
uint8_t payloadType;
|
|
uint32_t timeStamp;
|
|
int16_t seqNo;
|
|
uint8_t* payloadData;
|
|
size_t payloadSize;
|
|
uint32_t frequency;
|
|
};
|
|
|
|
class RTPBuffer : public RTPStream {
|
|
public:
|
|
RTPBuffer();
|
|
|
|
~RTPBuffer();
|
|
|
|
void Write(const uint8_t payloadType,
|
|
const uint32_t timeStamp,
|
|
const int16_t seqNo,
|
|
const uint8_t* payloadData,
|
|
const size_t payloadSize,
|
|
uint32_t frequency) override;
|
|
|
|
size_t Read(WebRtcRTPHeader* rtpInfo,
|
|
uint8_t* payloadData,
|
|
size_t payloadSize,
|
|
uint32_t* offset) override;
|
|
|
|
bool EndOfFile() const override;
|
|
|
|
private:
|
|
RWLockWrapper* _queueRWLock;
|
|
std::queue<RTPPacket *> _rtpQueue;
|
|
};
|
|
|
|
class RTPFile : public RTPStream {
|
|
public:
|
|
~RTPFile() {
|
|
}
|
|
|
|
RTPFile()
|
|
: _rtpFile(NULL),
|
|
_rtpEOF(false) {
|
|
}
|
|
|
|
void Open(const char *outFilename, const char *mode);
|
|
|
|
void Close();
|
|
|
|
void WriteHeader();
|
|
|
|
void ReadHeader();
|
|
|
|
void Write(const uint8_t payloadType,
|
|
const uint32_t timeStamp,
|
|
const int16_t seqNo,
|
|
const uint8_t* payloadData,
|
|
const size_t payloadSize,
|
|
uint32_t frequency) override;
|
|
|
|
size_t Read(WebRtcRTPHeader* rtpInfo,
|
|
uint8_t* payloadData,
|
|
size_t payloadSize,
|
|
uint32_t* offset) override;
|
|
|
|
bool EndOfFile() const override { return _rtpEOF; }
|
|
|
|
private:
|
|
FILE* _rtpFile;
|
|
bool _rtpEOF;
|
|
};
|
|
|
|
} // namespace webrtc
|
|
|
|
#endif // WEBRTC_MODULES_AUDIO_CODING_MAIN_TEST_RTPFILE_H_
|