mirror of
https://github.com/mollyim/webrtc.git
synced 2025-05-13 13:50:40 +01:00
fc5d2762f5
There's been reports of dropped frames that are not counted and correctly reported by getStats(). If a HW decoder is used and the system is provoked by stressing the system, I've been able to reproduce this problem. It turns out that we've missed frames that are dropped because there is no callback to the Decoded() function. This CL restructures the code so that dropped frames are counted even in cases where there's no corresponding callback for some frames. Bug: webrtc:11229 Change-Id: I0216edba3733399c188649908d459ee86a9093d0 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/214783 Commit-Queue: Johannes Kron <kron@webrtc.org> Reviewed-by: Ilya Nikolaevskiy <ilnik@webrtc.org> Cr-Commit-Position: refs/heads/master@{#33671}
79 lines
2.5 KiB
C++
79 lines
2.5 KiB
C++
/*
|
|
* Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
#include "modules/video_coding/timestamp_map.h"
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include "modules/include/module_common_types_public.h"
|
|
|
|
namespace webrtc {
|
|
|
|
VCMTimestampMap::VCMTimestampMap(size_t capacity)
|
|
: ring_buffer_(new TimestampDataTuple[capacity]),
|
|
capacity_(capacity),
|
|
next_add_idx_(0),
|
|
next_pop_idx_(0) {}
|
|
|
|
VCMTimestampMap::~VCMTimestampMap() {}
|
|
|
|
void VCMTimestampMap::Add(uint32_t timestamp, const VCMFrameInformation& data) {
|
|
ring_buffer_[next_add_idx_].timestamp = timestamp;
|
|
ring_buffer_[next_add_idx_].data = data;
|
|
next_add_idx_ = (next_add_idx_ + 1) % capacity_;
|
|
|
|
if (next_add_idx_ == next_pop_idx_) {
|
|
// Circular list full; forget oldest entry.
|
|
next_pop_idx_ = (next_pop_idx_ + 1) % capacity_;
|
|
}
|
|
}
|
|
|
|
absl::optional<VCMFrameInformation> VCMTimestampMap::Pop(uint32_t timestamp) {
|
|
while (!IsEmpty()) {
|
|
if (ring_buffer_[next_pop_idx_].timestamp == timestamp) {
|
|
// Found start time for this timestamp.
|
|
const VCMFrameInformation& data = ring_buffer_[next_pop_idx_].data;
|
|
ring_buffer_[next_pop_idx_].timestamp = 0;
|
|
next_pop_idx_ = (next_pop_idx_ + 1) % capacity_;
|
|
return data;
|
|
} else if (IsNewerTimestamp(ring_buffer_[next_pop_idx_].timestamp,
|
|
timestamp)) {
|
|
// The timestamp we are looking for is not in the list.
|
|
return absl::nullopt;
|
|
}
|
|
|
|
// Not in this position, check next (and forget this position).
|
|
next_pop_idx_ = (next_pop_idx_ + 1) % capacity_;
|
|
}
|
|
|
|
// Could not find matching timestamp in list.
|
|
return absl::nullopt;
|
|
}
|
|
|
|
bool VCMTimestampMap::IsEmpty() const {
|
|
return (next_add_idx_ == next_pop_idx_);
|
|
}
|
|
|
|
size_t VCMTimestampMap::Size() const {
|
|
// The maximum number of elements in the list is |capacity_| - 1. The list is
|
|
// empty if the add and pop indices are equal.
|
|
return next_add_idx_ >= next_pop_idx_
|
|
? next_add_idx_ - next_pop_idx_
|
|
: next_add_idx_ + capacity_ - next_pop_idx_;
|
|
}
|
|
|
|
void VCMTimestampMap::Clear() {
|
|
while (!IsEmpty()) {
|
|
ring_buffer_[next_pop_idx_].timestamp = 0;
|
|
next_pop_idx_ = (next_pop_idx_ + 1) % capacity_;
|
|
}
|
|
}
|
|
|
|
} // namespace webrtc
|