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

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

Issue 2452583002: Follow standard sending CVO rtp header extension (Closed)
Patch Set: -now unused helper Created 4 years, 1 month 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
11 #ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_SENDER_VIDEO_H_ 11 #ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_SENDER_VIDEO_H_
12 #define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_SENDER_VIDEO_H_ 12 #define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_SENDER_VIDEO_H_
13 13
14 #include <list> 14 #include <list>
15 #include <memory> 15 #include <memory>
16 16
17 #include "webrtc/base/criticalsection.h" 17 #include "webrtc/base/criticalsection.h"
18 #include "webrtc/base/onetimeevent.h" 18 #include "webrtc/base/onetimeevent.h"
19 #include "webrtc/base/rate_statistics.h" 19 #include "webrtc/base/rate_statistics.h"
20 #include "webrtc/base/sequenced_task_checker.h"
20 #include "webrtc/base/thread_annotations.h" 21 #include "webrtc/base/thread_annotations.h"
21 #include "webrtc/common_types.h" 22 #include "webrtc/common_types.h"
22 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" 23 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"
23 #include "webrtc/modules/rtp_rtcp/source/forward_error_correction.h" 24 #include "webrtc/modules/rtp_rtcp/source/forward_error_correction.h"
24 #include "webrtc/modules/rtp_rtcp/source/producer_fec.h" 25 #include "webrtc/modules/rtp_rtcp/source/producer_fec.h"
25 #include "webrtc/modules/rtp_rtcp/source/rtp_rtcp_config.h" 26 #include "webrtc/modules/rtp_rtcp/source/rtp_rtcp_config.h"
26 #include "webrtc/modules/rtp_rtcp/source/rtp_sender.h" 27 #include "webrtc/modules/rtp_rtcp/source/rtp_sender.h"
27 #include "webrtc/modules/rtp_rtcp/source/rtp_utility.h" 28 #include "webrtc/modules/rtp_rtcp/source/rtp_utility.h"
28 #include "webrtc/modules/rtp_rtcp/source/video_codec_information.h" 29 #include "webrtc/modules/rtp_rtcp/source/video_codec_information.h"
29 #include "webrtc/typedefs.h" 30 #include "webrtc/typedefs.h"
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 83
83 void SendVideoPacketAsRed(std::unique_ptr<RtpPacketToSend> media_packet, 84 void SendVideoPacketAsRed(std::unique_ptr<RtpPacketToSend> media_packet,
84 StorageType media_packet_storage, 85 StorageType media_packet_storage,
85 bool protect); 86 bool protect);
86 87
87 RTPSender* const rtp_sender_; 88 RTPSender* const rtp_sender_;
88 Clock* const clock_; 89 Clock* const clock_;
89 90
90 // Should never be held when calling out of this class. 91 // Should never be held when calling out of this class.
91 rtc::CriticalSection crit_; 92 rtc::CriticalSection crit_;
93 rtc::SequencedTaskChecker encoder_checker_;
92 94
93 RtpVideoCodecTypes video_type_ = kRtpVideoGeneric; 95 RtpVideoCodecTypes video_type_ = kRtpVideoGeneric;
94 int32_t retransmission_settings_ GUARDED_BY(crit_) = kRetransmitBaseLayer; 96 int32_t retransmission_settings_ GUARDED_BY(crit_) = kRetransmitBaseLayer;
97 VideoRotation last_rotation_ GUARDED_BY(encoder_checker_) = kVideoRotation_0;
95 98
96 // FEC 99 // FEC
97 bool fec_enabled_ GUARDED_BY(crit_) = false; 100 bool fec_enabled_ GUARDED_BY(crit_) = false;
98 int8_t red_payload_type_ GUARDED_BY(crit_) = 0; 101 int8_t red_payload_type_ GUARDED_BY(crit_) = 0;
99 int8_t fec_payload_type_ GUARDED_BY(crit_) = 0; 102 int8_t fec_payload_type_ GUARDED_BY(crit_) = 0;
100 FecProtectionParams delta_fec_params_ GUARDED_BY(crit_) = FecProtectionParams{ 103 FecProtectionParams delta_fec_params_ GUARDED_BY(crit_) = FecProtectionParams{
101 0, 1, kFecMaskRandom}; 104 0, 1, kFecMaskRandom};
102 FecProtectionParams key_fec_params_ GUARDED_BY(crit_) = FecProtectionParams{ 105 FecProtectionParams key_fec_params_ GUARDED_BY(crit_) = FecProtectionParams{
103 0, 1, kFecMaskRandom}; 106 0, 1, kFecMaskRandom};
104 ProducerFec producer_fec_ GUARDED_BY(crit_); 107 ProducerFec producer_fec_ GUARDED_BY(crit_);
105 108
106 rtc::CriticalSection stats_crit_; 109 rtc::CriticalSection stats_crit_;
107 // Bitrate used for FEC payload, RED headers, RTP headers for FEC packets 110 // Bitrate used for FEC payload, RED headers, RTP headers for FEC packets
108 // and any padding overhead. 111 // and any padding overhead.
109 RateStatistics fec_bitrate_ GUARDED_BY(stats_crit_); 112 RateStatistics fec_bitrate_ GUARDED_BY(stats_crit_);
110 // Bitrate used for video payload and RTP headers. 113 // Bitrate used for video payload and RTP headers.
111 RateStatistics video_bitrate_ GUARDED_BY(stats_crit_); 114 RateStatistics video_bitrate_ GUARDED_BY(stats_crit_);
112 OneTimeEvent first_frame_sent_; 115 OneTimeEvent first_frame_sent_;
113 }; 116 };
114 117
115 } // namespace webrtc 118 } // namespace webrtc
116 119
117 #endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_SENDER_VIDEO_H_ 120 #endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_SENDER_VIDEO_H_
OLDNEW
« no previous file with comments | « webrtc/modules/rtp_rtcp/source/rtp_sender_unittest.cc ('k') | webrtc/modules/rtp_rtcp/source/rtp_sender_video.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698