RTPReceiverAudio: Removed frequency from CNGPayloadType and cleaned up

webrtc/modules/rtp_rtcp/source/rtp_receiver_audio.h

Index: webrtc/modules/rtp_rtcp/source/rtp_receiver_audio.h
diff --git a/webrtc/modules/rtp_rtcp/source/rtp_receiver_audio.h b/webrtc/modules/rtp_rtcp/source/rtp_receiver_audio.h
index d5d89bae2d4c2f233953cef1033324662bf7a45e..902f43da91e7953f5dc8faf0ff373e8bff357a0f 100644
--- a/webrtc/modules/rtp_rtcp/source/rtp_receiver_audio.h
+++ b/webrtc/modules/rtp_rtcp/source/rtp_receiver_audio.h
@@ -41,11 +41,8 @@ class RTPReceiverAudio : public RTPReceiverStrategy,
 
   TelephoneEventHandler* GetTelephoneEventHandler() override { return this; }
 
-  // Returns true if CNG is configured with payload type payload_type. If so,
-  // the frequency and cng_payload_type_has_changed are filled in.
-  bool CNGPayloadType(const int8_t payload_type,
-                      uint32_t* frequency,
-                      bool* cng_payload_type_has_changed);
+  // Returns true if CNG is configured with payload type payload_type.

[danilchap, 2016/10/03 14:29:38]

may be just
...configured with |payload_type|.

[hlundin-webrtc, 2016/10/04 11:38:18]

+1

[ossu, 2016/10/04 12:40:24]

Alright, alright, calm down! :)

[danilchap, 2016/10/04 12:45:04]

May be change this (#44) line too? :)

[ossu, 2016/10/04 12:49:15]

GAH!

+  bool CNGPayloadType(const int8_t payload_type);
 
   int32_t ParseRtpPacket(WebRtcRTPHeader* rtp_header,
                          const PayloadUnion& specific_payload,
@@ -55,8 +52,6 @@ class RTPReceiverAudio : public RTPReceiverStrategy,
                          int64_t timestamp_ms,
                          bool is_first_packet) override;
 
-  int GetPayloadTypeFrequency() const override;
-
   RTPAliveType ProcessDeadOrAlive(uint16_t last_payload_length) const override;
 
   bool ShouldReportCsrcChanges(uint8_t payload_type) const override;
@@ -107,12 +102,6 @@ class RTPReceiverAudio : public RTPReceiverStrategy,
   int8_t cng_wb_payload_type_;
   int8_t cng_swb_payload_type_;
   int8_t cng_fb_payload_type_;
-  int8_t cng_payload_type_;
-
-  // G722 is special since it use the wrong number of RTP samples in timestamp
-  // VS. number of samples in the frame
-  int8_t g722_payload_type_;
-  bool last_received_g722_;
 
   uint8_t num_energy_;
   uint8_t current_remote_energy_[kRtpCsrcSize];