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

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

Issue 1434213004: rtcp::Ij renamed to rtcp::ExtendedJitterReport and moved into own file (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Resolved merge conflict Created 5 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
« no previous file with comments | « webrtc/modules/rtp_rtcp/rtp_rtcp.gypi ('k') | webrtc/modules/rtp_rtcp/source/rtcp_packet.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2014 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2014 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 245 matching lines...) Expand 10 before | Expand all | Expand 10 after
256 const size_t kRrHeaderLength = 8; 256 const size_t kRrHeaderLength = 8;
257 return kRrHeaderLength + report_blocks_.size() * kReportBlockLength; 257 return kRrHeaderLength + report_blocks_.size() * kReportBlockLength;
258 } 258 }
259 259
260 RTCPUtility::RTCPPacketRR rr_; 260 RTCPUtility::RTCPPacketRR rr_;
261 std::vector<ReportBlock> report_blocks_; 261 std::vector<ReportBlock> report_blocks_;
262 262
263 RTC_DISALLOW_COPY_AND_ASSIGN(ReceiverReport); 263 RTC_DISALLOW_COPY_AND_ASSIGN(ReceiverReport);
264 }; 264 };
265 265
266 // Transmission Time Offsets in RTP Streams (RFC 5450).
267 //
268 // 0 1 2 3
269 // 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
270 // +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
271 // hdr |V=2|P| RC | PT=IJ=195 | length |
272 // +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
273 // | inter-arrival jitter |
274 // +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
275 // . .
276 // . .
277 // . .
278 // | inter-arrival jitter |
279 // +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
280 //
281 // If present, this RTCP packet must be placed after a receiver report
282 // (inside a compound RTCP packet), and MUST have the same value for RC
283 // (reception report count) as the receiver report.
284
285 class Ij : public RtcpPacket {
286 public:
287 Ij() : RtcpPacket() {}
288
289 virtual ~Ij() {}
290
291 bool WithJitterItem(uint32_t jitter);
292
293 protected:
294 bool Create(uint8_t* packet,
295 size_t* index,
296 size_t max_length,
297 RtcpPacket::PacketReadyCallback* callback) const override;
298
299 private:
300 static const int kMaxNumberOfIjItems = 0x1f;
301
302 size_t BlockLength() const {
303 return kHeaderLength + 4 * ij_items_.size();
304 }
305
306 std::vector<uint32_t> ij_items_;
307
308 RTC_DISALLOW_COPY_AND_ASSIGN(Ij);
309 };
310
311 // Source Description (SDES) (RFC 3550). 266 // Source Description (SDES) (RFC 3550).
312 // 267 //
313 // 0 1 2 3 268 // 0 1 2 3
314 // 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 269 // 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
315 // +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ 270 // +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
316 // header |V=2|P| SC | PT=SDES=202 | length | 271 // header |V=2|P| SC | PT=SDES=202 | length |
317 // +=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+ 272 // +=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+
318 // chunk | SSRC/CSRC_1 | 273 // chunk | SSRC/CSRC_1 |
319 // 1 +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ 274 // 1 +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
320 // | SDES items | 275 // | SDES items |
(...skipping 780 matching lines...) Expand 10 before | Expand all | Expand 10 after
1101 1056
1102 private: 1057 private:
1103 const size_t buffer_length_; 1058 const size_t buffer_length_;
1104 size_t length_; 1059 size_t length_;
1105 rtc::scoped_ptr<uint8_t[]> buffer_; 1060 rtc::scoped_ptr<uint8_t[]> buffer_;
1106 }; 1061 };
1107 1062
1108 } // namespace rtcp 1063 } // namespace rtcp
1109 } // namespace webrtc 1064 } // namespace webrtc
1110 #endif // WEBRTC_MODULES_RTP_RTCP_RTCP_PACKET_H_ 1065 #endif // WEBRTC_MODULES_RTP_RTCP_RTCP_PACKET_H_
OLDNEW
« no previous file with comments | « webrtc/modules/rtp_rtcp/rtp_rtcp.gypi ('k') | webrtc/modules/rtp_rtcp/source/rtcp_packet.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698