Revert of Remove audio/video distinction for probe packets.

webrtc/modules/remote_bitrate_estimator/test/packet.h

 /*
  *  Copyright (c) 2015 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 24 matching lines @@
 
   virtual int flow_id() const { return flow_id_; }
   virtual void set_send_time_us(int64_t send_time_us);
   virtual int64_t send_time_us() const { return send_time_us_; }
   virtual int64_t sender_timestamp_us() const { return sender_timestamp_us_; }
   virtual size_t payload_size() const { return payload_size_; }
   virtual Packet::Type GetPacketType() const = 0;
   virtual void set_sender_timestamp_us(int64_t sender_timestamp_us) {
     sender_timestamp_us_ = sender_timestamp_us;
   }
+  virtual void set_paced(bool paced) { paced_ = paced; }
+  virtual bool paced() const { return paced_; }
   virtual int64_t creation_time_ms() const {
     return (creation_time_us_ + 500) / 1000;
   }
   virtual int64_t sender_timestamp_ms() const {
     return (sender_timestamp_us_ + 500) / 1000;
   }
   virtual int64_t send_time_ms() const { return (send_time_us_ + 500) / 1000; }
 
  protected:
   int flow_id_;
   int64_t creation_time_us_;  // Time when the packet was created.
   int64_t send_time_us_;  // Time the packet left last processor touching it.
   int64_t sender_timestamp_us_;  // Time the packet left the Sender.
   size_t payload_size_;  // Size of the (non-existent, simulated) payload.
+  bool paced_;           // True if sent through paced sender.
 };
 
 class MediaPacket : public Packet {
  public:
   MediaPacket();
   MediaPacket(int flow_id,
               int64_t send_time_us,
               size_t payload_size,
               uint16_t sequence_number);
   MediaPacket(int flow_id,
@@ skipping 124 matching lines @@
 };
 
 typedef std::list<Packet*> Packets;
 typedef std::list<Packet*>::iterator PacketsIt;
 typedef std::list<Packet*>::const_iterator PacketsConstIt;
 
 }  // namespace bwe
 }  // namespace testing
 }  // namespace webrtc
 #endif  // WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_PACKET_H_