9a665402d7
This reverts commit 4cd3a0d082d0b9d44fd78eef3d53d4360e99a674. Reason for revert: Downstream build should be fixed. Original change's description: > Revert "TaskQueue: unexpose delayed task convenience methods." > > This reverts commit 08bb6295ea1f438a26f8c1ab01769cfa63943756. > > Reason for revert: Breaks downstream tests > > Original change's description: > > TaskQueue: unexpose delayed task convenience methods. > > > > Bug: webrtc:14165 > > Change-Id: Ieb8580670e9e521580afd68cca6ff631fb6df3f8 > > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/265400 > > Reviewed-by: Harald Alvestrand <hta@webrtc.org> > > Auto-Submit: Markus Handell <handellm@webrtc.org> > > Commit-Queue: Harald Alvestrand <hta@webrtc.org> > > Cr-Commit-Position: refs/heads/main@{#37166} > > Bug: webrtc:14165 > Change-Id: Ia7368cf205622be448ec0ead5d22f211aa071a29 > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/265411 > Bot-Commit: rubber-stamper@appspot.gserviceaccount.com <rubber-stamper@appspot.gserviceaccount.com> > Owners-Override: Björn Terelius <terelius@webrtc.org> > Auto-Submit: Björn Terelius <terelius@webrtc.org> > Commit-Queue: Björn Terelius <terelius@webrtc.org> > Cr-Commit-Position: refs/heads/main@{#37167} Bug: webrtc:14165 Change-Id: I3d963d272e8a1431103a5d5fb4568ccacd81119c Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/265395 Bot-Commit: rubber-stamper@appspot.gserviceaccount.com <rubber-stamper@appspot.gserviceaccount.com> Reviewed-by: Harald Alvestrand <hta@webrtc.org> Commit-Queue: Markus Handell <handellm@webrtc.org> Cr-Commit-Position: refs/heads/main@{#37186}
66 lines
2.3 KiB
C++
66 lines
2.3 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 "common_video/include/incoming_video_stream.h"
|
|
|
|
#include <memory>
|
|
#include <utility>
|
|
|
|
#include "absl/types/optional.h"
|
|
#include "common_video/video_render_frames.h"
|
|
#include "rtc_base/checks.h"
|
|
#include "rtc_base/trace_event.h"
|
|
|
|
namespace webrtc {
|
|
|
|
IncomingVideoStream::IncomingVideoStream(
|
|
TaskQueueFactory* task_queue_factory,
|
|
int32_t delay_ms,
|
|
rtc::VideoSinkInterface<VideoFrame>* callback)
|
|
: render_buffers_(delay_ms),
|
|
callback_(callback),
|
|
incoming_render_queue_(task_queue_factory->CreateTaskQueue(
|
|
"IncomingVideoStream",
|
|
TaskQueueFactory::Priority::HIGH)) {}
|
|
|
|
IncomingVideoStream::~IncomingVideoStream() {
|
|
RTC_DCHECK(main_thread_checker_.IsCurrent());
|
|
}
|
|
|
|
void IncomingVideoStream::OnFrame(const VideoFrame& video_frame) {
|
|
TRACE_EVENT0("webrtc", "IncomingVideoStream::OnFrame");
|
|
RTC_CHECK_RUNS_SERIALIZED(&decoder_race_checker_);
|
|
RTC_DCHECK(!incoming_render_queue_.IsCurrent());
|
|
// TODO(srte): Using video_frame = std::move(video_frame) would move the frame
|
|
// into the lambda instead of copying it, but it doesn't work unless we change
|
|
// OnFrame to take its frame argument by value instead of const reference.
|
|
incoming_render_queue_.PostTask([this, video_frame = video_frame]() mutable {
|
|
RTC_DCHECK_RUN_ON(&incoming_render_queue_);
|
|
if (render_buffers_.AddFrame(std::move(video_frame)) == 1)
|
|
Dequeue();
|
|
});
|
|
}
|
|
|
|
void IncomingVideoStream::Dequeue() {
|
|
TRACE_EVENT0("webrtc", "IncomingVideoStream::Dequeue");
|
|
RTC_DCHECK_RUN_ON(&incoming_render_queue_);
|
|
absl::optional<VideoFrame> frame_to_render = render_buffers_.FrameToRender();
|
|
if (frame_to_render)
|
|
callback_->OnFrame(*frame_to_render);
|
|
|
|
if (render_buffers_.HasPendingFrames()) {
|
|
uint32_t wait_time = render_buffers_.TimeToNextFrameRelease();
|
|
incoming_render_queue_.PostDelayedHighPrecisionTask(
|
|
ToQueuedTask([this]() { Dequeue(); }), wait_time);
|
|
}
|
|
}
|
|
|
|
} // namespace webrtc
|