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/frame_buffer.cc b/modules/video_coding/frame_buffer.cc
index 908a2a2..37709c9 100644
--- a/modules/video_coding/frame_buffer.cc
+++ b/modules/video_coding/frame_buffer.cc
@@ -80,7 +80,6 @@
VCMFrameBufferEnum VCMFrameBuffer::InsertPacket(
const VCMPacket& packet,
int64_t timeInMs,
- VCMDecodeErrorMode decode_error_mode,
const FrameData& frame_data) {
TRACE_EVENT0("webrtc", "VCMFrameBuffer::InsertPacket");
assert(!(NULL == packet.dataPtr && packet.sizeBytes > 0));
@@ -129,8 +128,7 @@
if (packet.sizeBytes > 0)
CopyCodecSpecific(&packet.video_header);
- int retVal =
- _sessionInfo.InsertPacket(packet, _buffer, decode_error_mode, frame_data);
+ int retVal = _sessionInfo.InsertPacket(packet, _buffer, frame_data);
if (retVal == -1) {
return kSizeError;
} else if (retVal == -2) {
@@ -182,9 +180,6 @@
if (_sessionInfo.complete()) {
SetState(kStateComplete);
return kCompleteSession;
- } else if (_sessionInfo.decodable()) {
- SetState(kStateDecodable);
- return kDecodableSession;
}
return kIncomplete;
}
@@ -240,8 +235,7 @@
break;
case kStateComplete:
- assert(_state == kStateEmpty || _state == kStateIncomplete ||
- _state == kStateDecodable);
+ assert(_state == kStateEmpty || _state == kStateIncomplete);
break;
@@ -249,10 +243,6 @@
// Should only be set to empty through Reset().
assert(false);
break;
-
- case kStateDecodable:
- assert(_state == kStateEmpty || _state == kStateIncomplete);
- break;
}
_state = state;
}