From 9c84b0dc9f5514d348955f4fee385309049d9a20 Mon Sep 17 00:00:00 2001 From: "stefan@webrtc.org" Date: Thu, 9 Feb 2012 13:14:04 +0000 Subject: [PATCH] Fix build errors with GCC. TBR=mflodman BUG= TEST= Review URL: https://webrtc-codereview.appspot.com/389006 git-svn-id: http://webrtc.googlecode.com/svn/trunk@1652 4adac7df-926f-26a2-2b94-8c16560cd09d --- src/modules/rtp_rtcp/source/forward_error_correction.h | 2 +- src/modules/rtp_rtcp/source/rtp_sender_video.cc | 2 +- src/modules/rtp_rtcp/source/rtp_sender_video.h | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/modules/rtp_rtcp/source/forward_error_correction.h b/src/modules/rtp_rtcp/source/forward_error_correction.h index 1e6c7c1f6c..fc435d9fe2 100644 --- a/src/modules/rtp_rtcp/source/forward_error_correction.h +++ b/src/modules/rtp_rtcp/source/forward_error_correction.h @@ -33,7 +33,7 @@ class FecPacket; class ForwardErrorCorrection { public: // Maximum number of media packets we can protect - static const int kMaxMediaPackets = 48; + static const unsigned int kMaxMediaPackets = 48u; // TODO(holmer): As a next step all these struct-like packet classes should be // refactored into proper classes, and their members should be made private. diff --git a/src/modules/rtp_rtcp/source/rtp_sender_video.cc b/src/modules/rtp_rtcp/source/rtp_sender_video.cc index 79e55d7df2..0f37f663ba 100644 --- a/src/modules/rtp_rtcp/source/rtp_sender_video.cc +++ b/src/modules/rtp_rtcp/source/rtp_sender_video.cc @@ -152,7 +152,7 @@ RTPSenderVideo::SendVideoPacket(const FrameType frameType, // Add packet to FEC list _rtpPacketListFec.push_back(ptrGenericFEC); // FEC can only protect up to kMaxMediaPackets packets - if (static_cast(_mediaPacketListFec.size()) < + if (_mediaPacketListFec.size() < ForwardErrorCorrection::kMaxMediaPackets) { _mediaPacketListFec.push_back(ptrGenericFEC->pkt); diff --git a/src/modules/rtp_rtcp/source/rtp_sender_video.h b/src/modules/rtp_rtcp/source/rtp_sender_video.h index 2f78d8bc87..1bf71428b9 100644 --- a/src/modules/rtp_rtcp/source/rtp_sender_video.h +++ b/src/modules/rtp_rtcp/source/rtp_sender_video.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011 The WebRTC project authors. All Rights Reserved. + * 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 @@ -135,7 +135,7 @@ private: bool _useUepProtectionDelta; WebRtc_UWord8 _fecProtectionFactor; bool _fecUseUepProtection; - int _numberFirstPartition; + unsigned int _numberFirstPartition; std::list _mediaPacketListFec; std::list _rtpPacketListFec; // Bitrate used for FEC payload, RED headers, RTP headers for FEC packets