Bug 1279004: do RTCP decryption after filtering. r=jesup

MozReview-Commit-ID: 2VIgy6czdNp

--HG--
extra : rebase_source : 2e92f947bc802fc87db3c3f990aa86623f19ac61
This commit is contained in:
Nils Ohlmeier [:drno] 2016-06-08 11:44:46 -07:00
Родитель 12bac0f757
Коммит dda722b328
1 изменённых файлов: 10 добавлений и 9 удалений

Просмотреть файл

@ -994,6 +994,16 @@ void MediaPipeline::RtcpPacketReceived(TransportLayer *layer,
return; return;
} }
// We do not filter RTCP for send pipelines, since the webrtc.org code for
// senders already has logic to ignore RRs that do not apply.
// TODO bug 1279153: remove SR check for reduced size RTCP
if (filter_ && direction_ == RECEIVE) {
if (!filter_->FilterSenderReport(data, len)) {
MOZ_MTLOG(ML_NOTICE, "Dropping incoming RTCP packet; filtered out");
return;
}
}
// Make a copy rather than cast away constness // Make a copy rather than cast away constness
auto inner_data = MakeUnique<unsigned char[]>(len); auto inner_data = MakeUnique<unsigned char[]>(len);
memcpy(inner_data.get(), data, len); memcpy(inner_data.get(), data, len);
@ -1007,15 +1017,6 @@ void MediaPipeline::RtcpPacketReceived(TransportLayer *layer,
if (!NS_SUCCEEDED(res)) if (!NS_SUCCEEDED(res))
return; return;
// We do not filter RTCP for send pipelines, since the webrtc.org code for
// senders already has logic to ignore RRs that do not apply.
if (filter_ && direction_ == RECEIVE) {
if (!filter_->FilterSenderReport(inner_data.get(), out_len)) {
MOZ_MTLOG(ML_NOTICE, "Dropping rtcp packet");
return;
}
}
MOZ_MTLOG(ML_DEBUG, description_ << " received RTCP packet."); MOZ_MTLOG(ML_DEBUG, description_ << " received RTCP packet.");
increment_rtcp_packets_received(); increment_rtcp_packets_received();