Index: webrtc/modules/rtp_rtcp/source/rtp_format_vp8.cc |
diff --git a/webrtc/modules/rtp_rtcp/source/rtp_format_vp8.cc b/webrtc/modules/rtp_rtcp/source/rtp_format_vp8.cc |
index b31de933dd6d612e0cda2b31ae0547a3fc9c950c..11917c443d16bb5560f32944c82ff94b35499c8e 100644 |
--- a/webrtc/modules/rtp_rtcp/source/rtp_format_vp8.cc |
+++ b/webrtc/modules/rtp_rtcp/source/rtp_format_vp8.cc |
@@ -218,16 +218,26 @@ ProtectionType RtpPacketizerVp8::GetProtectionType() { |
} |
StorageType RtpPacketizerVp8::GetStorageType(uint32_t retransmission_settings) { |
- if (hdr_info_.temporalIdx == 0 && |
- !(retransmission_settings & kRetransmitBaseLayer)) { |
+ if (retransmission_settings == kRetransmitOff) |
return kDontRetransmit; |
+ |
+ if (retransmission_settings == kRetransmitAllPackets) |
+ return kAllowRetransmission; |
+ |
+ if (hdr_info_.temporalIdx == kNoTemporalIdx) |
danilchap
2017/08/29 17:31:19
if retransmission_settings == kRetransmitFECPacket
sprang_webrtc
2017/08/31 15:54:28
I don't think fec makes sense here. This method is
|
+ return kAllowRetransmission; |
+ |
+ if ((retransmission_settings & kRetransmitBaseLayer) && |
+ hdr_info_.temporalIdx == 0) { |
+ return kAllowRetransmission; |
} |
- if (hdr_info_.temporalIdx != kNoTemporalIdx && |
- hdr_info_.temporalIdx > 0 && |
- !(retransmission_settings & kRetransmitHigherLayers)) { |
- return kDontRetransmit; |
+ |
+ if ((retransmission_settings & kRetransmitHigherLayers) && |
+ hdr_info_.temporalIdx > 0) { |
+ return kAllowRetransmission; |
} |
- return kAllowRetransmission; |
+ |
+ return kDontRetransmit; |
} |
std::string RtpPacketizerVp8::ToString() { |