A few simplifications to CodecDatabase and VCMGenericDecoder

webrtc/modules/video_coding/generic_decoder.h

 /*
  *  Copyright (c) 2012 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_MODULES_VIDEO_CODING_GENERIC_DECODER_H_
 #define WEBRTC_MODULES_VIDEO_CODING_GENERIC_DECODER_H_
 
+#include <memory>
+
 #include "webrtc/base/criticalsection.h"
 #include "webrtc/base/thread_checker.h"
 #include "webrtc/modules/include/module_common_types.h"
 #include "webrtc/modules/video_coding/encoded_frame.h"
 #include "webrtc/modules/video_coding/include/video_codec_interface.h"
 #include "webrtc/modules/video_coding/timestamp_map.h"
 #include "webrtc/modules/video_coding/timing.h"
 
 namespace webrtc {
 
@@ skipping 42 matching lines @@
   // from the same thread, and therfore a lock is not required to access it.
   VCMReceiveCallback* _receiveCallback = nullptr;
   VCMTiming* _timing;
   rtc::CriticalSection lock_;
   VCMTimestampMap _timestampMap GUARDED_BY(lock_);
   uint64_t _lastReceivedPictureID;
   int64_t ntp_offset_;
 };
 
 class VCMGenericDecoder {
-  friend class VCMCodecDataBase;
-
  public:
   explicit VCMGenericDecoder(VideoDecoder* decoder, bool isExternal = false);
   ~VCMGenericDecoder();
 
   /**
   * Initialize the decoder with the information from the VideoCodec
   */
   int32_t InitDecode(const VideoCodec* settings, int32_t numberOfCores);
 
   /**
   * Decode to a raw I420 frame,
   *
   * inputVideoBuffer reference to encoded video frame
   */
   int32_t Decode(const VCMEncodedFrame& inputFrame, int64_t nowMs);
 
   /**
-  * Free the decoder memory
-  */
-  int32_t Release();
-
-  /**
   * Set decode callback. Deregistering while decoding is illegal.
   */
   int32_t RegisterDecodeCompleteCallback(VCMDecodedFrameCallback* callback);
 
   bool External() const;
   bool PrefersLateDecoding() const;
+  bool IsSameDecoder(VideoDecoder* decoder) const {
+    return decoder_.get() == decoder;
+  }
 
  private:
   VCMDecodedFrameCallback* _callback;
   VCMFrameInformation _frameInfos[kDecoderFrameMemoryLength];
   uint32_t _nextFrameInfoIdx;
-  VideoDecoder* const _decoder;
+  std::unique_ptr<VideoDecoder> decoder_;
   VideoCodecType _codecType;
-  bool _isExternal;
-  bool _keyFrameDecoded;
+  const bool _isExternal;
   VideoContentType _last_keyframe_content_type;
 };
 
 }  // namespace webrtc
 
 #endif  // WEBRTC_MODULES_VIDEO_CODING_GENERIC_DECODER_H_