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

Unified Diff: webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h

Issue 1316523002: Convert channel counts to size_t. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc@master
Patch Set: Rebase onto cleanup change Created 5 years 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/rtp_rtcp/include/rtp_rtcp_defines.h
diff --git a/webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h b/webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h
index d2ac62e8453940cf5ab175f5b1b7bd8886ed2a65..fad97f19cc5731a72bca6149517c8d586551ed90 100644
--- a/webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h
+++ b/webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h
@@ -35,7 +35,7 @@ const uint8_t kRtpHeaderSize = 12;
struct AudioPayload {
uint32_t frequency;
- uint8_t channels;
+ size_t channels;
the sun 2016/01/07 12:27:59 On 64-bit machines member alignment rules will cau
Peter Kasting 2016/01/07 13:14:41 It looks like other places (e.g. the param list of
the sun 2016/01/07 13:21:06 I don't see why the order of parameters necessaril
Peter Kasting 2016/01/07 22:28:39 I think that makes sense, but it's a bit of refact
uint32_t rate;
};
@@ -210,7 +210,7 @@ class RtpFeedback {
const int8_t payloadType,
const char payloadName[RTP_PAYLOAD_NAME_SIZE],
const int frequency,
- const uint8_t channels,
+ const size_t channels,
const uint32_t rate) = 0;
virtual void OnIncomingSSRCChanged(const uint32_t ssrc) = 0;
@@ -333,7 +333,7 @@ class NullRtpFeedback : public RtpFeedback {
int32_t OnInitializeDecoder(const int8_t payloadType,
const char payloadName[RTP_PAYLOAD_NAME_SIZE],
const int frequency,
- const uint8_t channels,
+ const size_t channels,
const uint32_t rate) override {
return 0;
}

Powered by Google App Engine
This is Rietveld 408576698