zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Delete all logic related to VCMDecodeErrorMode

Browse Source 
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}
This commit is contained in:
Niels Möller
2019-01-10 15:35:56 +01:00
committed by Commit Bot
parent 309aafe351
commit 375b346b30
17 changed files with 145 additions and 1011 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
modules/video_coding/frame_buffer.cc
View File

@ -80,7 +80,6 @@ bool VCMFrameBuffer::IsSessionComplete() const {
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 @@ VCMFrameBufferEnum VCMFrameBuffer::InsertPacket(
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 @@ VCMFrameBufferEnum VCMFrameBuffer::InsertPacket(
if (_sessionInfo.complete()) {
SetState(kStateComplete);
return kCompleteSession;
} else if (_sessionInfo.decodable()) {
SetState(kStateDecodable);
return kDecodableSession;
}
return kIncomplete;
}
@ -240,8 +235,7 @@ void VCMFrameBuffer::SetState(VCMFrameBufferStateEnum state) {
break;
case kStateComplete:
assert(_state == kStateEmpty || _state == kStateIncomplete ||
_state == kStateDecodable);
assert(_state == kStateEmpty || _state == kStateIncomplete);
break;
@ -249,10 +243,6 @@ void VCMFrameBuffer::SetState(VCMFrameBufferStateEnum state) {
// Should only be set to empty through Reset().
assert(false);
break;
case kStateDecodable:
assert(_state == kStateEmpty || _state == kStateIncomplete);
break;
}
_state = state;
}