429b67db1f
This reverts commit efa72a1312e9871c9b33b7a1fec208b379608898. Reason for revert: It seems to break come chromium.webrtc.fyi bots: They are all release. https://ci.chromium.org/p/chromium/builders/luci.chromium.webrtc.fyi/WebRTC%20Chromium%20FYI%20Linux%20Tester/2167 https://ci.chromium.org/p/chromium/builders/luci.chromium.webrtc.fyi/WebRTC%20Chromium%20FYI%20Mac%20Tester/1833 https://ci.chromium.org/p/chromium/builders/luci.chromium.webrtc.fyi/WebRTC%20Chromium%20FYI%20Win10%20Tester/1835 Original change's description: > Propagate VideoFrame::UpdateRect to encoder > > Accumulate it in all places where frames can be dropped before they reach > the encoder. > > Reset UpdateRect in VideoBroadcaster if frame the previous frame is dropped. > No accumulation is done here since it's supposed to be a brief occusion then > configuration have changed. > > Bug: webrtc:10310 > Change-Id: I2813ecd009eb730bd99ffa0a02f979091b56bf80 > Reviewed-on: https://webrtc-review.googlesource.com/c/123102 > Commit-Queue: Ilya Nikolaevskiy <ilnik@webrtc.org> > Reviewed-by: Niels Moller <nisse@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#26711} TBR=ilnik@webrtc.org,nisse@webrtc.org,sprang@webrtc.org Change-Id: If34b5440393fffba6c37cd80c02e2b419b7ec601 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:10310 Reviewed-on: https://webrtc-review.googlesource.com/c/123224 Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org> Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org> Cr-Commit-Position: refs/heads/master@{#26719}
68 lines
2.6 KiB
C++
68 lines
2.6 KiB
C++
/*
|
|
* Copyright (c) 2016 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 MEDIA_BASE_VIDEO_BROADCASTER_H_
|
|
#define MEDIA_BASE_VIDEO_BROADCASTER_H_
|
|
|
|
#include "api/scoped_refptr.h"
|
|
#include "api/video/video_frame_buffer.h"
|
|
#include "api/video/video_source_interface.h"
|
|
#include "media/base/video_source_base.h"
|
|
#include "rtc_base/critical_section.h"
|
|
#include "rtc_base/thread_annotations.h"
|
|
#include "rtc_base/thread_checker.h"
|
|
|
|
namespace rtc {
|
|
|
|
// VideoBroadcaster broadcast video frames to sinks and combines VideoSinkWants
|
|
// from its sinks. It does that by implementing rtc::VideoSourceInterface and
|
|
// rtc::VideoSinkInterface. The class is threadsafe; methods may be called on
|
|
// any thread. This is needed because VideoStreamEncoder calls AddOrUpdateSink
|
|
// both on the worker thread and on the encoder task queue.
|
|
class VideoBroadcaster : public VideoSourceBase,
|
|
public VideoSinkInterface<webrtc::VideoFrame> {
|
|
public:
|
|
VideoBroadcaster();
|
|
~VideoBroadcaster() override;
|
|
void AddOrUpdateSink(VideoSinkInterface<webrtc::VideoFrame>* sink,
|
|
const VideoSinkWants& wants) override;
|
|
void RemoveSink(VideoSinkInterface<webrtc::VideoFrame>* sink) override;
|
|
|
|
// Returns true if the next frame will be delivered to at least one sink.
|
|
bool frame_wanted() const;
|
|
|
|
// Returns VideoSinkWants a source is requested to fulfill. They are
|
|
// aggregated by all VideoSinkWants from all sinks.
|
|
VideoSinkWants wants() const;
|
|
|
|
// This method ensures that if a sink sets rotation_applied == true,
|
|
// it will never receive a frame with pending rotation. Our caller
|
|
// may pass in frames without precise synchronization with changes
|
|
// to the VideoSinkWants.
|
|
void OnFrame(const webrtc::VideoFrame& frame) override;
|
|
|
|
void OnDiscardedFrame() override;
|
|
|
|
protected:
|
|
void UpdateWants() RTC_EXCLUSIVE_LOCKS_REQUIRED(sinks_and_wants_lock_);
|
|
const rtc::scoped_refptr<webrtc::VideoFrameBuffer>& GetBlackFrameBuffer(
|
|
int width,
|
|
int height) RTC_EXCLUSIVE_LOCKS_REQUIRED(sinks_and_wants_lock_);
|
|
|
|
rtc::CriticalSection sinks_and_wants_lock_;
|
|
|
|
VideoSinkWants current_wants_ RTC_GUARDED_BY(sinks_and_wants_lock_);
|
|
rtc::scoped_refptr<webrtc::VideoFrameBuffer> black_frame_buffer_;
|
|
};
|
|
|
|
} // namespace rtc
|
|
|
|
#endif // MEDIA_BASE_VIDEO_BROADCASTER_H_
|