Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(56)

Unified Diff: webrtc/media/engine/scopedvideoencoder.cc

Issue 3007643002: Clean up ownership of webrtc::VideoEncoder (Closed)
Patch Set: Fix Created 3 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/media/engine/scopedvideoencoder.h ('k') | webrtc/media/engine/simulcast_encoder_adapter.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/media/engine/scopedvideoencoder.cc
diff --git a/webrtc/media/engine/scopedvideoencoder.cc b/webrtc/media/engine/scopedvideoencoder.cc
new file mode 100644
index 0000000000000000000000000000000000000000..0c07d8cd0c1fe9350904ad97c32371ab6b35506e
--- /dev/null
+++ b/webrtc/media/engine/scopedvideoencoder.cc
@@ -0,0 +1,126 @@
+/*
+ * Copyright (c) 2017 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.
+ */
+
+#include "webrtc/media/engine/scopedvideoencoder.h"
+
+#include <vector>
+
+#include "webrtc/api/video_codecs/video_encoder.h"
+
+namespace cricket {
+
+namespace {
+
+class ScopedVideoEncoder : public webrtc::VideoEncoder {
+ public:
+ ScopedVideoEncoder(WebRtcVideoEncoderFactory* factory,
+ webrtc::VideoEncoder* encoder);
+
+ int32_t InitEncode(const webrtc::VideoCodec* codec_settings,
+ int32_t number_of_cores,
+ size_t max_payload_size) override;
+ int32_t RegisterEncodeCompleteCallback(
+ webrtc::EncodedImageCallback* callback) override;
+ int32_t Release() override;
+ int32_t Encode(const webrtc::VideoFrame& frame,
+ const webrtc::CodecSpecificInfo* codec_specific_info,
+ const std::vector<webrtc::FrameType>* frame_types) override;
+ int32_t SetChannelParameters(uint32_t packet_loss, int64_t rtt) override;
+ int32_t SetRates(uint32_t bitrate, uint32_t framerate) override;
+ int32_t SetRateAllocation(const webrtc::BitrateAllocation& allocation,
+ uint32_t framerate) override;
+ ScalingSettings GetScalingSettings() const override;
+ int32_t SetPeriodicKeyFrames(bool enable) override;
+ bool SupportsNativeHandle() const override;
+ const char* ImplementationName() const override;
+
+ ~ScopedVideoEncoder() override;
+
+ private:
+ WebRtcVideoEncoderFactory* factory_;
+ webrtc::VideoEncoder* encoder_;
+};
+
+ScopedVideoEncoder::ScopedVideoEncoder(WebRtcVideoEncoderFactory* factory,
+ webrtc::VideoEncoder* encoder)
+ : factory_(factory), encoder_(encoder) {}
+
+int32_t ScopedVideoEncoder::InitEncode(const webrtc::VideoCodec* codec_settings,
+ int32_t number_of_cores,
+ size_t max_payload_size) {
+ return encoder_->InitEncode(codec_settings, number_of_cores,
+ max_payload_size);
+}
+
+int32_t ScopedVideoEncoder::RegisterEncodeCompleteCallback(
+ webrtc::EncodedImageCallback* callback) {
+ return encoder_->RegisterEncodeCompleteCallback(callback);
+}
+
+int32_t ScopedVideoEncoder::Release() {
+ return encoder_->Release();
+}
+
+int32_t ScopedVideoEncoder::Encode(
+ const webrtc::VideoFrame& frame,
+ const webrtc::CodecSpecificInfo* codec_specific_info,
+ const std::vector<webrtc::FrameType>* frame_types) {
+ return encoder_->Encode(frame, codec_specific_info, frame_types);
+}
+
+int32_t ScopedVideoEncoder::SetChannelParameters(uint32_t packet_loss,
+ int64_t rtt) {
+ return encoder_->SetChannelParameters(packet_loss, rtt);
+}
+
+int32_t ScopedVideoEncoder::SetRates(uint32_t bitrate, uint32_t framerate) {
+ return encoder_->SetRates(bitrate, framerate);
+}
+
+int32_t ScopedVideoEncoder::SetRateAllocation(
+ const webrtc::BitrateAllocation& allocation,
+ uint32_t framerate) {
+ return encoder_->SetRateAllocation(allocation, framerate);
+}
+
+webrtc::VideoEncoder::ScalingSettings ScopedVideoEncoder::GetScalingSettings()
+ const {
+ return encoder_->GetScalingSettings();
+}
+
+int32_t ScopedVideoEncoder::SetPeriodicKeyFrames(bool enable) {
+ return encoder_->SetPeriodicKeyFrames(enable);
+}
+
+bool ScopedVideoEncoder::SupportsNativeHandle() const {
+ return encoder_->SupportsNativeHandle();
+}
+
+const char* ScopedVideoEncoder::ImplementationName() const {
+ return encoder_->ImplementationName();
+}
+
+ScopedVideoEncoder::~ScopedVideoEncoder() {
+ factory_->DestroyVideoEncoder(encoder_);
+}
+
+} // namespace
+
+std::unique_ptr<webrtc::VideoEncoder> CreateScopedVideoEncoder(
+ WebRtcVideoEncoderFactory* factory,
+ const VideoCodec& codec) {
+ webrtc::VideoEncoder* encoder = factory->CreateVideoEncoder(codec);
+ if (!encoder)
+ return nullptr;
+ return std::unique_ptr<webrtc::VideoEncoder>(
+ new ScopedVideoEncoder(factory, encoder));
+}
+
+} // namespace cricket
« no previous file with comments | « webrtc/media/engine/scopedvideoencoder.h ('k') | webrtc/media/engine/simulcast_encoder_adapter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698