Unify Transport and newapi::Transport interfaces.

webrtc/video_send_stream.h

 /*
  *  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 49 matching lines @@
     int avg_encode_time_ms = 0;
     int encode_usage_percent = 0;
     int target_media_bitrate_bps = 0;
     int media_bitrate_bps = 0;
     bool suspended = false;
     std::map<uint32_t, StreamStats> substreams;
   };
 
   struct Config {
     Config() = delete;
-    explicit Config(newapi::Transport* send_transport)
+    explicit Config(Transport* send_transport)
         : send_transport(send_transport) {}
 
     std::string ToString() const;
 
     struct EncoderSettings {
       std::string ToString() const;
 
       std::string payload_name;
       int payload_type = -1;
 
@@ skipping 33 matching lines @@
 
         // Payload type to use for the RTX stream.
         int payload_type = -1;
       } rtx;
 
       // RTCP CNAME, see RFC 3550.
       std::string c_name;
     } rtp;
 
     // Transport for outgoing packets.
-    newapi::Transport* send_transport = nullptr;
+    Transport* send_transport = nullptr;
 
     // Callback for overuse and normal usage based on the jitter of incoming
     // captured frames. 'nullptr' disables the callback.
     LoadObserver* overuse_callback = nullptr;
 
     // Called for each I420 frame before encoding the frame. Can be used for
     // effects, snapshots etc. 'nullptr' disables the callback.
     I420FrameCallback* pre_encode_callback = nullptr;
 
     // Called for each encoded frame, e.g. used for file storage. 'nullptr'
@@ skipping 27 matching lines @@
   // in the config. Encoder settings are passed on to the encoder instance along
   // with the VideoStream settings.
   virtual bool ReconfigureVideoEncoder(const VideoEncoderConfig& config) = 0;
 
   virtual Stats GetStats() = 0;
 };
 
 }  // namespace webrtc
 
 #endif  // WEBRTC_VIDEO_SEND_STREAM_H_