3f89758398
Currently, webrtc::VideoEncoders are supposed to be deleted through the factory that created them with the WebRtcVideoEncoderFactory::DestroyVideoEncoder method. In practice, we sometimes use this method and sometimes we just call delete on the webrtc::VideoEncoder pointer. We want to be able to consistently use the normal destructor of webrtc::VideoEncoder instead of having to call DestroyVideoEncoder so that we can put webrtc::VideoEncoder inside an std::unique_ptr and make ownership more clear. As part of webrtc:7925 we also want to make a new encoder factory class that does not have the DestroyVideoEncoder() method, and this CL is a step in that direction. This CL introduces a helper function CreateScopedVideoEncoder that takes a webrtc::VideoEncoder and a WebRtcVideoEncoderFactory pointer, and returns a new webrtc::VideoEncoder instance that can be deleted through the regular destructor. This CL also removes WebRtcSimulcastEncoderFactory that almost only contains logic for handling the DestroyVideoEncoder calls that we no longer need, and inlines the rest of the logic inside the WebRtcVideoChannel::WebRtcVideoSendStream::CreateVideoEncoder method. BUG=webrtc:7925 Review-Url: https://codereview.webrtc.org/3007643002 Cr-Commit-Position: refs/heads/master@{#19564}
116 lines
4.2 KiB
C++
116 lines
4.2 KiB
C++
/*
|
|
* Copyright (c) 2014 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_SIMULCAST_ENCODER_ADAPTER_H_
|
|
#define WEBRTC_MEDIA_ENGINE_SIMULCAST_ENCODER_ADAPTER_H_
|
|
|
|
#include <memory>
|
|
#include <stack>
|
|
#include <string>
|
|
#include <utility>
|
|
#include <vector>
|
|
|
|
#include "webrtc/media/engine/webrtcvideoencoderfactory.h"
|
|
#include "webrtc/modules/video_coding/codecs/vp8/include/vp8.h"
|
|
#include "webrtc/rtc_base/atomicops.h"
|
|
#include "webrtc/rtc_base/sequenced_task_checker.h"
|
|
|
|
namespace webrtc {
|
|
|
|
class SimulcastRateAllocator;
|
|
|
|
// SimulcastEncoderAdapter implements simulcast support by creating multiple
|
|
// webrtc::VideoEncoder instances with the given VideoEncoderFactory.
|
|
// The object is created and destroyed on the worker thread, but all public
|
|
// interfaces should be called from the encoder task queue.
|
|
class SimulcastEncoderAdapter : public VP8Encoder {
|
|
public:
|
|
explicit SimulcastEncoderAdapter(cricket::WebRtcVideoEncoderFactory* factory);
|
|
virtual ~SimulcastEncoderAdapter();
|
|
|
|
// Implements VideoEncoder.
|
|
int Release() override;
|
|
int InitEncode(const VideoCodec* inst,
|
|
int number_of_cores,
|
|
size_t max_payload_size) override;
|
|
int Encode(const VideoFrame& input_image,
|
|
const CodecSpecificInfo* codec_specific_info,
|
|
const std::vector<FrameType>* frame_types) override;
|
|
int RegisterEncodeCompleteCallback(EncodedImageCallback* callback) override;
|
|
int SetChannelParameters(uint32_t packet_loss, int64_t rtt) override;
|
|
int SetRateAllocation(const BitrateAllocation& bitrate,
|
|
uint32_t new_framerate) override;
|
|
|
|
// Eventual handler for the contained encoders' EncodedImageCallbacks, but
|
|
// called from an internal helper that also knows the correct stream
|
|
// index.
|
|
EncodedImageCallback::Result OnEncodedImage(
|
|
size_t stream_idx,
|
|
const EncodedImage& encoded_image,
|
|
const CodecSpecificInfo* codec_specific_info,
|
|
const RTPFragmentationHeader* fragmentation);
|
|
|
|
VideoEncoder::ScalingSettings GetScalingSettings() const override;
|
|
|
|
bool SupportsNativeHandle() const override;
|
|
const char* ImplementationName() const override;
|
|
|
|
private:
|
|
struct StreamInfo {
|
|
StreamInfo(std::unique_ptr<VideoEncoder> encoder,
|
|
std::unique_ptr<EncodedImageCallback> callback,
|
|
uint16_t width,
|
|
uint16_t height,
|
|
bool send_stream)
|
|
: encoder(std::move(encoder)),
|
|
callback(std::move(callback)),
|
|
width(width),
|
|
height(height),
|
|
key_frame_request(false),
|
|
send_stream(send_stream) {}
|
|
std::unique_ptr<VideoEncoder> encoder;
|
|
std::unique_ptr<EncodedImageCallback> callback;
|
|
uint16_t width;
|
|
uint16_t height;
|
|
bool key_frame_request;
|
|
bool send_stream;
|
|
};
|
|
|
|
// Populate the codec settings for each simulcast stream.
|
|
static void PopulateStreamCodec(const webrtc::VideoCodec& inst,
|
|
int stream_index,
|
|
uint32_t start_bitrate_kbps,
|
|
bool highest_resolution_stream,
|
|
webrtc::VideoCodec* stream_codec);
|
|
|
|
bool Initialized() const;
|
|
|
|
void DestroyStoredEncoders();
|
|
|
|
volatile int inited_; // Accessed atomically.
|
|
cricket::WebRtcVideoEncoderFactory* const factory_;
|
|
VideoCodec codec_;
|
|
std::vector<StreamInfo> streaminfos_;
|
|
EncodedImageCallback* encoded_complete_callback_;
|
|
std::string implementation_name_;
|
|
|
|
// Used for checking the single-threaded access of the encoder interface.
|
|
rtc::SequencedTaskChecker encoder_queue_;
|
|
|
|
// Store encoders in between calls to Release and InitEncode, so they don't
|
|
// have to be recreated. Remaining encoders are destroyed by the destructor.
|
|
std::stack<std::unique_ptr<VideoEncoder>> stored_encoders_;
|
|
};
|
|
|
|
} // namespace webrtc
|
|
|
|
#endif // WEBRTC_MEDIA_ENGINE_SIMULCAST_ENCODER_ADAPTER_H_
|