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

Unified Diff: webrtc/modules/rtp_rtcp/source/rtcp_packet/target_bitrate.cc

Issue 2947633003: Allow parsing empty RTCP TargetBitrate messages, but stop sending them. (Closed)
Patch Set: Add comment about using ToString only in tests Created 3 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 side-by-side diff with in-line comments
Download patch
Index: webrtc/modules/rtp_rtcp/source/rtcp_packet/target_bitrate.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_packet/target_bitrate.cc b/webrtc/modules/rtp_rtcp/source/rtcp_packet/target_bitrate.cc
index 913264223fa08f4dc12cad46b278409d67f5cf46..1a00006fe08eb56325ea5bb8e2586a19ba04c58a 100644
--- a/webrtc/modules/rtp_rtcp/source/rtcp_packet/target_bitrate.cc
+++ b/webrtc/modules/rtp_rtcp/source/rtcp_packet/target_bitrate.cc
@@ -11,7 +11,6 @@
#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/target_bitrate.h"
#include "webrtc/base/checks.h"
-#include "webrtc/base/logging.h"
#include "webrtc/modules/rtp_rtcp/source/byte_io.h"
namespace webrtc {
@@ -65,15 +64,7 @@ TargetBitrate::BitrateItem::BitrateItem(uint8_t spatial_layer,
TargetBitrate::TargetBitrate() {}
TargetBitrate::~TargetBitrate() {}
-bool TargetBitrate::Parse(const uint8_t* block, uint16_t block_length) {
- if (block_length < 1) {
- LOG(LS_WARNING)
- << "Cannot parse TargetBitrate RTCP packet: Too little payload data ("
- << kTargetBitrateHeaderSizeBytes << " bytes needed, got "
- << block_length * 4 << ").";
- return false;
- }
-
+void TargetBitrate::Parse(const uint8_t* block, uint16_t block_length) {
// Validate block header (should already have been parsed and checked).
RTC_DCHECK_EQ(block[0], kBlockType);
RTC_DCHECK_EQ(block_length, ByteReader<uint16_t>::ReadBigEndian(&block[2]));
@@ -91,8 +82,6 @@ bool TargetBitrate::Parse(const uint8_t* block, uint16_t block_length) {
index += kBitrateItemSizeBytes;
AddTargetBitrate((layers >> 4) & 0x0F, layers & 0x0F, bitrate_kbps);
}
-
- return true;
}
void TargetBitrate::AddTargetBitrate(uint8_t spatial_layer,

Powered by Google App Engine
This is Rietveld 408576698