08127a9449
This is yet another reland of https://codereview.webrtc.org/2434073003/ including two fixes: 1. SimulcastRateAllocator did not handle the screenshare settings properly for numSimulcastStreams = 1. Additional test case was added for that. 2. In VideoSender, when rate allocation is updated after setting a new VideoCodec config, only update the state of the EncoderParameters, but don't actually run SetRateAllocation on the encoder itself. This caused some problems upstreams. Please review only the changes after patch set 1. Original description: Extract bitrate allocation of spatial/temporal layers out of codec impl. This CL makes a number of intervowen changes: * Add BitrateAllocation struct, that contains a codec independent view of how the target bitrate is distributed over spatial and temporal layers. * Adds the BitrateAllocator interface, which takes a bitrate and frame rate and produces a BitrateAllocation. * A default (non layered) implementation is added, and SimulcastRateAllocator is extended to fully handle VP8 allocation. This includes capturing TemporalLayer instances created by the encoder. * ViEEncoder now owns both the bitrate allocator and the temporal layer factories for VP8. This allows allocation to happen fully outside of the encoder implementation. This refactoring will make it possible for ViEEncoder to signal the full picture of target bitrates to the RTCP module. BUG=webrtc:6301 R=stefan@webrtc.org Review URL: https://codereview.webrtc.org/2510583002 . Cr-Commit-Position: refs/heads/master@{#15105}
77 lines
2.6 KiB
C++
77 lines
2.6 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_ENGINE_VIDEOENCODERSOFTWAREFALLBACKWRAPPER_H_
|
|
#define WEBRTC_MEDIA_ENGINE_VIDEOENCODERSOFTWAREFALLBACKWRAPPER_H_
|
|
|
|
#include <memory>
|
|
#include <string>
|
|
#include <vector>
|
|
|
|
#include "webrtc/video_encoder.h"
|
|
|
|
namespace webrtc {
|
|
|
|
// Class used to wrap external VideoEncoders to provide a fallback option on
|
|
// software encoding when a hardware encoder fails to encode a stream due to
|
|
// hardware restrictions, such as max resolution.
|
|
class VideoEncoderSoftwareFallbackWrapper : public VideoEncoder {
|
|
public:
|
|
VideoEncoderSoftwareFallbackWrapper(VideoCodecType codec_type,
|
|
webrtc::VideoEncoder* encoder);
|
|
|
|
int32_t InitEncode(const VideoCodec* codec_settings,
|
|
int32_t number_of_cores,
|
|
size_t max_payload_size) override;
|
|
|
|
int32_t RegisterEncodeCompleteCallback(
|
|
EncodedImageCallback* callback) override;
|
|
|
|
int32_t Release() override;
|
|
int32_t Encode(const VideoFrame& frame,
|
|
const CodecSpecificInfo* codec_specific_info,
|
|
const std::vector<FrameType>* frame_types) override;
|
|
int32_t SetChannelParameters(uint32_t packet_loss, int64_t rtt) override;
|
|
int32_t SetRateAllocation(const BitrateAllocation& bitrate_allocation,
|
|
uint32_t framerate) override;
|
|
void OnDroppedFrame() override;
|
|
bool SupportsNativeHandle() const override;
|
|
|
|
private:
|
|
bool InitFallbackEncoder();
|
|
|
|
// Settings used in the last InitEncode call and used if a dynamic fallback to
|
|
// software is required.
|
|
VideoCodec codec_settings_;
|
|
int32_t number_of_cores_;
|
|
size_t max_payload_size_;
|
|
|
|
// The last bitrate/framerate set, and a flag for noting they are set.
|
|
bool rates_set_;
|
|
BitrateAllocation bitrate_allocation_;
|
|
uint32_t framerate_;
|
|
|
|
// The last channel parameters set, and a flag for noting they are set.
|
|
bool channel_parameters_set_;
|
|
uint32_t packet_loss_;
|
|
int64_t rtt_;
|
|
|
|
const EncoderType encoder_type_;
|
|
webrtc::VideoEncoder* const encoder_;
|
|
|
|
std::unique_ptr<webrtc::VideoEncoder> fallback_encoder_;
|
|
std::string fallback_implementation_name_;
|
|
EncodedImageCallback* callback_;
|
|
};
|
|
|
|
} // namespace webrtc
|
|
|
|
#endif // WEBRTC_MEDIA_ENGINE_VIDEOENCODERSOFTWAREFALLBACKWRAPPER_H_
|