Chromium Code Reviews| Index: webrtc/modules/rtp_rtcp/source/producer_fec.cc |
| diff --git a/webrtc/modules/rtp_rtcp/source/producer_fec.cc b/webrtc/modules/rtp_rtcp/source/producer_fec.cc |
| index cdd898d733ed7a7399f34f852039f738262b6f60..0dbed417db70c5ff4eb368a8853cd45438a51fb2 100644 |
| --- a/webrtc/modules/rtp_rtcp/source/producer_fec.cc |
| +++ b/webrtc/modules/rtp_rtcp/source/producer_fec.cc |
| @@ -101,9 +101,7 @@ ProducerFec::ProducerFec() |
| memset(&new_params_, 0, sizeof(new_params_)); |
| } |
| -ProducerFec::~ProducerFec() { |
| - DeleteMediaPackets(); |
| -} |
| +ProducerFec::~ProducerFec() = default; |
| std::unique_ptr<RedPacket> ProducerFec::BuildRedPacket( |
| const uint8_t* data_buffer, |
| @@ -180,7 +178,7 @@ int ProducerFec::AddRtpPacketAndGenerateFec(const uint8_t* data_buffer, |
| params_.fec_mask_type, &generated_fec_packets_); |
| if (generated_fec_packets_.empty()) { |
| num_protected_frames_ = 0; |
| - DeleteMediaPackets(); |
| + media_packets_.clear(); |
| } |
| return ret; |
| } |
| @@ -204,10 +202,6 @@ bool ProducerFec::MinimumMediaPacketsReached() const { |
| } |
| } |
| -bool ProducerFec::FecAvailable() const { |
| - return !generated_fec_packets_.empty(); |
| -} |
| - |
| size_t ProducerFec::NumAvailableFecPackets() const { |
| return generated_fec_packets_.size(); |
|
stefan-webrtc
2016/09/05 14:50:20
Since generated_fec_packets_ is a list, this metho
stefan-webrtc
2016/09/05 14:52:36
Or actually since it's only tests, I'm ok with doi
brandtr
2016/09/05 14:58:38
NumAvailableFecPackets() is used by RTPSenderVideo
brandtr
2016/09/26 14:09:27
Sorry for the flip-flopping here, but I decided to
|
| } |
| @@ -241,17 +235,13 @@ std::vector<std::unique_ptr<RedPacket>> ProducerFec::GetFecPacketsAsRed( |
| red_packets.push_back(std::move(red_packet)); |
| } |
| // Reset state. |
| - DeleteMediaPackets(); |
| + media_packets_.clear(); |
| generated_fec_packets_.clear(); |
| num_protected_frames_ = 0; |
| return red_packets; |
| } |
| int ProducerFec::Overhead() const { |
| - // Overhead is defined as relative to the number of media packets, and not |
| - // relative to total number of packets. This definition is inherited from the |
| - // protection factor produced by video_coding module and how the FEC |
| - // generation is implemented. |
| RTC_DCHECK(!media_packets_.empty()); |
| int num_fec_packets = |
| fec_->NumFecPackets(media_packets_.size(), params_.fec_rate); |
| @@ -259,8 +249,4 @@ int ProducerFec::Overhead() const { |
| return (num_fec_packets << 8) / media_packets_.size(); |
| } |
| -void ProducerFec::DeleteMediaPackets() { |
| - media_packets_.clear(); |
| -} |
| - |
| } // namespace webrtc |