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
86 lines
2.7 KiB
C++
86 lines
2.7 KiB
C++
/*
|
|
* Copyright (c) 2013 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_VIDEO_ENGINE_TEST_COMMON_FAKE_ENCODER_H_
|
|
#define WEBRTC_VIDEO_ENGINE_TEST_COMMON_FAKE_ENCODER_H_
|
|
|
|
#include <vector>
|
|
|
|
#include "webrtc/common_types.h"
|
|
#include "webrtc/system_wrappers/interface/clock.h"
|
|
#include "webrtc/video_encoder.h"
|
|
|
|
namespace webrtc {
|
|
namespace test {
|
|
|
|
class FakeEncoder : public VideoEncoder {
|
|
public:
|
|
explicit FakeEncoder(Clock* clock);
|
|
virtual ~FakeEncoder();
|
|
|
|
// Sets max bitrate. Not thread-safe, call before registering the encoder.
|
|
void SetMaxBitrate(int max_kbps);
|
|
|
|
int32_t InitEncode(const VideoCodec* config,
|
|
int32_t number_of_cores,
|
|
size_t max_payload_size) override;
|
|
int32_t Encode(const I420VideoFrame& input_image,
|
|
const CodecSpecificInfo* codec_specific_info,
|
|
const std::vector<VideoFrameType>* frame_types) override;
|
|
int32_t RegisterEncodeCompleteCallback(
|
|
EncodedImageCallback* callback) override;
|
|
int32_t Release() override;
|
|
int32_t SetChannelParameters(uint32_t packet_loss, int64_t rtt) override;
|
|
int32_t SetRates(uint32_t new_target_bitrate, uint32_t framerate) override;
|
|
|
|
protected:
|
|
Clock* const clock_;
|
|
VideoCodec config_;
|
|
EncodedImageCallback* callback_;
|
|
int target_bitrate_kbps_;
|
|
int max_target_bitrate_kbps_;
|
|
int64_t last_encode_time_ms_;
|
|
uint8_t encoded_buffer_[100000];
|
|
};
|
|
|
|
class FakeH264Encoder : public FakeEncoder, public EncodedImageCallback {
|
|
public:
|
|
explicit FakeH264Encoder(Clock* clock);
|
|
virtual ~FakeH264Encoder() {}
|
|
|
|
int32_t RegisterEncodeCompleteCallback(
|
|
EncodedImageCallback* callback) override;
|
|
|
|
int32_t Encoded(const EncodedImage& encodedImage,
|
|
const CodecSpecificInfo* codecSpecificInfo,
|
|
const RTPFragmentationHeader* fragments) override;
|
|
|
|
private:
|
|
EncodedImageCallback* callback_;
|
|
int idr_counter_;
|
|
};
|
|
|
|
class DelayedEncoder : public test::FakeEncoder {
|
|
public:
|
|
DelayedEncoder(Clock* clock, int delay_ms);
|
|
virtual ~DelayedEncoder() {}
|
|
|
|
int32_t Encode(const I420VideoFrame& input_image,
|
|
const CodecSpecificInfo* codec_specific_info,
|
|
const std::vector<VideoFrameType>* frame_types) override;
|
|
|
|
private:
|
|
const int delay_ms_;
|
|
};
|
|
} // namespace test
|
|
} // namespace webrtc
|
|
|
|
#endif // WEBRTC_VIDEO_ENGINE_TEST_COMMON_FAKE_ENCODER_H_
|