| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2012 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 |
| (...skipping 193 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 204 virtual int32_t RequestKeyFrame(); | 204 virtual int32_t RequestKeyFrame(); |
| 205 | 205 |
| 206 // Implements FrameTypeCallback. | 206 // Implements FrameTypeCallback. |
| 207 virtual int32_t SliceLossIndicationRequest( | 207 virtual int32_t SliceLossIndicationRequest( |
| 208 const uint64_t picture_id); | 208 const uint64_t picture_id); |
| 209 | 209 |
| 210 // Implements VideoPacketRequestCallback. | 210 // Implements VideoPacketRequestCallback. |
| 211 int32_t ResendPackets(const uint16_t* sequence_numbers, | 211 int32_t ResendPackets(const uint16_t* sequence_numbers, |
| 212 uint16_t length) override; | 212 uint16_t length) override; |
| 213 | 213 |
| 214 int32_t SetVoiceChannel(int32_t ve_channel_id, | |
| 215 VoEVideoSync* ve_sync_interface); | |
| 216 int32_t VoiceChannel(); | |
| 217 | |
| 218 void RegisterPreRenderCallback(I420FrameCallback* pre_render_callback); | 214 void RegisterPreRenderCallback(I420FrameCallback* pre_render_callback); |
| 219 | 215 |
| 220 void RegisterSendFrameCountObserver(FrameCountObserver* observer); | 216 void RegisterSendFrameCountObserver(FrameCountObserver* observer); |
| 221 void RegisterRtcpPacketTypeCounterObserver( | 217 void RegisterRtcpPacketTypeCounterObserver( |
| 222 RtcpPacketTypeCounterObserver* observer); | 218 RtcpPacketTypeCounterObserver* observer); |
| 223 void RegisterReceiveStatisticsProxy( | 219 void RegisterReceiveStatisticsProxy( |
| 224 ReceiveStatisticsProxy* receive_statistics_proxy); | 220 ReceiveStatisticsProxy* receive_statistics_proxy); |
| 225 void SetIncomingVideoStream(IncomingVideoStream* incoming_video_stream); | 221 void SetIncomingVideoStream(IncomingVideoStream* incoming_video_stream); |
| 226 | 222 |
| 227 protected: | 223 protected: |
| (...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 352 PayloadRouter* const send_payload_router_; | 348 PayloadRouter* const send_payload_router_; |
| 353 | 349 |
| 354 // Used for all registered callbacks except rendering. | 350 // Used for all registered callbacks except rendering. |
| 355 rtc::CriticalSection crit_; | 351 rtc::CriticalSection crit_; |
| 356 | 352 |
| 357 // Owned modules/classes. | 353 // Owned modules/classes. |
| 358 rtc::scoped_ptr<ViEChannelProtectionCallback> vcm_protection_callback_; | 354 rtc::scoped_ptr<ViEChannelProtectionCallback> vcm_protection_callback_; |
| 359 | 355 |
| 360 VideoCodingModule* const vcm_; | 356 VideoCodingModule* const vcm_; |
| 361 ViEReceiver vie_receiver_; | 357 ViEReceiver vie_receiver_; |
| 362 ViESyncModule vie_sync_; | |
| 363 | 358 |
| 364 // Helper to report call statistics. | 359 // Helper to report call statistics. |
| 365 rtc::scoped_ptr<ChannelStatsObserver> stats_observer_; | 360 rtc::scoped_ptr<ChannelStatsObserver> stats_observer_; |
| 366 | 361 |
| 367 // Not owned. | 362 // Not owned. |
| 368 ReceiveStatisticsProxy* receive_stats_callback_ GUARDED_BY(crit_); | 363 ReceiveStatisticsProxy* receive_stats_callback_ GUARDED_BY(crit_); |
| 369 FrameCounts receive_frame_counts_ GUARDED_BY(crit_); | 364 FrameCounts receive_frame_counts_ GUARDED_BY(crit_); |
| 370 IncomingVideoStream* incoming_video_stream_ GUARDED_BY(crit_); | 365 IncomingVideoStream* incoming_video_stream_ GUARDED_BY(crit_); |
| 371 RtcpIntraFrameObserver* const intra_frame_observer_; | 366 RtcpIntraFrameObserver* const intra_frame_observer_; |
| 372 RtcpRttStats* const rtt_stats_; | 367 RtcpRttStats* const rtt_stats_; |
| (...skipping 15 matching lines...) Expand all Loading... |
| 388 size_t num_rtts_ GUARDED_BY(crit_); | 383 size_t num_rtts_ GUARDED_BY(crit_); |
| 389 | 384 |
| 390 // RtpRtcp modules, declared last as they use other members on construction. | 385 // RtpRtcp modules, declared last as they use other members on construction. |
| 391 const std::vector<RtpRtcp*> rtp_rtcp_modules_; | 386 const std::vector<RtpRtcp*> rtp_rtcp_modules_; |
| 392 size_t num_active_rtp_rtcp_modules_ GUARDED_BY(crit_); | 387 size_t num_active_rtp_rtcp_modules_ GUARDED_BY(crit_); |
| 393 }; | 388 }; |
| 394 | 389 |
| 395 } // namespace webrtc | 390 } // namespace webrtc |
| 396 | 391 |
| 397 #endif // WEBRTC_VIDEO_VIE_CHANNEL_H_ | 392 #endif // WEBRTC_VIDEO_VIE_CHANNEL_H_ |
| OLD | NEW |