Removed RTPHeader from NetEq's Packet struct.

webrtc/modules/audio_coding/neteq/decision_logic_normal.cc

 /*
  *  Copyright (c) 2013 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 10 matching lines @@
 #include "webrtc/modules/audio_coding/neteq/packet_buffer.h"
 #include "webrtc/modules/audio_coding/neteq/sync_buffer.h"
 #include "webrtc/modules/include/module_common_types.h"
 
 namespace webrtc {
 
 Operations DecisionLogicNormal::GetDecisionSpecialized(
     const SyncBuffer& sync_buffer,
     const Expand& expand,
     size_t decoder_frame_length,
-    const RTPHeader* packet_header,
+    const Packet* next_packet,
     Modes prev_mode,
     bool play_dtmf,
     bool* reset_decoder,
     size_t generated_noise_samples) {
   assert(playout_mode_ == kPlayoutOn || playout_mode_ == kPlayoutStreaming);
   // Guard for errors, to avoid getting stuck in error mode.
   if (prev_mode == kModeError) {
-    if (!packet_header) {
+    if (!next_packet) {
       return kExpand;
     } else {
       return kUndefined;  // Use kUndefined to flag for a reset.
     }
   }
 
   uint32_t target_timestamp = sync_buffer.end_timestamp();
   uint32_t available_timestamp = 0;
   bool is_cng_packet = false;
-  if (packet_header) {
-    available_timestamp = packet_header->timestamp;
+  if (next_packet) {
+    available_timestamp = next_packet->timestamp;
     is_cng_packet =
-        decoder_database_->IsComfortNoise(packet_header->payloadType);
+        decoder_database_->IsComfortNoise(next_packet->payload_type);
   }
 
   if (is_cng_packet) {
     return CngOperation(prev_mode, target_timestamp, available_timestamp,
                         generated_noise_samples);
   }
 
   // Handle the case with no packet at all available (except maybe DTMF).
-  if (!packet_header) {
+  if (!next_packet) {
     return NoPacket(play_dtmf);
   }
 
   // If the expand period was very long, reset NetEQ since it is likely that the
   // sender was restarted.
   if (num_consecutive_expands_ > kReinitAfterExpands) {
     *reset_decoder = true;
     return kNormal;
   }
 
@@ skipping 163 matching lines @@
 bool DecisionLogicNormal::PacketTooEarly(uint32_t timestamp_leap) const {
   return timestamp_leap >
       static_cast<uint32_t>(output_size_samples_ * num_consecutive_expands_);
 }
 
 bool DecisionLogicNormal::MaxWaitForPacket() const {
   return num_consecutive_expands_ >= kMaxWaitForPacket;
 }
 
 }  // namespace webrtc