mirror of
https://github.com/mollyim/webrtc.git
synced 2025-05-13 22:00:47 +01:00
b6b782da68
The access to |_timestampMap| was guarded by a lock but not the access to the data pointer stored in |_timestampMap|. There was a potential race condition if new data was added in VCMGenericDecoder::Decode() while the data pointer retrieved from _timestampMap.Pop() was being used in VCMDecodedFrameCallback::Decoded(). This CL moves the storage of data to within |_timestampMap|, instead of being a pointer so that it's guarded by the same lock. Bug: webrtc:11229 Change-Id: I3f2afb568ed724db5719d508a73de402c4531dec Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/209361 Commit-Queue: Johannes Kron <kron@webrtc.org> Reviewed-by: Ilya Nikolaevskiy <ilnik@webrtc.org> Cr-Commit-Position: refs/heads/master@{#33374}
62 lines
1.7 KiB
C++
62 lines
1.7 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.
|
|
*/
|
|
|
|
#ifndef MODULES_VIDEO_CODING_TIMESTAMP_MAP_H_
|
|
#define MODULES_VIDEO_CODING_TIMESTAMP_MAP_H_
|
|
|
|
#include <memory>
|
|
|
|
#include "absl/types/optional.h"
|
|
#include "api/rtp_packet_infos.h"
|
|
#include "api/units/timestamp.h"
|
|
#include "api/video/encoded_image.h"
|
|
#include "api/video/video_content_type.h"
|
|
#include "api/video/video_rotation.h"
|
|
#include "api/video/video_timing.h"
|
|
|
|
namespace webrtc {
|
|
|
|
struct VCMFrameInformation {
|
|
int64_t renderTimeMs;
|
|
absl::optional<Timestamp> decodeStart;
|
|
void* userData;
|
|
VideoRotation rotation;
|
|
VideoContentType content_type;
|
|
EncodedImage::Timing timing;
|
|
int64_t ntp_time_ms;
|
|
RtpPacketInfos packet_infos;
|
|
// ColorSpace is not stored here, as it might be modified by decoders.
|
|
};
|
|
|
|
class VCMTimestampMap {
|
|
public:
|
|
explicit VCMTimestampMap(size_t capacity);
|
|
~VCMTimestampMap();
|
|
|
|
void Add(uint32_t timestamp, const VCMFrameInformation& data);
|
|
absl::optional<VCMFrameInformation> Pop(uint32_t timestamp);
|
|
size_t Size() const;
|
|
|
|
private:
|
|
struct TimestampDataTuple {
|
|
uint32_t timestamp;
|
|
VCMFrameInformation data;
|
|
};
|
|
bool IsEmpty() const;
|
|
|
|
std::unique_ptr<TimestampDataTuple[]> ring_buffer_;
|
|
const size_t capacity_;
|
|
size_t next_add_idx_;
|
|
size_t next_pop_idx_;
|
|
};
|
|
|
|
} // namespace webrtc
|
|
|
|
#endif // MODULES_VIDEO_CODING_TIMESTAMP_MAP_H_
|