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

Unified Diff: webrtc/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h

Issue 1226143013: Merge methods for configuring NACK/FEC/hybrid. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: rebase 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
« no previous file with comments | « webrtc/modules/rtp_rtcp/interface/rtp_rtcp.h ('k') | webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h
diff --git a/webrtc/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h b/webrtc/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h
index 127a795e0b3d3e207f9bb3c9c78b93801568dd2f..56291ef18815c1f2474f8dca4b0a72fd1a1199f8 100644
--- a/webrtc/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h
+++ b/webrtc/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h
@@ -227,11 +227,13 @@ class MockRtpRtcp : public RtpRtcp {
MOCK_METHOD1(SetTargetSendBitrate,
void(uint32_t bitrate_bps));
MOCK_METHOD3(SetGenericFECStatus,
- int32_t(const bool enable,
- const uint8_t payloadTypeRED,
- const uint8_t payloadTypeFEC));
+ void(const bool enable,
+ const uint8_t payload_type_red,
+ const uint8_t payload_type_fec));
MOCK_METHOD3(GenericFECStatus,
- int32_t(bool& enable, uint8_t& payloadTypeRED, uint8_t& payloadTypeFEC));
+ void(bool& enable,
+ uint8_t& payloadTypeRED,
+ uint8_t& payloadTypeFEC));
MOCK_METHOD2(SetFecParameters,
int32_t(const FecProtectionParams* delta_params,
const FecProtectionParams* key_params));
« no previous file with comments | « webrtc/modules/rtp_rtcp/interface/rtp_rtcp.h ('k') | webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698