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

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

Issue 1702043002: Remove video-codec max bitrate from TMMBN. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 10 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 23 matching lines...) Expand all
34 public: 34 public:
35 RTPSenderVideo(Clock* clock, RTPSenderInterface* rtpSender); 35 RTPSenderVideo(Clock* clock, RTPSenderInterface* rtpSender);
36 virtual ~RTPSenderVideo(); 36 virtual ~RTPSenderVideo();
37 37
38 virtual RtpVideoCodecTypes VideoCodecType() const; 38 virtual RtpVideoCodecTypes VideoCodecType() const;
39 39
40 size_t FECPacketOverhead() const; 40 size_t FECPacketOverhead() const;
41 41
42 static RtpUtility::Payload* CreateVideoPayload( 42 static RtpUtility::Payload* CreateVideoPayload(
43 const char payloadName[RTP_PAYLOAD_NAME_SIZE], 43 const char payloadName[RTP_PAYLOAD_NAME_SIZE],
44 const int8_t payloadType, 44 const int8_t payloadType);
45 const uint32_t maxBitRate);
46 45
47 int32_t SendVideo(const RtpVideoCodecTypes videoType, 46 int32_t SendVideo(const RtpVideoCodecTypes videoType,
48 const FrameType frameType, 47 const FrameType frameType,
49 const int8_t payloadType, 48 const int8_t payloadType,
50 const uint32_t captureTimeStamp, 49 const uint32_t captureTimeStamp,
51 int64_t capture_time_ms, 50 int64_t capture_time_ms,
52 const uint8_t* payloadData, 51 const uint8_t* payloadData,
53 const size_t payloadSize, 52 const size_t payloadSize,
54 const RTPFragmentationHeader* fragmentation, 53 const RTPFragmentationHeader* fragmentation,
55 const RTPVideoHeader* video_header); 54 const RTPVideoHeader* video_header);
56 55
57 int32_t SendRTPIntraRequest(); 56 int32_t SendRTPIntraRequest();
58 57
59 void SetVideoCodecType(RtpVideoCodecTypes type); 58 void SetVideoCodecType(RtpVideoCodecTypes type);
60 59
61 void SetMaxConfiguredBitrateVideo(const uint32_t maxBitrate);
62
63 uint32_t MaxConfiguredBitrateVideo() const;
64
65 // FEC 60 // FEC
66 void SetGenericFECStatus(const bool enable, 61 void SetGenericFECStatus(const bool enable,
67 const uint8_t payloadTypeRED, 62 const uint8_t payloadTypeRED,
68 const uint8_t payloadTypeFEC); 63 const uint8_t payloadTypeFEC);
69 64
70 void GenericFECStatus(bool* enable, 65 void GenericFECStatus(bool* enable,
71 uint8_t* payloadTypeRED, 66 uint8_t* payloadTypeRED,
72 uint8_t* payloadTypeFEC) const; 67 uint8_t* payloadTypeFEC) const;
73 68
74 void SetFecParameters(const FecProtectionParams* delta_params, 69 void SetFecParameters(const FecProtectionParams* delta_params,
(...skipping 24 matching lines...) Expand all
99 int64_t capture_time_ms, 94 int64_t capture_time_ms,
100 StorageType media_packet_storage, 95 StorageType media_packet_storage,
101 bool protect); 96 bool protect);
102 97
103 RTPSenderInterface& _rtpSender; 98 RTPSenderInterface& _rtpSender;
104 99
105 // Should never be held when calling out of this class. 100 // Should never be held when calling out of this class.
106 const rtc::scoped_ptr<CriticalSectionWrapper> crit_; 101 const rtc::scoped_ptr<CriticalSectionWrapper> crit_;
107 102
108 RtpVideoCodecTypes _videoType; 103 RtpVideoCodecTypes _videoType;
109 uint32_t _maxBitrate;
110 int32_t _retransmissionSettings GUARDED_BY(crit_); 104 int32_t _retransmissionSettings GUARDED_BY(crit_);
111 105
112 // FEC 106 // FEC
113 ForwardErrorCorrection fec_; 107 ForwardErrorCorrection fec_;
114 bool fec_enabled_ GUARDED_BY(crit_); 108 bool fec_enabled_ GUARDED_BY(crit_);
115 int8_t red_payload_type_ GUARDED_BY(crit_); 109 int8_t red_payload_type_ GUARDED_BY(crit_);
116 int8_t fec_payload_type_ GUARDED_BY(crit_); 110 int8_t fec_payload_type_ GUARDED_BY(crit_);
117 FecProtectionParams delta_fec_params_ GUARDED_BY(crit_); 111 FecProtectionParams delta_fec_params_ GUARDED_BY(crit_);
118 FecProtectionParams key_fec_params_ GUARDED_BY(crit_); 112 FecProtectionParams key_fec_params_ GUARDED_BY(crit_);
119 ProducerFec producer_fec_ GUARDED_BY(crit_); 113 ProducerFec producer_fec_ GUARDED_BY(crit_);
120 114
121 // Bitrate used for FEC payload, RED headers, RTP headers for FEC packets 115 // Bitrate used for FEC payload, RED headers, RTP headers for FEC packets
122 // and any padding overhead. 116 // and any padding overhead.
123 Bitrate _fecOverheadRate; 117 Bitrate _fecOverheadRate;
124 // Bitrate used for video payload and RTP headers 118 // Bitrate used for video payload and RTP headers
125 Bitrate _videoBitrate; 119 Bitrate _videoBitrate;
126 }; 120 };
127 } // namespace webrtc 121 } // namespace webrtc
128 122
129 #endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_SENDER_VIDEO_H_ 123 #endif // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTP_SENDER_VIDEO_H_
OLDNEW
« no previous file with comments | « webrtc/modules/rtp_rtcp/source/rtp_sender.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