commit 73009ec64102a64f80849a7ea30316566da46b4b
author Tommi <tommi@webrtc.org> Thu Sep 29 21:02:04 2022 +0200
committer WebRTC LUCI CQ <webrtc-scoped@luci-project-accounts.iam.gserviceaccount.com> Fri Sep 30 06:21:36 2022 +0000
tree b40cbe7303f47422d292c497b9e9f31f006b3083
parent 1b84da79013ab741be94dc0ed12e9d8802dd3a0d

Move ownership of decoders to VCMDecoderDatabase

Bug: webrtc:14497
Change-Id: Idf719a1d1605f19fcf46eff7990c61144f2b9e3b
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/277401
Reviewed-by: Philip Eliasson <philipel@webrtc.org>
Commit-Queue: Tomas Gunnarsson <tommi@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#38251}

modules/video_coding/decoder_database.cc

diff --git a/modules/video_coding/decoder_database.cc b/modules/video_coding/decoder_database.cc
index 6d78e70..3410edc 100644
--- a/modules/video_coding/decoder_database.cc
+++ b/modules/video_coding/decoder_database.cc
@@ -10,6 +10,9 @@
 
 #include "modules/video_coding/decoder_database.h"
 
+#include <memory>
+#include <utility>
+
 #include "rtc_base/checks.h"
 #include "rtc_base/logging.h"
 
@@ -19,36 +22,34 @@
   decoder_sequence_checker_.Detach();
 }
 
-VideoDecoder* VCMDecoderDatabase::DeregisterExternalDecoder(
-    uint8_t payload_type) {
+void VCMDecoderDatabase::DeregisterExternalDecoder(uint8_t payload_type) {
   RTC_DCHECK_RUN_ON(&decoder_sequence_checker_);
   auto it = decoders_.find(payload_type);
   if (it == decoders_.end()) {
-    return nullptr;
+    return;
   }
 
   // We can't use payload_type to check if the decoder is currently in use,
   // because payload type may be out of date (e.g. before we decode the first
   // frame after RegisterReceiveCodec).
-  if (current_decoder_ && current_decoder_->IsSameDecoder(it->second)) {
+  if (current_decoder_ && current_decoder_->IsSameDecoder(it->second.get())) {
     // Release it if it was registered and in use.
     current_decoder_ = absl::nullopt;
   }
-  VideoDecoder* ret = it->second;
   decoders_.erase(it);
-  return ret;
 }
 
 // Add the external decoder object to the list of external decoders.
 // Won't be registered as a receive codec until RegisterReceiveCodec is called.
 void VCMDecoderDatabase::RegisterExternalDecoder(
     uint8_t payload_type,
-    VideoDecoder* external_decoder) {
+    std::unique_ptr<VideoDecoder> external_decoder) {
   RTC_DCHECK_RUN_ON(&decoder_sequence_checker_);
   // If payload value already exists, erase old and insert new.
   DeregisterExternalDecoder(payload_type);
   if (external_decoder) {
-    decoders_[payload_type] = external_decoder;
+    decoders_.emplace(
+        std::make_pair(payload_type, std::move(external_decoder)));
   }
 }
 
@@ -131,7 +132,7 @@
     RTC_LOG(LS_ERROR) << "No decoder of this type exists.";
     return;
   }
-  current_decoder_.emplace(external_dec_item->second);
+  current_decoder_.emplace(external_dec_item->second.get());
 
   // Copy over input resolutions to prevent codec reinitialization due to
   // the first frame being of a different resolution than the database values.