zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix some chromium-style warnings in webrtc/modules/video_coding/

Browse Source 
BUG=163
R=mikhal@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@4429 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
pbos@webrtc.org
2013-07-30 15:18:31 +00:00
parent e6c3966530
commit 7f7162a003
7 changed files with 76 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
webrtc/modules/video_coding/codecs/test/videoprocessor.h
View File

@ -40,13 +40,8 @@ const char* ExcludeFrameTypesToStr(ExcludeFrameTypes e);
// Test configuration for a test run
struct TestConfig {
TestConfig()
: name(""), description(""), test_number(0),
input_filename(""), output_filename(""), output_dir("out"),
networking_config(), exclude_frame_types(kExcludeOnlyFirstKeyFrame),
frame_length_in_bytes(-1), use_single_core(false), keyframe_interval(0),
codec_settings(NULL), verbose(true) {
};
TestConfig();
~TestConfig();
// Name of the test. This is purely metadata and does not affect
// the test in any way.
@ -168,8 +163,8 @@ class VideoProcessorImpl : public VideoProcessor {
const TestConfig& config,
Stats* stats);
virtual ~VideoProcessorImpl();
virtual bool Init();
virtual bool ProcessFrame(int frame_number);
virtual bool Init() OVERRIDE;
virtual bool ProcessFrame(int frame_number) OVERRIDE;
private:
// Invoked by the callback when a frame has completed encoding.
@ -181,13 +176,13 @@ class VideoProcessorImpl : public VideoProcessor {
int GetElapsedTimeMicroseconds(const webrtc::TickTime& start,
const webrtc::TickTime& stop);
// Updates the encoder with the target bit rate and the frame rate.
void SetRates(int bit_rate, int frame_rate);
virtual void SetRates(int bit_rate, int frame_rate) OVERRIDE;
// Return the size of the encoded frame in bytes.
int EncodedFrameSize();
virtual int EncodedFrameSize() OVERRIDE;
// Return the number of dropped frames.
int NumberDroppedFrames();
virtual int NumberDroppedFrames() OVERRIDE;
// Return the number of spatial resizes.
int NumberSpatialResizes();
virtual int NumberSpatialResizes() OVERRIDE;
webrtc::VideoEncoder* encoder_;
webrtc::VideoDecoder* decoder_;
@ -226,14 +221,14 @@ class VideoProcessorImpl : public VideoProcessor {
// Callback class required to implement according to the VideoEncoder API.
class VideoProcessorEncodeCompleteCallback
: public webrtc::EncodedImageCallback {
: public webrtc::EncodedImageCallback {
public:
explicit VideoProcessorEncodeCompleteCallback(VideoProcessorImpl* vp)
: video_processor_(vp) {
}
int32_t Encoded(webrtc::EncodedImage& encoded_image,
const webrtc::CodecSpecificInfo* codec_specific_info = NULL,
const webrtc::RTPFragmentationHeader* fragmentation = NULL);
explicit VideoProcessorEncodeCompleteCallback(VideoProcessorImpl* vp)
: video_processor_(vp) {}
virtual int32_t Encoded(
webrtc::EncodedImage& encoded_image,
const webrtc::CodecSpecificInfo* codec_specific_info = NULL,
const webrtc::RTPFragmentationHeader* fragmentation = NULL) OVERRIDE;
private:
VideoProcessorImpl* video_processor_;
@ -246,7 +241,7 @@ class VideoProcessorImpl : public VideoProcessor {
explicit VideoProcessorDecodeCompleteCallback(VideoProcessorImpl* vp)
: video_processor_(vp) {
}
int32_t Decoded(webrtc::I420VideoFrame& image);
virtual int32_t Decoded(webrtc::I420VideoFrame& image) OVERRIDE;
private:
VideoProcessorImpl* video_processor_;