1c1a6815ae
This reverts commit 4b1a363e4c238f2e1ec2d8a9ce1f819f59d710ce. Reason for revert: Breaks dependent android projects. Original change's description: > Add fine grained dropped video frames counters on sending side > > 4 new counters added to SendStatisticsProxy and reported to UMA and logs. > > Bug: webrtc:8355 > Change-Id: Idf9b8dfc295c92821e058a97cb3894dc6a446082 > Reviewed-on: https://webrtc-review.googlesource.com/12260 > Commit-Queue: Ilya Nikolaevskiy <ilnik@webrtc.org> > Reviewed-by: Stefan Holmer <stefan@webrtc.org> > Reviewed-by: Erik Språng <sprang@webrtc.org> > Reviewed-by: Taylor Brandstetter <deadbeef@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#20347} TBR=deadbeef@webrtc.org,ilnik@webrtc.org,sprang@webrtc.org,stefan@webrtc.org # Not skipping CQ checks because original CL landed > 1 day ago. Bug: webrtc:8355 Change-Id: I59b02f4eb77abad7ff1fbcbfa61844918c95d723 Reviewed-on: https://webrtc-review.googlesource.com/14500 Reviewed-by: Ilya Nikolaevskiy <ilnik@webrtc.org> Commit-Queue: Ilya Nikolaevskiy <ilnik@webrtc.org> Cr-Commit-Position: refs/heads/master@{#20378}
69 lines
2.5 KiB
C++
69 lines
2.5 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_VIDEOBROADCASTER_H_
|
|
#define MEDIA_BASE_VIDEOBROADCASTER_H_
|
|
|
|
#include <memory>
|
|
#include <utility>
|
|
#include <vector>
|
|
|
|
#include "api/video/video_frame.h"
|
|
#include "media/base/videosinkinterface.h"
|
|
#include "media/base/videosourcebase.h"
|
|
#include "rtc_base/criticalsection.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.
|
|
// Sinks must be added and removed on one and only one thread.
|
|
// Video frames can be broadcasted on any thread. I.e VideoBroadcaster::OnFrame
|
|
// can be called on any thread.
|
|
class VideoBroadcaster : public VideoSourceBase,
|
|
public VideoSinkInterface<webrtc::VideoFrame> {
|
|
public:
|
|
VideoBroadcaster();
|
|
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;
|
|
|
|
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_);
|
|
|
|
ThreadChecker thread_checker_;
|
|
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_VIDEOBROADCASTER_H_
|