mirror of
https://github.com/mollyim/webrtc.git
synced 2025-05-16 07:10:38 +01:00
16994087d8
This CL moves IncomingVideoStream::NewFrameTask closer to where it's used and simplifies it somewhat. This makes it easier to follow the code when debugging etc. Bug: webrtc:9883 Change-Id: I359e2a5f4f2341259fd7e66a55c7a4b8bd9313ba Reviewed-on: https://webrtc-review.googlesource.com/c/114720 Reviewed-by: Magnus Jedvert <magjed@webrtc.org> Commit-Queue: Sebastian Jansson <srte@webrtc.org> Cr-Commit-Position: refs/heads/master@{#26041}
69 lines
2.3 KiB
C++
69 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 {
|
|
namespace {
|
|
const char kIncomingQueueName[] = "IncomingVideoStream";
|
|
}
|
|
|
|
IncomingVideoStream::IncomingVideoStream(
|
|
int32_t delay_ms,
|
|
rtc::VideoSinkInterface<VideoFrame>* callback)
|
|
: render_buffers_(delay_ms),
|
|
callback_(callback),
|
|
incoming_render_queue_(kIncomingQueueName,
|
|
rtc::TaskQueue::Priority::HIGH) {}
|
|
|
|
IncomingVideoStream::~IncomingVideoStream() {
|
|
RTC_DCHECK(main_thread_checker_.CalledOnValidThread());
|
|
}
|
|
|
|
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): This struct should be replaced by a lambda with move capture
|
|
// when C++14 lambdas are allowed.
|
|
struct NewFrameTask {
|
|
void operator()() {
|
|
RTC_DCHECK(stream->incoming_render_queue_.IsCurrent());
|
|
if (stream->render_buffers_.AddFrame(std::move(frame)) == 1)
|
|
stream->Dequeue();
|
|
}
|
|
IncomingVideoStream* stream;
|
|
VideoFrame frame;
|
|
};
|
|
incoming_render_queue_.PostTask(NewFrameTask{this, std::move(video_frame)});
|
|
}
|
|
|
|
void IncomingVideoStream::Dequeue() {
|
|
TRACE_EVENT0("webrtc", "IncomingVideoStream::Dequeue");
|
|
RTC_DCHECK(incoming_render_queue_.IsCurrent());
|
|
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_.PostDelayedTask([this]() { Dequeue(); }, wait_time);
|
|
}
|
|
}
|
|
|
|
} // namespace webrtc
|