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

Unified Diff: webrtc/call/rtx_receive_stream.cc

Issue 3005793002: Fix setting of recovered flag in RtxReceiveStream. (Closed)
Patch Set: Drop static. git cl format. Created 3 years, 4 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
« no previous file with comments | « webrtc/call/rtx_receive_stream.h ('k') | webrtc/call/rtx_receive_stream_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/call/rtx_receive_stream.cc
diff --git a/webrtc/call/rtx_receive_stream.cc b/webrtc/call/rtx_receive_stream.cc
index f08e3c3960168b7c22be975a7376c19d6e012e5b..16463525c729de224d6a1dfb9befe76d4617a25f 100644
--- a/webrtc/call/rtx_receive_stream.cc
+++ b/webrtc/call/rtx_receive_stream.cc
@@ -12,16 +12,21 @@
#include "webrtc/call/rtx_receive_stream.h"
#include "webrtc/modules/rtp_rtcp/source/rtp_packet_received.h"
+#include "webrtc/rtc_base/logging.h"
namespace webrtc {
-RtxReceiveStream::RtxReceiveStream(
- RtpPacketSinkInterface* media_sink,
- std::map<int, int> rtx_payload_type_map,
- uint32_t media_ssrc)
+RtxReceiveStream::RtxReceiveStream(RtpPacketSinkInterface* media_sink,
+ std::map<int, int> associated_payload_types,
+ uint32_t media_ssrc)
: media_sink_(media_sink),
- rtx_payload_type_map_(std::move(rtx_payload_type_map)),
- media_ssrc_(media_ssrc) {}
+ associated_payload_types_(std::move(associated_payload_types)),
+ media_ssrc_(media_ssrc) {
+ if (associated_payload_types_.empty()) {
+ LOG(LS_WARNING)
+ << "RtxReceiveStream created with empty payload type mapping.";
+ }
+}
RtxReceiveStream::~RtxReceiveStream() = default;
@@ -32,8 +37,11 @@ void RtxReceiveStream::OnRtpPacket(const RtpPacketReceived& rtx_packet) {
return;
}
- auto it = rtx_payload_type_map_.find(rtx_packet.PayloadType());
- if (it == rtx_payload_type_map_.end()) {
+ auto it = associated_payload_types_.find(rtx_packet.PayloadType());
+ if (it == associated_payload_types_.end()) {
+ LOG(LS_VERBOSE) << "Unknown payload type "
+ << static_cast<int>(rtx_packet.PayloadType())
+ << " on rtx ssrc " << rtx_packet.Ssrc();
return;
}
RtpPacketReceived media_packet;
@@ -42,6 +50,7 @@ void RtxReceiveStream::OnRtpPacket(const RtpPacketReceived& rtx_packet) {
media_packet.SetSsrc(media_ssrc_);
media_packet.SetSequenceNumber((payload[0] << 8) + payload[1]);
media_packet.SetPayloadType(it->second);
+ media_packet.set_recovered(true);
// Skip the RTX header.
rtc::ArrayView<const uint8_t> rtx_payload =
« no previous file with comments | « webrtc/call/rtx_receive_stream.h ('k') | webrtc/call/rtx_receive_stream_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698