Revert "Revert of Parse FlexFEC RTP headers in Call and add integration with BWE. (patchset #17 id:…

webrtc/modules/rtp_rtcp/include/flexfec_receiver.h

Index: webrtc/modules/rtp_rtcp/include/flexfec_receiver.h
diff --git a/webrtc/modules/rtp_rtcp/include/flexfec_receiver.h b/webrtc/modules/rtp_rtcp/include/flexfec_receiver.h
index 721d6c592fd7151f26de28f87d64f1844899d951..9ad093133c57ba5eb2138439a8b3b9a653b5879e 100644
--- a/webrtc/modules/rtp_rtcp/include/flexfec_receiver.h
+++ b/webrtc/modules/rtp_rtcp/include/flexfec_receiver.h
@@ -16,9 +16,9 @@
 #include "webrtc/base/basictypes.h"
 #include "webrtc/base/sequenced_task_checker.h"
 #include "webrtc/call/call.h"
-#include "webrtc/modules/rtp_rtcp/include/flexfec_receiver.h"
 #include "webrtc/modules/rtp_rtcp/include/ulpfec_receiver.h"
 #include "webrtc/modules/rtp_rtcp/source/forward_error_correction.h"
+#include "webrtc/modules/rtp_rtcp/source/rtp_packet_received.h"
 #include "webrtc/system_wrappers/include/clock.h"
 
 namespace webrtc {
@@ -37,19 +37,19 @@ class FlexfecReceiver {
  public:
   FlexfecReceiver(uint32_t ssrc,
                   uint32_t protected_media_ssrc,
-                  RecoveredPacketReceiver* callback);
+                  RecoveredPacketReceiver* recovered_packet_receiver);
   ~FlexfecReceiver();
 
   // Inserts a received packet (can be either media or FlexFEC) into the
   // internal buffer, and sends the received packets to the erasure code.
   // All newly recovered packets are sent back through the callback.
-  bool AddAndProcessReceivedPacket(const uint8_t* packet, size_t packet_length);
+  bool AddAndProcessReceivedPacket(RtpPacketReceived packet);
 
   // Returns a counter describing the added and recovered packets.
   FecPacketCounter GetPacketCounter() const;
 
  private:
-  bool AddReceivedPacket(const uint8_t* packet, size_t packet_length);
+  bool AddReceivedPacket(RtpPacketReceived packet);
   bool ProcessReceivedPackets();
 
   // Config.
@@ -63,7 +63,7 @@ class FlexfecReceiver {
       GUARDED_BY(sequence_checker_);
   ForwardErrorCorrection::RecoveredPacketList recovered_packets_
       GUARDED_BY(sequence_checker_);
-  RecoveredPacketReceiver* const callback_ GUARDED_BY(sequence_checker_);
+  RecoveredPacketReceiver* const recovered_packet_receiver_;
 
   // Logging and stats.
   Clock* const clock_;