Merge webrtc/video_engine/ into webrtc/video/

webrtc/video_engine/vie_receiver.h

Index: webrtc/video_engine/vie_receiver.h
diff --git a/webrtc/video_engine/vie_receiver.h b/webrtc/video_engine/vie_receiver.h
deleted file mode 100644
index b0c5749f6ab6cce17ef15d28915df1c6ec8cfc1a..0000000000000000000000000000000000000000
--- a/webrtc/video_engine/vie_receiver.h
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- *  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.
- */
-
-#ifndef WEBRTC_VIDEO_ENGINE_VIE_RECEIVER_H_
-#define WEBRTC_VIDEO_ENGINE_VIE_RECEIVER_H_
-
-#include <list>
-#include <vector>
-
-#include "webrtc/base/scoped_ptr.h"
-#include "webrtc/engine_configurations.h"
-#include "webrtc/modules/rtp_rtcp/include/receive_statistics.h"
-#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"
-#include "webrtc/typedefs.h"
-
-namespace webrtc {
-
-class CriticalSectionWrapper;
-class FecReceiver;
-class RemoteNtpTimeEstimator;
-class ReceiveStatistics;
-class RemoteBitrateEstimator;
-class RtpHeaderParser;
-class RTPPayloadRegistry;
-class RtpReceiver;
-class RtpRtcp;
-class VideoCodingModule;
-struct ReceiveBandwidthEstimatorStats;
-
-class ViEReceiver : public RtpData {
- public:
-  ViEReceiver(VideoCodingModule* module_vcm,
-              RemoteBitrateEstimator* remote_bitrate_estimator,
-              RtpFeedback* rtp_feedback);
-  ~ViEReceiver();
-
-  bool SetReceiveCodec(const VideoCodec& video_codec);
-  bool RegisterPayload(const VideoCodec& video_codec);
-
-  void SetNackStatus(bool enable, int max_nack_reordering_threshold);
-  void SetRtxPayloadType(int payload_type, int associated_payload_type);
-  // If set to true, the RTX payload type mapping supplied in
-  // |SetRtxPayloadType| will be used when restoring RTX packets. Without it,
-  // RTX packets will always be restored to the last non-RTX packet payload type
-  // received.
-  void SetUseRtxPayloadMappingOnRestore(bool val);
-  void SetRtxSsrc(uint32_t ssrc);
-  bool GetRtxSsrc(uint32_t* ssrc) const;
-
-  bool IsFecEnabled() const;
-
-  uint32_t GetRemoteSsrc() const;
-  int GetCsrcs(uint32_t* csrcs) const;
-
-  void SetRtpRtcpModule(RtpRtcp* module);
-
-  RtpReceiver* GetRtpReceiver() const;
-
-  void RegisterRtpRtcpModules(const std::vector<RtpRtcp*>& rtp_modules);
-
-  bool SetReceiveTimestampOffsetStatus(bool enable, int id);
-  bool SetReceiveAbsoluteSendTimeStatus(bool enable, int id);
-  bool SetReceiveVideoRotationStatus(bool enable, int id);
-  bool SetReceiveTransportSequenceNumber(bool enable, int id);
-
-  void StartReceive();
-  void StopReceive();
-
-  // Receives packets from external transport.
-  int ReceivedRTPPacket(const void* rtp_packet, size_t rtp_packet_length,
-                        const PacketTime& packet_time);
-  int ReceivedRTCPPacket(const void* rtcp_packet, size_t rtcp_packet_length);
-
-  // Implements RtpData.
-  int32_t OnReceivedPayloadData(const uint8_t* payload_data,
-                                const size_t payload_size,
-                                const WebRtcRTPHeader* rtp_header) override;
-  bool OnRecoveredPacket(const uint8_t* packet, size_t packet_length) override;
-
-  ReceiveStatistics* GetReceiveStatistics() const;
-
- private:
-  int InsertRTPPacket(const uint8_t* rtp_packet, size_t rtp_packet_length,
-                      const PacketTime& packet_time);
-  bool ReceivePacket(const uint8_t* packet,
-                     size_t packet_length,
-                     const RTPHeader& header,
-                     bool in_order);
-  // Parses and handles for instance RTX and RED headers.
-  // This function assumes that it's being called from only one thread.
-  bool ParseAndHandleEncapsulatingHeader(const uint8_t* packet,
-                                         size_t packet_length,
-                                         const RTPHeader& header);
-  void NotifyReceiverOfFecPacket(const RTPHeader& header);
-  int InsertRTCPPacket(const uint8_t* rtcp_packet, size_t rtcp_packet_length);
-  bool IsPacketInOrder(const RTPHeader& header) const;
-  bool IsPacketRetransmitted(const RTPHeader& header, bool in_order) const;
-  void UpdateHistograms();
-
-  rtc::scoped_ptr<CriticalSectionWrapper> receive_cs_;
-  Clock* clock_;
-  rtc::scoped_ptr<RtpHeaderParser> rtp_header_parser_;
-  rtc::scoped_ptr<RTPPayloadRegistry> rtp_payload_registry_;
-  rtc::scoped_ptr<RtpReceiver> rtp_receiver_;
-  const rtc::scoped_ptr<ReceiveStatistics> rtp_receive_statistics_;
-  rtc::scoped_ptr<FecReceiver> fec_receiver_;
-  RtpRtcp* rtp_rtcp_;
-  std::vector<RtpRtcp*> rtp_rtcp_simulcast_;
-  VideoCodingModule* vcm_;
-  RemoteBitrateEstimator* remote_bitrate_estimator_;
-
-  rtc::scoped_ptr<RemoteNtpTimeEstimator> ntp_estimator_;
-
-  bool receiving_;
-  uint8_t restored_packet_[IP_PACKET_SIZE];
-  bool restored_packet_in_use_;
-  bool receiving_ast_enabled_;
-  bool receiving_cvo_enabled_;
-  bool receiving_tsn_enabled_;
-  int64_t last_packet_log_ms_;
-};
-
-}  // namespace webrtc
-
-#endif  // WEBRTC_VIDEO_ENGINE_VIE_RECEIVER_H_