commit 355b8d237c4da77361e1687ff570304b01a19469
author Danil Chapovalov <danilchap@webrtc.org> Fri Aug 13 16:50:37 2021 +0200
committer WebRTC LUCI CQ <webrtc-scoped@luci-project-accounts.iam.gserviceaccount.com> Fri Aug 13 16:03:32 2021 +0000
tree aae4c6cc95a667f6dc2252ab3fb1e6b31b262dfa
parent b6bbdeb24d0125b797bbf70898d58ca7b45c2b9c

Use VideoDecoder::Configure interface when setting up decoder

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

modules/video_coding/decoder_database.h

diff --git a/modules/video_coding/decoder_database.h b/modules/video_coding/decoder_database.h
index e726669..9c573ae 100644
--- a/modules/video_coding/decoder_database.h
+++ b/modules/video_coding/decoder_database.h
@@ -35,8 +35,7 @@
   bool IsExternalDecoderRegistered(uint8_t payload_type) const;
 
   bool RegisterReceiveCodec(uint8_t payload_type,
-                            const VideoCodec& receive_codec,
-                            int number_of_cores);
+                            const VideoDecoder::Settings& settings);
   bool DeregisterReceiveCodec(uint8_t payload_type);
 
   // Returns a decoder specified by frame.PayloadType. The decoded frame
@@ -49,17 +48,12 @@
       VCMDecodedFrameCallback* decoded_frame_callback);
 
  private:
-  struct DecoderSettings {
-    VideoCodec settings;
-    int number_of_cores;
-  };
-
   void CreateAndInitDecoder(const VCMEncodedFrame& frame);
 
   absl::optional<uint8_t> current_payload_type_;
   absl::optional<VCMGenericDecoder> current_decoder_;
   // Initialization paramaters for decoders keyed by payload type.
-  std::map<uint8_t, DecoderSettings> decoder_settings_;
+  std::map<uint8_t, VideoDecoder::Settings> decoder_settings_;
   // Decoders keyed by payload type.
   std::map<uint8_t, VideoDecoder*> decoders_;
 };