In this CL: - Added WEBRTC_VIDEO_CODEC_ENCODER_FAILURE return code that can be returned by the encoder wrapper in case of a broken encoder. - Added EncoderFailureCallback interface that can be called to request encoder fallback to be performed. Implemented by WebRtcVideoChannel and called from the VideoStreamEncoder. - Updated SelectSendVideoCodec to select all compatible codecs instead of just one. Bug: webrtc:10795 Change-Id: I87a83fd02e48c40493c930471c06c3d0941031ab Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/140888 Commit-Queue: Philip Eliasson <philipel@webrtc.org> Reviewed-by: Magnus Jedvert <magjed@webrtc.org> Reviewed-by: Erik Språng <sprang@webrtc.org> Cr-Commit-Position: refs/heads/master@{#28462}
52 lines
1.7 KiB
C++
52 lines
1.7 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/video_encoder.h"
|
|
#include "api/video_codecs/video_encoder_factory.h"
|
|
|
|
namespace webrtc {
|
|
|
|
class EncoderFailureCallback {
|
|
public:
|
|
virtual ~EncoderFailureCallback() {}
|
|
virtual void OnEncoderFailure() = 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;
|
|
|
|
// Notifies the WebRtcVideoChannel that the currently used encoder is broken.
|
|
EncoderFailureCallback* encoder_failure_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;
|
|
};
|
|
|
|
} // namespace webrtc
|
|
|
|
#endif // API_VIDEO_VIDEO_STREAM_ENCODER_SETTINGS_H_
|