Change from WebRtcRTPHeader to RTPHeader in NetEq tests and tools

webrtc/modules/audio_coding/neteq/tools/neteq_test.cc

 /*
  *  Copyright (c) 2016 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.
  */
 
 #include "webrtc/modules/audio_coding/neteq/tools/neteq_test.h"
 
 #include <iostream>
 
 #include "webrtc/api/audio_codecs/builtin_audio_decoder_factory.h"
 
 namespace webrtc {
 namespace test {
 
 void DefaultNetEqTestErrorCallback::OnInsertPacketError(
     int error_code,
     const NetEqInput::PacketData& packet) {
   if (error_code == NetEq::kUnknownRtpPayloadType) {
     std::cerr << "RTP Payload type "
-              << static_cast<int>(packet.header.header.payloadType)
-              << " is unknown." << std::endl;
+              << static_cast<int>(packet.header.payloadType) << " is unknown."
+              << std::endl;
   } else {
     std::cerr << "InsertPacket returned error code " << error_code << std::endl;
     std::cerr << "Header data:" << std::endl;
-    std::cerr << "  PT = " << static_cast<int>(packet.header.header.payloadType)
+    std::cerr << "  PT = " << static_cast<int>(packet.header.payloadType)
               << std::endl;
-    std::cerr << "  SN = " << packet.header.header.sequenceNumber << std::endl;
-    std::cerr << "  TS = " << packet.header.header.timestamp << std::endl;
+    std::cerr << "  SN = " << packet.header.sequenceNumber << std::endl;
+    std::cerr << "  TS = " << packet.header.timestamp << std::endl;
   }
   FATAL();
 }
 
 void DefaultNetEqTestErrorCallback::OnGetAudioError(int error_code) {
   std::cerr << "GetAudio returned error code " << error_code << std::endl;
   FATAL();
 }
 
 NetEqTest::NetEqTest(const NetEq::Config& config,
@@ skipping 19 matching lines @@
 
   while (!input_->ended()) {
     // Advance time to next event.
     RTC_DCHECK(input_->NextEventTime());
     time_now_ms = *input_->NextEventTime();
     // Check if it is time to insert packet.
     if (input_->NextPacketTime() && time_now_ms >= *input_->NextPacketTime()) {
       std::unique_ptr<NetEqInput::PacketData> packet_data = input_->PopPacket();
       RTC_CHECK(packet_data);
       int error = neteq_->InsertPacket(
-          packet_data->header.header,
+          packet_data->header,
           rtc::ArrayView<const uint8_t>(packet_data->payload),
           static_cast<uint32_t>(packet_data->time_ms * sample_rate_hz_ / 1000));
       if (error != NetEq::kOK && error_callback_) {
         error_callback_->OnInsertPacketError(neteq_->LastError(), *packet_data);
       }
     }
 
     // Check if it is time to get output audio.
     if (input_->NextOutputEventTime() &&
         time_now_ms >= *input_->NextOutputEventTime()) {
@@ skipping 43 matching lines @@
         neteq_->RegisterExternalDecoder(c.second.decoder, c.second.codec,
                                         c.second.codec_name, c.first),
         NetEq::kOK)
         << "Cannot register " << c.second.codec_name << " to payload type "
         << c.first;
   }
 }
 
 }  // namespace test
 }  // namespace webrtc