Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (c) 2016 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2016 The WebRTC project authors. All Rights Reserved. |
| 3 * | 3 * |
| 4 * Use of this source code is governed by a BSD-style license | 4 * Use of this source code is governed by a BSD-style license |
| 5 * that can be found in the LICENSE file in the root of the source | 5 * that can be found in the LICENSE file in the root of the source |
| 6 * tree. An additional intellectual property rights grant can be found | 6 * tree. An additional intellectual property rights grant can be found |
| 7 * in the file PATENTS. All contributing project authors may | 7 * in the file PATENTS. All contributing project authors may |
| 8 * be found in the AUTHORS file in the root of the source tree. | 8 * be found in the AUTHORS file in the root of the source tree. |
| 9 */ | 9 */ |
| 10 | 10 |
| 11 #ifndef WEBRTC_CALL_FLEXFEC_RECEIVE_STREAM_H_ | 11 #ifndef WEBRTC_CALL_FLEXFEC_RECEIVE_STREAM_H_ |
| 12 #define WEBRTC_CALL_FLEXFEC_RECEIVE_STREAM_H_ | 12 #define WEBRTC_CALL_FLEXFEC_RECEIVE_STREAM_H_ |
| 13 | 13 |
| 14 #include <memory> | 14 #include <memory> |
| 15 #include <string> | 15 #include <string> |
| 16 | 16 |
| 17 #include "webrtc/api/call/flexfec_receive_stream.h" | 17 #include "webrtc/api/call/flexfec_receive_stream.h" |
| 18 #include "webrtc/base/basictypes.h" | 18 #include "webrtc/base/basictypes.h" |
| 19 #include "webrtc/base/criticalsection.h" | 19 #include "webrtc/base/criticalsection.h" |
| 20 #include "webrtc/modules/rtp_rtcp/include/flexfec_receiver.h" | 20 #include "webrtc/modules/rtp_rtcp/include/flexfec_receiver.h" |
| 21 | 21 |
| 22 namespace webrtc { | 22 namespace webrtc { |
| 23 | 23 |
| 24 class RemoteBitrateEstimator; | |
| 25 class RtpPacketReceived; | |
| 26 | |
| 24 namespace internal { | 27 namespace internal { |
| 25 | 28 |
| 26 class FlexfecReceiveStream : public webrtc::FlexfecReceiveStream { | 29 class FlexfecReceiveStream : public webrtc::FlexfecReceiveStream { |
| 27 public: | 30 public: |
| 28 FlexfecReceiveStream(const Config& config, | 31 FlexfecReceiveStream(const Config& config, |
| 29 RecoveredPacketReceiver* recovered_packet_callback); | 32 RecoveredPacketReceiver* recovered_packet_receiver, |
| 33 RemoteBitrateEstimator* remote_bitrate_estimator); | |
| 30 ~FlexfecReceiveStream(); | 34 ~FlexfecReceiveStream(); |
| 31 | 35 |
| 32 bool AddAndProcessReceivedPacket(const uint8_t* packet, size_t length); | 36 const Config& config() { return config_; } |
| 37 | |
| 38 bool AddAndProcessReceivedPacket(RtpPacketReceived packet); | |
|
danilchap
2016/12/06 15:04:30
to pass by value forward declaration is not enough
brandtr
2016/12/12 13:51:07
It did compile though?
Moved the include to the h
| |
| 33 | 39 |
| 34 // Implements webrtc::FlexfecReceiveStream. | 40 // Implements webrtc::FlexfecReceiveStream. |
| 35 void Start() override; | 41 void Start() override; |
| 36 void Stop() override; | 42 void Stop() override; |
| 37 Stats GetStats() const override; | 43 Stats GetStats() const override; |
| 38 | 44 |
| 39 private: | 45 private: |
| 40 rtc::CriticalSection crit_; | 46 rtc::CriticalSection crit_; |
| 41 bool started_ GUARDED_BY(crit_); | 47 bool started_ GUARDED_BY(crit_); |
| 42 | 48 |
| 43 const Config config_; | 49 const Config config_; |
| 44 const std::unique_ptr<FlexfecReceiver> receiver_; | 50 const std::unique_ptr<FlexfecReceiver> receiver_; |
| 45 }; | 51 }; |
| 46 | 52 |
| 47 } // namespace internal | 53 } // namespace internal |
| 48 | 54 |
| 49 } // namespace webrtc | 55 } // namespace webrtc |
| 50 | 56 |
| 51 #endif // WEBRTC_CALL_FLEXFEC_RECEIVE_STREAM_H_ | 57 #endif // WEBRTC_CALL_FLEXFEC_RECEIVE_STREAM_H_ |
| OLD | NEW |