Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(39)

Unified Diff: webrtc/modules/audio_coding/neteq/packet_buffer.cc

Issue 1228843002: Update audio code to use size_t more correctly, (Closed) Base URL: https://chromium.googlesource.com/external/webrtc@master
Patch Set: Resync Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: webrtc/modules/audio_coding/neteq/packet_buffer.cc
diff --git a/webrtc/modules/audio_coding/neteq/packet_buffer.cc b/webrtc/modules/audio_coding/neteq/packet_buffer.cc
index 07fa339fd30b9a2b0230658b116183d7970732ee..b3b445be8e3fee75e7019179ea61cd844572b13d 100644
--- a/webrtc/modules/audio_coding/neteq/packet_buffer.cc
+++ b/webrtc/modules/audio_coding/neteq/packet_buffer.cc
@@ -178,7 +178,7 @@ const RTPHeader* PacketBuffer::NextRtpHeader() const {
return const_cast<const RTPHeader*>(&(buffer_.front()->header));
}
-Packet* PacketBuffer::GetNextPacket(int* discard_count) {
+Packet* PacketBuffer::GetNextPacket(size_t* discard_count) {
if (Empty()) {
// Buffer is empty.
return NULL;
@@ -191,7 +191,7 @@ Packet* PacketBuffer::GetNextPacket(int* discard_count) {
// Discard other packets with the same timestamp. These are duplicates or
// redundant payloads that should not be used.
- int discards = 0;
+ size_t discards = 0;
while (!Empty() &&
buffer_.front()->header.timestamp == packet->header.timestamp) {
@@ -237,15 +237,15 @@ int PacketBuffer::DiscardAllOldPackets(uint32_t timestamp_limit) {
return DiscardOldPackets(timestamp_limit, 0);
}
-int PacketBuffer::NumPacketsInBuffer() const {
- return static_cast<int>(buffer_.size());
+size_t PacketBuffer::NumPacketsInBuffer() const {
+ return buffer_.size();
}
-int PacketBuffer::NumSamplesInBuffer(DecoderDatabase* decoder_database,
- int last_decoded_length) const {
+size_t PacketBuffer::NumSamplesInBuffer(DecoderDatabase* decoder_database,
+ size_t last_decoded_length) const {
PacketList::const_iterator it;
- int num_samples = 0;
- int last_duration = last_decoded_length;
+ size_t num_samples = 0;
+ size_t last_duration = last_decoded_length;
for (it = buffer_.begin(); it != buffer_.end(); ++it) {
Packet* packet = (*it);
AudioDecoder* decoder =

Powered by Google App Engine
This is Rietveld 408576698