825e4f19ce
The `requested_resolution` API must not change aspect ratio, example: - Frame is 60x30 - Requested is 30x30 - We expect 30x15 (not 30x30!) as to maintain aspect ratio. This bug was previously fixed by making VideoAdapter unaware of the requested resolution behind a flag: this seemed OK since the VideoStreamEncoder ultimately decides the resolution, whether or not the incoming frame is adapted. But this is not desired for some non-Chrome use cases. This CL attempts to make both Chrome and non-Chrome use cases happy by implementing the aspect ratio preserving restriction inside VideoAdapter too. This allows us to get rid of the "use_standard_requested_resolution" flag and change the "VideoStreamEncoderResolutionTest" TEST_P to TEST_F. Bug: webrtc:366067962, webrtc:366284861 Change-Id: I1dfd10963274c5fdfd18d0f4443b2f209d2e9a4b Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/362720 Reviewed-by: Jonas Oreland <jonaso@webrtc.org> Commit-Queue: Henrik Boström <hbos@webrtc.org> Reviewed-by: Ilya Nikolaevskiy <ilnik@webrtc.org> Reviewed-by: Henrik Andreassson <henrika@webrtc.org> Cr-Commit-Position: refs/heads/main@{#43037}
65 lines
2.3 KiB
C++
65 lines
2.3 KiB
C++
/*
|
|
* Copyright (c) 2018 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 API_VIDEO_VIDEO_STREAM_ENCODER_SETTINGS_H_
|
|
#define API_VIDEO_VIDEO_STREAM_ENCODER_SETTINGS_H_
|
|
|
|
|
|
#include "api/video/video_bitrate_allocator_factory.h"
|
|
#include "api/video_codecs/sdp_video_format.h"
|
|
#include "api/video_codecs/video_encoder.h"
|
|
#include "api/video_codecs/video_encoder_factory.h"
|
|
|
|
namespace webrtc {
|
|
|
|
class EncoderSwitchRequestCallback {
|
|
public:
|
|
virtual ~EncoderSwitchRequestCallback() {}
|
|
|
|
// Requests switch to next negotiated encoder.
|
|
virtual void RequestEncoderFallback() = 0;
|
|
|
|
// Requests switch to a specific encoder. If the encoder is not available and
|
|
// `allow_default_fallback` is `true` the default fallback is invoked.
|
|
virtual void RequestEncoderSwitch(const SdpVideoFormat& format,
|
|
bool allow_default_fallback) = 0;
|
|
};
|
|
|
|
struct VideoStreamEncoderSettings {
|
|
explicit VideoStreamEncoderSettings(
|
|
const VideoEncoder::Capabilities& capabilities)
|
|
: capabilities(capabilities) {}
|
|
|
|
// Enables the new method to estimate the cpu load from encoding, used for
|
|
// cpu adaptation.
|
|
bool experiment_cpu_load_estimator = false;
|
|
|
|
// Ownership stays with WebrtcVideoEngine (delegated from PeerConnection).
|
|
VideoEncoderFactory* encoder_factory = nullptr;
|
|
|
|
// Requests the WebRtcVideoChannel to perform a codec switch.
|
|
EncoderSwitchRequestCallback* encoder_switch_request_callback = nullptr;
|
|
|
|
// Ownership stays with WebrtcVideoEngine (delegated from PeerConnection).
|
|
VideoBitrateAllocatorFactory* bitrate_allocator_factory = nullptr;
|
|
|
|
// Negotiated capabilities which the VideoEncoder may expect the other
|
|
// side to use.
|
|
VideoEncoder::Capabilities capabilities;
|
|
|
|
// Enables the frame instrumentation generator that is required for automatic
|
|
// corruption detection.
|
|
bool enable_frame_instrumentation_generator = false;
|
|
};
|
|
|
|
} // namespace webrtc
|
|
|
|
#endif // API_VIDEO_VIDEO_STREAM_ENCODER_SETTINGS_H_
|