Miscellaneous cleanups.
stream_generator.h doesn't use anything from <string.h>. Replace
<string.h> with <stdint.h> for the intXXX_t typedefs.
Rename packet_buffer to packet_buffer_ to conform to the naming
convention of data members.
R=marpan@google.com, marpan@webrtc.org, phoglund@webrtc.org
BUG=none
TEST=none
Review URL: https://webrtc-codereview.appspot.com/51949004
Cr-Commit-Position: refs/heads/master@{#9387}
diff --git a/webrtc/modules/video_coding/main/source/test/stream_generator.cc b/webrtc/modules/video_coding/main/source/test/stream_generator.cc
index 00592ce..e747db4 100644
--- a/webrtc/modules/video_coding/main/source/test/stream_generator.cc
+++ b/webrtc/modules/video_coding/main/source/test/stream_generator.cc
@@ -29,7 +29,7 @@
packets_.clear();
sequence_number_ = start_seq_num;
start_time_ = current_time;
- memset(&packet_buffer, 0, sizeof(packet_buffer));
+ memset(packet_buffer_, 0, sizeof(packet_buffer_));
}
void StreamGenerator::GenerateFrame(FrameType type,
@@ -66,7 +66,7 @@
packet.isFirstPacket = first_packet;
packet.markerBit = marker_bit;
packet.sizeBytes = size;
- packet.dataPtr = packet_buffer;
+ packet.dataPtr = packet_buffer_;
if (packet.isFirstPacket)
packet.completeNALU = kNaluStart;
else if (packet.markerBit)
diff --git a/webrtc/modules/video_coding/main/source/test/stream_generator.h b/webrtc/modules/video_coding/main/source/test/stream_generator.h
index 994dd5c..5d80acf 100644
--- a/webrtc/modules/video_coding/main/source/test/stream_generator.h
+++ b/webrtc/modules/video_coding/main/source/test/stream_generator.h
@@ -10,12 +10,11 @@
#ifndef WEBRTC_MODULES_VIDEO_CODING_MAIN_SOURCE_TEST_STREAM_GENERATOR_H_
#define WEBRTC_MODULES_VIDEO_CODING_MAIN_SOURCE_TEST_STREAM_GENERATOR_H_
-#include <string.h>
-
#include <list>
#include "webrtc/modules/video_coding/main/source/packet.h"
#include "webrtc/modules/video_coding/main/test/test_util.h"
+#include "webrtc/typedefs.h"
namespace webrtc {
@@ -60,7 +59,7 @@
std::list<VCMPacket> packets_;
uint16_t sequence_number_;
int64_t start_time_;
- uint8_t packet_buffer[kMaxPacketSize];
+ uint8_t packet_buffer_[kMaxPacketSize];
DISALLOW_COPY_AND_ASSIGN(StreamGenerator);
};