Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(119)

Side by Side Diff: webrtc/modules/rtp_rtcp/source/rtp_sender.h

Issue 1335353005: Remove channel ids from various interfaces. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: rebase Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 virtual bool UpdateVideoRotation(uint8_t* rtp_packet, 79 virtual bool UpdateVideoRotation(uint8_t* rtp_packet,
80 size_t rtp_packet_length, 80 size_t rtp_packet_length,
81 const RTPHeader& rtp_header, 81 const RTPHeader& rtp_header,
82 VideoRotation rotation) const = 0; 82 VideoRotation rotation) const = 0;
83 virtual bool IsRtpHeaderExtensionRegistered(RTPExtensionType type) = 0; 83 virtual bool IsRtpHeaderExtensionRegistered(RTPExtensionType type) = 0;
84 virtual CVOMode ActivateCVORtpHeaderExtension() = 0; 84 virtual CVOMode ActivateCVORtpHeaderExtension() = 0;
85 }; 85 };
86 86
87 class RTPSender : public RTPSenderInterface { 87 class RTPSender : public RTPSenderInterface {
88 public: 88 public:
89 RTPSender(int32_t id, 89 RTPSender(bool audio,
90 bool audio,
91 Clock* clock, 90 Clock* clock,
92 Transport* transport, 91 Transport* transport,
93 RtpAudioFeedback* audio_feedback, 92 RtpAudioFeedback* audio_feedback,
94 PacedSender* paced_sender, 93 PacedSender* paced_sender,
95 PacketRouter* packet_router, 94 PacketRouter* packet_router,
96 TransportFeedbackObserver* transport_feedback_callback, 95 TransportFeedbackObserver* transport_feedback_callback,
97 BitrateStatisticsObserver* bitrate_callback, 96 BitrateStatisticsObserver* bitrate_callback,
98 FrameCountObserver* frame_count_observer, 97 FrameCountObserver* frame_count_observer,
99 SendSideDelayObserver* send_side_delay_observer); 98 SendSideDelayObserver* send_side_delay_observer);
100 virtual ~RTPSender(); 99 virtual ~RTPSender();
(...skipping 280 matching lines...) Expand 10 before | Expand all | Expand 10 after
381 bool is_rtx, 380 bool is_rtx,
382 bool is_retransmit); 381 bool is_retransmit);
383 bool IsFecPacket(const uint8_t* buffer, const RTPHeader& header) const; 382 bool IsFecPacket(const uint8_t* buffer, const RTPHeader& header) const;
384 383
385 Clock* clock_; 384 Clock* clock_;
386 int64_t clock_delta_ms_; 385 int64_t clock_delta_ms_;
387 386
388 rtc::scoped_ptr<BitrateAggregator> bitrates_; 387 rtc::scoped_ptr<BitrateAggregator> bitrates_;
389 Bitrate total_bitrate_sent_; 388 Bitrate total_bitrate_sent_;
390 389
391 int32_t id_;
392
393 const bool audio_configured_; 390 const bool audio_configured_;
394 rtc::scoped_ptr<RTPSenderAudio> audio_; 391 rtc::scoped_ptr<RTPSenderAudio> audio_;
395 rtc::scoped_ptr<RTPSenderVideo> video_; 392 rtc::scoped_ptr<RTPSenderVideo> video_;
396 393
397 PacedSender* const paced_sender_; 394 PacedSender* const paced_sender_;
398 PacketRouter* const packet_router_; 395 PacketRouter* const packet_router_;
399 TransportFeedbackObserver* const transport_feedback_observer_; 396 TransportFeedbackObserver* const transport_feedback_observer_;
400 int64_t last_capture_time_ms_sent_; 397 int64_t last_capture_time_ms_sent_;
401 rtc::scoped_ptr<CriticalSectionWrapper> send_critsect_; 398 rtc::scoped_ptr<CriticalSectionWrapper> send_critsect_;
402 399
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
461 // SetTargetBitrateKbps or GetTargetBitrateKbps. Also remember 458 // SetTargetBitrateKbps or GetTargetBitrateKbps. Also remember
462 // that by the time the function returns there is no guarantee 459 // that by the time the function returns there is no guarantee
463 // that the target bitrate is still valid. 460 // that the target bitrate is still valid.
464 rtc::scoped_ptr<CriticalSectionWrapper> target_bitrate_critsect_; 461 rtc::scoped_ptr<CriticalSectionWrapper> target_bitrate_critsect_;
465 uint32_t target_bitrate_ GUARDED_BY(target_bitrate_critsect_); 462 uint32_t target_bitrate_ GUARDED_BY(target_bitrate_critsect_);
466 }; 463 };
467 464
468 } // namespace webrtc 465 } // namespace webrtc
469 466
470 #endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_SENDER_H_ 467 #endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_SENDER_H_
OLDNEW
« no previous file with comments | « webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl_unittest.cc ('k') | webrtc/modules/rtp_rtcp/source/rtp_sender.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698