5165743926
This is a reland of commit 0e37f5ebd44183d9fe5318d844235aae28fda86a with backward compability added to allow downstream tests to migrate to the new signature. Original change's description: > Fix definition of keyframes decoded statistics > > which are defined to be measured after decoding, not before: > https://w3c.github.io/webrtc-stats/#dom-rtcinboundrtpstreamstats-keyframesdecoded > > BUG=webrtc:14728 > > Change-Id: I0a83dde278e1ebe8acf787bdac729af369a1ecf8 > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/315520 > Reviewed-by: Ilya Nikolaevskiy <ilnik@webrtc.org> > Commit-Queue: Philipp Hancke <phancke@microsoft.com> > Reviewed-by: Henrik Boström <hbos@webrtc.org> > Cr-Commit-Position: refs/heads/main@{#40545} BUG=webrtc:14728 Change-Id: I4cf52bb22ba8244155b4fa8c367b9c0306a77590 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/316120 Reviewed-by: Ilya Nikolaevskiy <ilnik@webrtc.org> Reviewed-by: Henrik Boström <hbos@webrtc.org> Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org> Commit-Queue: Philipp Hancke <phancke@microsoft.com> Cr-Commit-Position: refs/heads/main@{#40553}
72 lines
2.7 KiB
C++
72 lines
2.7 KiB
C++
/*
|
|
* Copyright (c) 2012 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 "video/video_stream_decoder2.h"
|
|
|
|
#include "api/video_codecs/video_decoder.h"
|
|
#include "modules/video_coding/video_receiver2.h"
|
|
#include "rtc_base/checks.h"
|
|
#include "video/receive_statistics_proxy.h"
|
|
|
|
namespace webrtc {
|
|
namespace internal {
|
|
|
|
VideoStreamDecoder::VideoStreamDecoder(
|
|
VideoReceiver2* video_receiver,
|
|
ReceiveStatisticsProxy* receive_statistics_proxy,
|
|
rtc::VideoSinkInterface<VideoFrame>* incoming_video_stream)
|
|
: video_receiver_(video_receiver),
|
|
receive_stats_callback_(receive_statistics_proxy),
|
|
incoming_video_stream_(incoming_video_stream) {
|
|
RTC_DCHECK(video_receiver_);
|
|
|
|
video_receiver_->RegisterReceiveCallback(this);
|
|
}
|
|
|
|
VideoStreamDecoder::~VideoStreamDecoder() {
|
|
// Note: There's an assumption at this point that the decoder thread is
|
|
// *not* running. If it was, then there could be a race for each of these
|
|
// callbacks.
|
|
|
|
// Unset all the callback pointers that we set in the ctor.
|
|
video_receiver_->RegisterReceiveCallback(nullptr);
|
|
}
|
|
|
|
// Do not acquire the lock of `video_receiver_` in this function. Decode
|
|
// callback won't necessarily be called from the decoding thread. The decoding
|
|
// thread may have held the lock when calling VideoDecoder::Decode, Reset, or
|
|
// Release. Acquiring the same lock in the path of decode callback can deadlock.
|
|
int32_t VideoStreamDecoder::FrameToRender(VideoFrame& video_frame,
|
|
absl::optional<uint8_t> qp,
|
|
TimeDelta decode_time,
|
|
VideoContentType content_type,
|
|
VideoFrameType frame_type) {
|
|
receive_stats_callback_->OnDecodedFrame(video_frame, qp, decode_time,
|
|
content_type, frame_type);
|
|
incoming_video_stream_->OnFrame(video_frame);
|
|
return 0;
|
|
}
|
|
|
|
void VideoStreamDecoder::OnDroppedFrames(uint32_t frames_dropped) {
|
|
receive_stats_callback_->OnDroppedFrames(frames_dropped);
|
|
}
|
|
|
|
void VideoStreamDecoder::OnIncomingPayloadType(int payload_type) {
|
|
receive_stats_callback_->OnIncomingPayloadType(payload_type);
|
|
}
|
|
|
|
void VideoStreamDecoder::OnDecoderInfoChanged(
|
|
const VideoDecoder::DecoderInfo& decoder_info) {
|
|
receive_stats_callback_->OnDecoderInfo(decoder_info);
|
|
}
|
|
|
|
} // namespace internal
|
|
} // namespace webrtc
|