commit 7b78a3142d88cdc09d49562f420fc11ce25fbf71
author Danil Chapovalov <danilchap@webrtc.org> Fri Aug 06 12:30:02 2021 +0200
committer WebRTC LUCI CQ <webrtc-scoped@luci-project-accounts.iam.gserviceaccount.com> Fri Aug 06 15:49:38 2021 +0000
tree eb3ff992bf50a12b43d8426eb0ea32ab1808baba
parent 5c3c103c41578c53d41e13d4e9f7734607cbf4e9

Cleanup VCMDecoderDataBase and neigbour VCMGenericDecoder classes

Remove private members that are no longer used or always have same value
Use less allocations

Bug: None
Change-Id: I5430c2356f0039212baf8b248b92775e8852ce1b
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/227765
Reviewed-by: Erik Språng <sprang@webrtc.org>
Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#34665}

modules/video_coding/generic_decoder.h

diff --git a/modules/video_coding/generic_decoder.h b/modules/video_coding/generic_decoder.h
index 8e79cb4..4beae60 100644
--- a/modules/video_coding/generic_decoder.h
+++ b/modules/video_coding/generic_decoder.h
@@ -11,7 +11,6 @@
 #ifndef MODULES_VIDEO_CODING_GENERIC_DECODER_H_
 #define MODULES_VIDEO_CODING_GENERIC_DECODER_H_
 
-#include <memory>
 #include <string>
 
 #include "api/sequence_checker.h"
@@ -77,8 +76,7 @@
 
 class VCMGenericDecoder {
  public:
-  explicit VCMGenericDecoder(std::unique_ptr<VideoDecoder> decoder);
-  explicit VCMGenericDecoder(VideoDecoder* decoder, bool isExternal = false);
+  explicit VCMGenericDecoder(VideoDecoder* decoder);
   ~VCMGenericDecoder();
 
   /**
@@ -99,14 +97,12 @@
   int32_t RegisterDecodeCompleteCallback(VCMDecodedFrameCallback* callback);
 
   bool IsSameDecoder(VideoDecoder* decoder) const {
-    return decoder_.get() == decoder;
+    return decoder_ == decoder;
   }
 
  private:
-  VCMDecodedFrameCallback* _callback;
-  std::unique_ptr<VideoDecoder> decoder_;
-  VideoCodecType _codecType;
-  const bool _isExternal;
+  VCMDecodedFrameCallback* _callback = nullptr;
+  VideoDecoder* const decoder_;
   VideoContentType _last_keyframe_content_type;
   VideoDecoder::DecoderInfo decoder_info_;
 };