From dde16f19e3ed36ca462f6404c40d5a9811f0ec37 Mon Sep 17 00:00:00 2001 From: "pbos@webrtc.org" Date: Tue, 5 Aug 2014 23:35:43 +0000 Subject: [PATCH] Fix some code styles. BUG= R=pbos@webrtc.org Review URL: https://webrtc-codereview.appspot.com/22009004 Patch from Changbin Shao . git-svn-id: http://webrtc.googlecode.com/svn/trunk@6830 4adac7df-926f-26a2-2b94-8c16560cd09d --- webrtc/video/bitrate_estimator_tests.cc | 1 - webrtc/video/call.cc | 4 ++-- webrtc/video/end_to_end_tests.cc | 4 ++-- webrtc/video/transport_adapter.h | 6 +++--- webrtc/video/video_receive_stream.h | 1 - webrtc/video/video_send_stream.cc | 1 + webrtc/video/video_send_stream.h | 1 + webrtc/video/video_send_stream_tests.cc | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/webrtc/video/bitrate_estimator_tests.cc b/webrtc/video/bitrate_estimator_tests.cc index 1ec95c3b05..40c1ed6822 100644 --- a/webrtc/video/bitrate_estimator_tests.cc +++ b/webrtc/video/bitrate_estimator_tests.cc @@ -107,7 +107,6 @@ class TraceObserver { Strings received_log_lines_ GUARDED_BY(crit_sect_); Strings expected_log_lines_ GUARDED_BY(crit_sect_); scoped_ptr done_; - }; Callback callback_; diff --git a/webrtc/video/call.cc b/webrtc/video/call.cc index bcce6f04f5..cd29d62736 100644 --- a/webrtc/video/call.cc +++ b/webrtc/video/call.cc @@ -43,7 +43,7 @@ namespace internal { class CpuOveruseObserverProxy : public webrtc::CpuOveruseObserver { public: - CpuOveruseObserverProxy(OveruseCallback* overuse_callback) + explicit CpuOveruseObserverProxy(OveruseCallback* overuse_callback) : crit_(CriticalSectionWrapper::CreateCriticalSection()), overuse_callback_(overuse_callback) { assert(overuse_callback != NULL); @@ -327,7 +327,7 @@ PacketReceiver::DeliveryStatus Call::DeliverRtp(const uint8_t* packet, return DELIVERY_PACKET_ERROR; const uint8_t* ptr = &packet[8]; - uint32_t ssrc = ptr[0] << 24 | ptr[1] << 16 | ptr[2] << 8 | ptr[3] ; + uint32_t ssrc = ptr[0] << 24 | ptr[1] << 16 | ptr[2] << 8 | ptr[3]; ReadLockScoped read_lock(*receive_lock_); std::map::iterator it = diff --git a/webrtc/video/end_to_end_tests.cc b/webrtc/video/end_to_end_tests.cc index 3b5012d78e..8b64f14d77 100644 --- a/webrtc/video/end_to_end_tests.cc +++ b/webrtc/video/end_to_end_tests.cc @@ -1544,7 +1544,7 @@ TEST_F(EndToEndTest, DISABLED_RedundantPayloadsTransmittedOnAllSsrcs) { public: ObserveRedundantPayloads() : EndToEndTest(kDefaultTimeoutMs), ssrcs_to_observe_(kNumSsrcs) { - for(size_t i = 0; i < kNumSsrcs; ++i) { + for (size_t i = 0; i < kNumSsrcs; ++i) { registered_rtx_ssrc_[kSendRtxSsrcs[i]] = true; } } @@ -1617,7 +1617,7 @@ void EndToEndTest::TestRtpStatePreservation(bool use_rtx) { static const uint64_t kMaxTimestampGap = kDefaultTimeoutMs * 90; class RtpSequenceObserver : public test::RtpRtcpObserver { public: - RtpSequenceObserver(bool use_rtx) + explicit RtpSequenceObserver(bool use_rtx) : test::RtpRtcpObserver(kDefaultTimeoutMs), crit_(CriticalSectionWrapper::CreateCriticalSection()), ssrcs_to_observe_(kNumSsrcs) { diff --git a/webrtc/video/transport_adapter.h b/webrtc/video/transport_adapter.h index 79f995be9b..f7cba1df08 100644 --- a/webrtc/video/transport_adapter.h +++ b/webrtc/video/transport_adapter.h @@ -7,8 +7,8 @@ * 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_INTERNAL_TRANSPORT_ADAPTER_H_ -#define WEBRTC_VIDEO_ENGINE_INTERNAL_TRANSPORT_ADAPTER_H_ +#ifndef WEBRTC_VIDEO_TRANSPORT_ADAPTER_H_ +#define WEBRTC_VIDEO_TRANSPORT_ADAPTER_H_ #include "webrtc/common_types.h" #include "webrtc/system_wrappers/interface/atomic32.h" @@ -36,4 +36,4 @@ class TransportAdapter : public webrtc::Transport { } // namespace internal } // namespace webrtc -#endif // WEBRTC_VIDEO_ENGINE_INTERNAL_TRANSPORT_ADAPTER_H_ +#endif // WEBRTC_VIDEO_TRANSPORT_ADAPTER_H_ diff --git a/webrtc/video/video_receive_stream.h b/webrtc/video/video_receive_stream.h index 2a3c6dfed3..c45ebac802 100644 --- a/webrtc/video/video_receive_stream.h +++ b/webrtc/video/video_receive_stream.h @@ -40,7 +40,6 @@ namespace internal { class VideoReceiveStream : public webrtc::VideoReceiveStream, public I420FrameCallback, public VideoRenderCallback { - public: VideoReceiveStream(webrtc::VideoEngine* video_engine, const VideoReceiveStream::Config& config, diff --git a/webrtc/video/video_send_stream.cc b/webrtc/video/video_send_stream.cc index 45e5c69dae..4e6b2ba893 100644 --- a/webrtc/video/video_send_stream.cc +++ b/webrtc/video/video_send_stream.cc @@ -10,6 +10,7 @@ #include "webrtc/video/video_send_stream.h" +#include #include #include #include diff --git a/webrtc/video/video_send_stream.h b/webrtc/video/video_send_stream.h index b0cf0c6a4a..f1f8f7d1a3 100644 --- a/webrtc/video/video_send_stream.h +++ b/webrtc/video/video_send_stream.h @@ -12,6 +12,7 @@ #define WEBRTC_VIDEO_VIDEO_SEND_STREAM_H_ #include +#include #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" #include "webrtc/modules/rtp_rtcp/interface/rtp_rtcp_defines.h" diff --git a/webrtc/video/video_send_stream_tests.cc b/webrtc/video/video_send_stream_tests.cc index 76739a3d84..b08c405882 100644 --- a/webrtc/video/video_send_stream_tests.cc +++ b/webrtc/video/video_send_stream_tests.cc @@ -156,11 +156,11 @@ TEST_F(VideoSendStreamTest, SupportsAbsoluteSendTime) { send_config->rtp.extensions.push_back( RtpExtension(RtpExtension::kAbsSendTime, kAbsSendTimeExtensionId)); } + virtual void PerformTest() OVERRIDE { EXPECT_EQ(kEventSignaled, Wait()) << "Timed out while waiting for single RTP packet."; } - } test; RunBaseTest(&test);