Let VideoEncoderSoftwareFallbackWrapper own the wrapped encoder

webrtc/media/engine/videoencodersoftwarefallbackwrapper.h

 /*
  *  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/api/video_codecs/video_encoder.h"
 #include "webrtc/media/base/codec.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(const cricket::VideoCodec& codec,
-                                      webrtc::VideoEncoder* encoder);
+  VideoEncoderSoftwareFallbackWrapper(
+      const cricket::VideoCodec& codec,
+      std::unique_ptr<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,
@@ skipping 49 matching lines @@
   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_;
 
   cricket::VideoCodec codec_;
-  webrtc::VideoEncoder* const encoder_;
+  std::unique_ptr<webrtc::VideoEncoder> encoder_;

[brandtr, 2017/08/29 11:54:27]

drive-by question: Does this mean that it's OK to delete all our encoders
directly, rather than through WebRtcVideoEncoderFactory::DestroyVideoEncoder?

 
   std::unique_ptr<webrtc::VideoEncoder> fallback_encoder_;
   std::string fallback_implementation_name_;
   EncodedImageCallback* callback_;
 
   bool forced_fallback_possible_;
   ForcedFallbackParams forced_fallback_;
 };
 
 }  // namespace webrtc
 
 #endif  // WEBRTC_MEDIA_ENGINE_VIDEOENCODERSOFTWAREFALLBACKWRAPPER_H_