mirror of
https://github.com/mollyim/webrtc.git
synced 2025-05-13 13:50:40 +01:00

This reverts commit0021fe7793
. Reason for revert: Broken on linux_tsan bot: https://ci.chromium.org/ui/p/webrtc/builders/ci/Linux%20Tsan%20v2/25329/overview Original change's description: > Reland "Enable quality scaling when allowed" > > This reverts commiteb449a979b
. > > Reason for revert: Added QP parsing in https://webrtc.googlesource.com/src/+/8639673f0c098efc294a7593fa3bd98e28ab7508 > > Original change's description: > Before this CL quality scaling was conditioned on scaling settings > provided by encoder. That should not be a requirement since encoder > may not be aware of quality scaling which is a WebRTC feature. In M90 > chromium HW encoders do not provide scaling settings (chromium:1179020). > The default scaling settings provided by these encoders are not correct > (b/181537172). > > This CL adds is_quality_scaling_allowed to VideoEncoderConfig. The flag > is set to true in singlecast with normal video feed (not screen sharing) > mode. If quality scaling is allowed it is enabled no matter whether > scaling settings are present in encoder info or not. Setting from > QualityScalingExperiment are used in case if not provided by encoder. > > Bug: chromium:1179020 > Bug: webrtc:12511 > Change-Id: I97911fde9005ec25028a640a3f007d12f2bbc2e5 > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/211349 > Reviewed-by: Rasmus Brandt <brandtr@webrtc.org> > Reviewed-by: Ilya Nikolaevskiy <ilnik@webrtc.org> > Commit-Queue: Sergey Silkin <ssilkin@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#33438} TBR=brandtr@webrtc.org,ilnik@webrtc.org,ssilkin@webrtc.org,rubber-stamper@appspot.gserviceaccount.com Change-Id: Id7633a1e98f95762e81487887f83a0c35f89195c No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: chromium:1179020 Bug: webrtc:12511 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/211352 Reviewed-by: Ilya Nikolaevskiy <ilnik@webrtc.org> Commit-Queue: Ilya Nikolaevskiy <ilnik@webrtc.org> Cr-Commit-Position: refs/heads/master@{#33439}
192 lines
6.4 KiB
C++
192 lines
6.4 KiB
C++
/*
|
|
* Copyright (c) 2013 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_CODECS_VIDEO_ENCODER_CONFIG_H_
|
|
#define API_VIDEO_CODECS_VIDEO_ENCODER_CONFIG_H_
|
|
|
|
#include <stddef.h>
|
|
|
|
#include <string>
|
|
#include <vector>
|
|
|
|
#include "absl/types/optional.h"
|
|
#include "api/scoped_refptr.h"
|
|
#include "api/video_codecs/sdp_video_format.h"
|
|
#include "api/video_codecs/video_codec.h"
|
|
#include "rtc_base/ref_count.h"
|
|
|
|
namespace webrtc {
|
|
|
|
// The |VideoStream| struct describes a simulcast layer, or "stream".
|
|
struct VideoStream {
|
|
VideoStream();
|
|
~VideoStream();
|
|
VideoStream(const VideoStream& other);
|
|
std::string ToString() const;
|
|
|
|
// Width in pixels.
|
|
size_t width;
|
|
|
|
// Height in pixels.
|
|
size_t height;
|
|
|
|
// Frame rate in fps.
|
|
int max_framerate;
|
|
|
|
// Bitrate, in bps, for the stream.
|
|
int min_bitrate_bps;
|
|
int target_bitrate_bps;
|
|
int max_bitrate_bps;
|
|
|
|
// Scaling factor applied to the stream size.
|
|
// |width| and |height| values are already scaled down.
|
|
double scale_resolution_down_by;
|
|
|
|
// Maximum Quantization Parameter to use when encoding the stream.
|
|
int max_qp;
|
|
|
|
// Determines the number of temporal layers that the stream should be
|
|
// encoded with. This value should be greater than zero.
|
|
// TODO(brandtr): This class is used both for configuring the encoder
|
|
// (meaning that this field _must_ be set), and for signaling the app-level
|
|
// encoder settings (meaning that the field _may_ be set). We should separate
|
|
// this and remove this optional instead.
|
|
absl::optional<size_t> num_temporal_layers;
|
|
|
|
// The priority of this stream, to be used when allocating resources
|
|
// between multiple streams.
|
|
absl::optional<double> bitrate_priority;
|
|
|
|
absl::optional<std::string> scalability_mode;
|
|
|
|
// If this stream is enabled by the user, or not.
|
|
bool active;
|
|
};
|
|
|
|
class VideoEncoderConfig {
|
|
public:
|
|
// These are reference counted to permit copying VideoEncoderConfig and be
|
|
// kept alive until all encoder_specific_settings go out of scope.
|
|
// TODO(kthelgason): Consider removing the need for copying VideoEncoderConfig
|
|
// and use absl::optional for encoder_specific_settings instead.
|
|
class EncoderSpecificSettings : public rtc::RefCountInterface {
|
|
public:
|
|
// TODO(pbos): Remove FillEncoderSpecificSettings as soon as VideoCodec is
|
|
// not in use and encoder implementations ask for codec-specific structs
|
|
// directly.
|
|
void FillEncoderSpecificSettings(VideoCodec* codec_struct) const;
|
|
|
|
virtual void FillVideoCodecVp8(VideoCodecVP8* vp8_settings) const;
|
|
virtual void FillVideoCodecVp9(VideoCodecVP9* vp9_settings) const;
|
|
virtual void FillVideoCodecH264(VideoCodecH264* h264_settings) const;
|
|
|
|
private:
|
|
~EncoderSpecificSettings() override {}
|
|
friend class VideoEncoderConfig;
|
|
};
|
|
|
|
class H264EncoderSpecificSettings : public EncoderSpecificSettings {
|
|
public:
|
|
explicit H264EncoderSpecificSettings(const VideoCodecH264& specifics);
|
|
void FillVideoCodecH264(VideoCodecH264* h264_settings) const override;
|
|
|
|
private:
|
|
VideoCodecH264 specifics_;
|
|
};
|
|
|
|
class Vp8EncoderSpecificSettings : public EncoderSpecificSettings {
|
|
public:
|
|
explicit Vp8EncoderSpecificSettings(const VideoCodecVP8& specifics);
|
|
void FillVideoCodecVp8(VideoCodecVP8* vp8_settings) const override;
|
|
|
|
private:
|
|
VideoCodecVP8 specifics_;
|
|
};
|
|
|
|
class Vp9EncoderSpecificSettings : public EncoderSpecificSettings {
|
|
public:
|
|
explicit Vp9EncoderSpecificSettings(const VideoCodecVP9& specifics);
|
|
void FillVideoCodecVp9(VideoCodecVP9* vp9_settings) const override;
|
|
|
|
private:
|
|
VideoCodecVP9 specifics_;
|
|
};
|
|
|
|
enum class ContentType {
|
|
kRealtimeVideo,
|
|
kScreen,
|
|
};
|
|
|
|
class VideoStreamFactoryInterface : public rtc::RefCountInterface {
|
|
public:
|
|
// An implementation should return a std::vector<VideoStream> with the
|
|
// wanted VideoStream settings for the given video resolution.
|
|
// The size of the vector may not be larger than
|
|
// |encoder_config.number_of_streams|.
|
|
virtual std::vector<VideoStream> CreateEncoderStreams(
|
|
int width,
|
|
int height,
|
|
const VideoEncoderConfig& encoder_config) = 0;
|
|
|
|
protected:
|
|
~VideoStreamFactoryInterface() override {}
|
|
};
|
|
|
|
VideoEncoderConfig& operator=(VideoEncoderConfig&&) = default;
|
|
VideoEncoderConfig& operator=(const VideoEncoderConfig&) = delete;
|
|
|
|
// Mostly used by tests. Avoid creating copies if you can.
|
|
VideoEncoderConfig Copy() const { return VideoEncoderConfig(*this); }
|
|
|
|
VideoEncoderConfig();
|
|
VideoEncoderConfig(VideoEncoderConfig&&);
|
|
~VideoEncoderConfig();
|
|
std::string ToString() const;
|
|
|
|
// TODO(nisse): Consolidate on one of these.
|
|
VideoCodecType codec_type;
|
|
SdpVideoFormat video_format;
|
|
|
|
rtc::scoped_refptr<VideoStreamFactoryInterface> video_stream_factory;
|
|
std::vector<SpatialLayer> spatial_layers;
|
|
ContentType content_type;
|
|
rtc::scoped_refptr<const EncoderSpecificSettings> encoder_specific_settings;
|
|
|
|
// Padding will be used up to this bitrate regardless of the bitrate produced
|
|
// by the encoder. Padding above what's actually produced by the encoder helps
|
|
// maintaining a higher bitrate estimate. Padding will however not be sent
|
|
// unless the estimated bandwidth indicates that the link can handle it.
|
|
int min_transmit_bitrate_bps;
|
|
int max_bitrate_bps;
|
|
// The bitrate priority used for all VideoStreams.
|
|
double bitrate_priority;
|
|
|
|
// The simulcast layer's configurations set by the application for this video
|
|
// sender. These are modified by the video_stream_factory before being passed
|
|
// down to lower layers for the video encoding.
|
|
// |simulcast_layers| is also used for configuring non-simulcast (when there
|
|
// is a single VideoStream).
|
|
std::vector<VideoStream> simulcast_layers;
|
|
|
|
// Max number of encoded VideoStreams to produce.
|
|
size_t number_of_streams;
|
|
|
|
// Legacy Google conference mode flag for simulcast screenshare
|
|
bool legacy_conference_mode;
|
|
|
|
private:
|
|
// Access to the copy constructor is private to force use of the Copy()
|
|
// method for those exceptional cases where we do use it.
|
|
VideoEncoderConfig(const VideoEncoderConfig&);
|
|
};
|
|
|
|
} // namespace webrtc
|
|
|
|
#endif // API_VIDEO_CODECS_VIDEO_ENCODER_CONFIG_H_
|