RTPReceiverAudio: Removed frequency from CNGPayloadType and cleaned up

webrtc/modules/rtp_rtcp/source/rtp_receiver_audio.h

 /*
  *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 23 matching lines @@
   void SetTelephoneEventForwardToDecoder(bool forward_to_decoder) override;
 
   // Is forwarding of outband telephone events turned on/off?
   bool TelephoneEventForwardToDecoder() const override;
 
   // Is TelephoneEvent configured with payload type payload_type
   bool TelephoneEventPayloadType(const int8_t payload_type) const override;
 
   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,
                          bool is_red,
                          const uint8_t* packet,
                          size_t payload_length,
                          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;
 
   int32_t OnNewPayloadTypeCreated(
       const char payload_name[RTP_PAYLOAD_NAME_SIZE],
       int8_t payload_type,
       uint32_t frequency) override;
 
   int32_t InvokeOnInitializeDecoder(
@@ skipping 30 matching lines @@
   uint32_t last_received_frequency_;
 
   bool telephone_event_forward_to_decoder_;
   int8_t telephone_event_payload_type_;
   std::set<uint8_t> telephone_event_reported_;
 
   int8_t cng_nb_payload_type_;
   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];
 
   ThreadUnsafeOneTimeEvent first_packet_received_;
 };
 }  // namespace webrtc
 
 #endif  // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_RECEIVER_AUDIO_H_