acd935b540
Reason for revert: Relanding after known downstream breakages have been fixed. Original issue's description: > Revert of Delete all use of cricket::VideoFrame and cricket::WebRtcVideoFrame. (patchset #7 id:120001 of https://codereview.webrtc.org/2383093002/ ) > > Reason for revert: > Breaks chrome, see https://build.chromium.org/p/chromium.webrtc.fyi/builders/Mac%20Builder/builds/19019/steps/compile/logs/stdio > > Analysis: Chrome uses cricket::VideoFrame, without explicitly including webrtc/media/base/videoframe.h, and breaks when that file is no longer included by any other webrtc headers. Will reland after updating Chrome. > > Original issue's description: > > Delete all use of cricket::VideoFrame and cricket::WebRtcVideoFrame. > > > > Replaced with webrtc::VideoFrame. > > > > TBR=mflodman@webrtc.org > > BUG=webrtc:5682 > > > > Committed: https://crrev.com/45c8b8940042bd2574c39920804ade8343cefdba > > Cr-Commit-Position: refs/heads/master@{#14885} > > TBR=perkj@webrtc.org,pthatcher@webrtc.org,tkchin@webrtc.org,mflodman@webrtc.org,stefan@webrtc.org > # Skipping CQ checks because original CL landed less than 1 days ago. > NOPRESUBMIT=true > NOTREECHECKS=true > NOTRY=true > BUG=webrtc:5682 > > Committed: https://crrev.com/7341ab8e2505c9763d208e069bda269018357e7d > Cr-Commit-Position: refs/heads/master@{#14886} TBR=perkj@webrtc.org,pthatcher@webrtc.org,tkchin@webrtc.org,mflodman@webrtc.org,stefan@webrtc.org # Not skipping CQ checks because original CL landed more than 1 days ago. BUG=webrtc:5682 Review-Url: https://codereview.webrtc.org/2487633002 Cr-Commit-Position: refs/heads/master@{#15039}
82 lines
2.9 KiB
C++
82 lines
2.9 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 WEBRTC_MEDIA_BASE_ADAPTEDVIDEOTRACKSOURCE_H_
|
|
#define WEBRTC_MEDIA_BASE_ADAPTEDVIDEOTRACKSOURCE_H_
|
|
|
|
#include "webrtc/api/mediastreaminterface.h"
|
|
#include "webrtc/api/notifier.h"
|
|
#include "webrtc/media/base/videoadapter.h"
|
|
#include "webrtc/media/base/videobroadcaster.h"
|
|
|
|
namespace rtc {
|
|
|
|
// Base class for sources which needs video adaptation, e.g., video
|
|
// capture sources. Sinks must be added and removed on one and only
|
|
// one thread, while AdaptFrame and OnFrame may be called on any
|
|
// thread.
|
|
class AdaptedVideoTrackSource
|
|
: public webrtc::Notifier<webrtc::VideoTrackSourceInterface> {
|
|
public:
|
|
AdaptedVideoTrackSource();
|
|
|
|
protected:
|
|
// Checks the apply_rotation() flag. If the frame needs rotation, and it is a
|
|
// plain memory frame, it is rotated. Subclasses producing native frames must
|
|
// handle apply_rotation() themselves.
|
|
void OnFrame(const webrtc::VideoFrame& frame);
|
|
|
|
// Reports the appropriate frame size after adaptation. Returns true
|
|
// if a frame is wanted. Returns false if there are no interested
|
|
// sinks, or if the VideoAdapter decides to drop the frame.
|
|
bool AdaptFrame(int width,
|
|
int height,
|
|
int64_t time_us,
|
|
int* out_width,
|
|
int* out_height,
|
|
int* crop_width,
|
|
int* crop_height,
|
|
int* crop_x,
|
|
int* crop_y);
|
|
|
|
// Returns the current value of the apply_rotation flag, derived
|
|
// from the VideoSinkWants of registered sinks. The value is derived
|
|
// from sinks' wants, in AddOrUpdateSink and RemoveSink. Beware that
|
|
// when using this method from a different thread, the value may
|
|
// become stale before it is used.
|
|
bool apply_rotation();
|
|
|
|
cricket::VideoAdapter* video_adapter() { return &video_adapter_; }
|
|
|
|
private:
|
|
// Implements rtc::VideoSourceInterface.
|
|
void AddOrUpdateSink(rtc::VideoSinkInterface<webrtc::VideoFrame>* sink,
|
|
const rtc::VideoSinkWants& wants) override;
|
|
void RemoveSink(rtc::VideoSinkInterface<webrtc::VideoFrame>* sink) override;
|
|
|
|
// Part of VideoTrackSourceInterface.
|
|
bool GetStats(Stats* stats) override;
|
|
|
|
void OnSinkWantsChanged(const rtc::VideoSinkWants& wants);
|
|
|
|
rtc::ThreadChecker thread_checker_;
|
|
|
|
cricket::VideoAdapter video_adapter_;
|
|
|
|
rtc::CriticalSection stats_crit_;
|
|
rtc::Optional<Stats> stats_ GUARDED_BY(stats_crit_);
|
|
|
|
VideoBroadcaster broadcaster_;
|
|
};
|
|
|
|
} // namespace rtc
|
|
|
|
#endif // WEBRTC_MEDIA_BASE_ADAPTEDVIDEOTRACKSOURCE_H_
|