c8474178d6
Reason for revert: There was a bug in the implementation where the adapter could get stuck at really low resolutions. That has now been fixed. Original issue's description: > Revert of Add ability to scale to arbitrary factors (patchset #7 id:120001 of https://codereview.webrtc.org/2555483005/ ) > > Reason for revert: > Issue discovered with scaling back up. > > Original issue's description: > > Add ability to scale to arbitrary factors > > > > This CL adds a fallback for the case when no optimized scale factor produces a low enough resolution for what was requested. It also ensures that all resolutions provided by the video adapter are divisible by four. This is required by some hardware implementations. > > > > BUG=webrtc:6837 > > > > Committed: https://crrev.com/710c335d785b104bda4a912bd7909e4d27f9b04f > > Cr-Commit-Position: refs/heads/master@{#15469} > > TBR=magjed@webrtc.org > # Skipping CQ checks because original CL landed less than 1 days ago. > NOPRESUBMIT=true > NOTREECHECKS=true > NOTRY=true > BUG=webrtc:6837 > > Committed: https://crrev.com/7722a4cc8d31e5e924e9e6c5c97412ce8bbbe59d > Cr-Commit-Position: refs/heads/master@{#15470} R=magjed@webrtc.org BUG=webrtc:6837,webrtc:6848 Review-Url: https://codereview.webrtc.org/2558243003 Cr-Commit-Position: refs/heads/master@{#15485}
85 lines
3.0 KiB
C++
85 lines
3.0 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:
|
|
// Allows derived classes to initialize |video_adapter_| with a custom
|
|
// alignment.
|
|
AdaptedVideoTrackSource(int required_alignment);
|
|
// 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_
|