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

Side by Side Diff: webrtc/modules/rtp_rtcp/source/rtcp_packet/psfb.cc

Issue 2023803002: [rtcp] Fir/Sli/Rpsi updated not to use RTCPUtility (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 6 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) 2015 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2015 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 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/psfb.h" 11 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/psfb.h"
12 12
13 #include "webrtc/modules/rtp_rtcp/source/byte_io.h" 13 #include "webrtc/modules/rtp_rtcp/source/byte_io.h"
14 14
15 namespace webrtc { 15 namespace webrtc {
16 namespace rtcp { 16 namespace rtcp {
17 17 constexpr uint8_t Psfb::kPacketType;
18 constexpr size_t Psfb::kCommonFeedbackLength;
18 // RFC 4585: Feedback format. 19 // RFC 4585: Feedback format.
19 // 20 //
20 // Common packet format: 21 // Common packet format:
21 // 22 //
22 // 0 1 2 3 23 // 0 1 2 3
23 // 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 24 // 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
24 // +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ 25 // +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
25 // |V=2|P| FMT | PT | length | 26 // |V=2|P| FMT | PT | length |
26 // +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ 27 // +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
27 // 0 | SSRC of packet sender | 28 // 0 | SSRC of packet sender |
28 // +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ 29 // +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
29 // 4 | SSRC of media source | 30 // 4 | SSRC of media source |
30 // +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ 31 // +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
31 // : Feedback Control Information (FCI) : 32 // : Feedback Control Information (FCI) :
32 // : : 33 // : :
33 34
34 void Psfb::ParseCommonFeedback(const uint8_t* payload) { 35 void Psfb::ParseCommonFeedback(const uint8_t* payload) {
35 sender_ssrc_ = ByteReader<uint32_t>::ReadBigEndian(&payload[0]); 36 sender_ssrc_ = ByteReader<uint32_t>::ReadBigEndian(&payload[0]);
36 media_ssrc_ = ByteReader<uint32_t>::ReadBigEndian(&payload[4]); 37 media_ssrc_ = ByteReader<uint32_t>::ReadBigEndian(&payload[4]);
37 } 38 }
38 39
39 void Psfb::CreateCommonFeedback(uint8_t* payload) const { 40 void Psfb::CreateCommonFeedback(uint8_t* payload) const {
40 ByteWriter<uint32_t>::WriteBigEndian(&payload[0], sender_ssrc_); 41 ByteWriter<uint32_t>::WriteBigEndian(&payload[0], sender_ssrc_);
41 ByteWriter<uint32_t>::WriteBigEndian(&payload[4], media_ssrc_); 42 ByteWriter<uint32_t>::WriteBigEndian(&payload[4], media_ssrc_);
42 } 43 }
43 44
44 } // namespace rtcp 45 } // namespace rtcp
45 } // namespace webrtc 46 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/rtp_rtcp/source/rtcp_packet/psfb.h ('k') | webrtc/modules/rtp_rtcp/source/rtcp_packet/rpsi.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698