Delete all logic related to VCMDecodeErrorMode
Bug: webrtc:8064
Change-Id: I345f342a314d88390fff8b305b121076b45a51e8
Reviewed-on: https://webrtc-review.googlesource.com/c/116692
Reviewed-by: Philip Eliasson <philipel@webrtc.org>
Reviewed-by: Erik Språng <sprang@webrtc.org>
Commit-Queue: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#26283}diff --git a/modules/video_coding/session_info.cc b/modules/video_coding/session_info.cc
index c37aaf7..d6b59be 100644
--- a/modules/video_coding/session_info.cc
+++ b/modules/video_coding/session_info.cc
@@ -36,7 +36,6 @@
VCMSessionInfo::VCMSessionInfo()
: complete_(false),
- decodable_(false),
frame_type_(kVideoFrameDelta),
packets_(),
empty_seq_num_low_(-1),
@@ -167,7 +166,6 @@
void VCMSessionInfo::Reset() {
complete_ = false;
- decodable_ = false;
frame_type_ = kVideoFrameDelta;
packets_.clear();
empty_seq_num_low_ = -1;
@@ -291,37 +289,10 @@
}
}
-void VCMSessionInfo::UpdateDecodableSession(const FrameData& frame_data) {
- // Irrelevant if session is already complete or decodable
- if (complete_ || decodable_)
- return;
- // TODO(agalusza): Account for bursty loss.
- // TODO(agalusza): Refine these values to better approximate optimal ones.
- // Do not decode frames if the RTT is lower than this.
- const int64_t kRttThreshold = 100;
- // Do not decode frames if the number of packets is between these two
- // thresholds.
- const float kLowPacketPercentageThreshold = 0.2f;
- const float kHighPacketPercentageThreshold = 0.8f;
- if (frame_data.rtt_ms < kRttThreshold || frame_type_ == kVideoFrameKey ||
- !HaveFirstPacket() ||
- (NumPackets() <= kHighPacketPercentageThreshold *
- frame_data.rolling_average_packets_per_frame &&
- NumPackets() > kLowPacketPercentageThreshold *
- frame_data.rolling_average_packets_per_frame))
- return;
-
- decodable_ = true;
-}
-
bool VCMSessionInfo::complete() const {
return complete_;
}
-bool VCMSessionInfo::decodable() const {
- return decodable_;
-}
-
// Find the end of the NAL unit which the packet pointed to by |packet_it|
// belongs to. Returns an iterator to the last packet of the frame if the end
// of the NAL unit wasn't found.
@@ -448,7 +419,6 @@
int VCMSessionInfo::InsertPacket(const VCMPacket& packet,
uint8_t* frame_buffer,
- VCMDecodeErrorMode decode_error_mode,
const FrameData& frame_data) {
if (packet.frameType == kEmptyFrame) {
// Update sequence number of an empty packet.
@@ -526,10 +496,7 @@
size_t returnLength = InsertBuffer(frame_buffer, packet_list_it);
UpdateCompleteSession();
- if (decode_error_mode == kWithErrors)
- decodable_ = true;
- else if (decode_error_mode == kSelectiveErrors)
- UpdateDecodableSession(frame_data);
+
return static_cast<int>(returnLength);
}