Fixes for coverity warnings.

BUG=
TEST=

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@1933 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
stefan@webrtc.org
2012-03-23 16:01:15 +00:00
parent 22bde08fb8
commit af5ffd5bb9
9 changed files with 32 additions and 16 deletions

View File

@@ -49,7 +49,7 @@ public:
private:
jpeg_compress_struct* _cinfo;
char _fileName[256];
char _fileName[257];
};
class JpegDecoder

View File

@@ -74,6 +74,7 @@ JpegEncoder::SetFileName(const char* fileName)
if (fileName)
{
strncpy(_fileName, fileName, 256);
_fileName[256] = 0;
}
return 0;
}

View File

@@ -309,11 +309,19 @@ class EncodedVideoData
{
public:
EncodedVideoData() :
payloadType(0),
timeStamp(0),
renderTimeMs(0),
encodedWidth(0),
encodedHeight(0),
completeFrame(false),
missingFrame(false),
payloadData(NULL),
payloadSize(0),
bufferSize(0)
bufferSize(0),
fragmentationHeader(),
frameType(kVideoFrameDelta),
codec(kVideoCodecUnknown)
{};
EncodedVideoData(const EncodedVideoData& data)

View File

@@ -40,7 +40,7 @@ RtpPacket* FrameGenerator::NextPacket(int offset, size_t length) {
rtp_packet->header.header.sequenceNumber = seq_num_;
rtp_packet->header.header.timestamp = timestamp_;
rtp_packet->header.header.payloadType = kVp8PayloadType;
BuildRtpHeader(rtp_packet->data, rtp_packet->header.header);
BuildRtpHeader(rtp_packet->data, &rtp_packet->header.header);
++seq_num_;
--num_packets_;
return rtp_packet;
@@ -87,13 +87,13 @@ void FrameGenerator::SetRedHeader(Packet* red_packet, uint8_t payload_type,
red_packet->data[header_length] = payload_type;
}
void FrameGenerator::BuildRtpHeader(uint8_t* data, RTPHeader header) {
void FrameGenerator::BuildRtpHeader(uint8_t* data, const RTPHeader* header) {
data[0] = 0x80; // Version 2.
data[1] = header.payloadType;
data[1] |= (header.markerBit ? kRtpMarkerBitMask : 0);
ModuleRTPUtility::AssignUWord16ToBuffer(data+2, header.sequenceNumber);
ModuleRTPUtility::AssignUWord32ToBuffer(data+4, header.timestamp);
ModuleRTPUtility::AssignUWord32ToBuffer(data+8, header.ssrc);
data[1] = header->payloadType;
data[1] |= (header->markerBit ? kRtpMarkerBitMask : 0);
ModuleRTPUtility::AssignUWord16ToBuffer(data+2, header->sequenceNumber);
ModuleRTPUtility::AssignUWord32ToBuffer(data+4, header->timestamp);
ModuleRTPUtility::AssignUWord32ToBuffer(data+8, header->ssrc);
}
} // namespace webrtc

View File

@@ -49,7 +49,7 @@ class FrameGenerator {
int header_length) const;
private:
void BuildRtpHeader(uint8_t* data, RTPHeader header);
static void BuildRtpHeader(uint8_t* data, const RTPHeader* header);
int num_packets_;
uint16_t seq_num_;

View File

@@ -120,11 +120,11 @@ int ProducerFec::AddRtpPacketAndGenerateFec(const uint8_t* data_buffer,
assert(fec_packets_.empty());
incomplete_frame_ = true;
const bool marker_bit = (data_buffer[1] & kRtpMarkerBitMask) ? true : false;
ForwardErrorCorrection::Packet* packet = new ForwardErrorCorrection::Packet;
packet->length = payload_length + rtp_header_length;
memcpy(packet->data, data_buffer, packet->length);
// FEC can only protect up to kMaxMediaPackets packets
if (media_packets_fec_.size() < ForwardErrorCorrection::kMaxMediaPackets) {
// Generic FEC can only protect up to kMaxMediaPackets packets.
ForwardErrorCorrection::Packet* packet = new ForwardErrorCorrection::Packet;
packet->length = payload_length + rtp_header_length;
memcpy(packet->data, data_buffer, packet->length);
media_packets_fec_.push_back(packet);
}
if (marker_bit) {

View File

@@ -51,6 +51,7 @@ VP8Encoder::VP8Encoder()
encoder_(NULL),
config_(NULL),
raw_(NULL) {
memset(&codec_, 0, sizeof(codec_));
uint32_t seed = static_cast<uint32_t>(TickTime::MillisecondTimestamp());
srand(seed);
}
@@ -571,6 +572,7 @@ VP8Decoder::VP8Decoder()
propagation_cnt_(-1),
latest_keyframe_complete_(false),
mfqe_enabled_(false) {
memset(&codec_, 0, sizeof(codec_));
}
VP8Decoder::~VP8Decoder() {
@@ -590,6 +592,9 @@ int VP8Decoder::Reset() {
}
int VP8Decoder::InitDecode(const VideoCodec* inst, int number_of_cores) {
if (inst == NULL) {
return WEBRTC_VIDEO_CODEC_ERR_PARAMETER;
}
int ret_val = Release();
if (ret_val < 0 ) {
return ret_val;
@@ -597,7 +602,7 @@ int VP8Decoder::InitDecode(const VideoCodec* inst, int number_of_cores) {
if (decoder_ == NULL) {
decoder_ = new vpx_dec_ctx_t;
}
if (inst && inst->codecType == kVideoCodecVP8) {
if (inst->codecType == kVideoCodecVP8) {
feedback_mode_ = inst->codecSpecific.VP8.feedbackModeOn;
}
vpx_codec_dec_cfg_t cfg;

View File

@@ -158,6 +158,8 @@ _sendCallback(),
_mediaOpt(NULL),
_encodedBytes(0),
_payloadType(0),
_codecType(kVideoCodecUnknown),
_internalSource(false),
_bitStreamAfterEncoder(NULL)
{
#ifdef DEBUG_ENCODER_BIT_STREAM

View File

@@ -1652,7 +1652,7 @@ VCMJitterBuffer::UpdateOldJitterSample(const VCMPacket& packet)
bool
VCMJitterBuffer::IsPacketRetransmitted(const VCMPacket& packet) const
{
if (_NACKSeqNum && _NACKSeqNumLength > 0)
if (_NACKSeqNumLength > 0)
{
for (WebRtc_UWord16 i = 0; i < _NACKSeqNumLength; i++)
{