5680d8199a
This reverts commit 01f91c81f7660be842fa44e96bf804a8b2402f47. Reason for revert: break downstream projects. Original change's description: > Add a FrameToRender argument struct as input to FrameToRender > > This is to make it easier to add new arguments to the method in the > future. We will remove the already existing method accordingly to WebRTCs deprecation rules. > > Bug: webrtc:358039777 > Change-Id: Id0706de5216fbd0182cac80ebfccfc4a6a055ee8 > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/364642 > Commit-Queue: Fanny Linderborg <linderborg@webrtc.org> > Reviewed-by: Erik Språng <sprang@webrtc.org> > Auto-Submit: Fanny Linderborg <linderborg@webrtc.org> > Cr-Commit-Position: refs/heads/main@{#43181} Bug: webrtc:358039777 Change-Id: Id59633023a428fb63aadeb266421b09040e590bb No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/364841 Owners-Override: Jeremy Leconte <jleconte@webrtc.org> Commit-Queue: Jeremy Leconte <jleconte@webrtc.org> Bot-Commit: rubber-stamper@appspot.gserviceaccount.com <rubber-stamper@appspot.gserviceaccount.com> Cr-Commit-Position: refs/heads/main@{#43184}
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,
|
|
std::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
|