commit 5401bad7015d510be212efa1e3d3bc1c149bc77c
author Niels Möller <nisse@webrtc.org> Tue Aug 11 12:17:42 2020 +0200
committer Commit Bot <commit-bot@chromium.org> Tue Aug 11 14:20:59 2020 +0000
tree f2dcca34ce30f2cde47d33d97dcf529ca1f37f1e
parent f824ef8062933507e46730d8ee48c1c79b5f8557

Prepare for deleting VideoCodec::plType

Deletes all webrtc usage of this member. Next step is to delete
any downstream references, and when that's done, the member can be
deleted.

Bug: None
Change-Id: I3f3a94a063dccf56468a1069653efd3809875b01
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/181201
Reviewed-by: Ilya Nikolaevskiy <ilnik@webrtc.org>
Commit-Queue: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#31911}

modules/video_coding/decoder_database.cc

diff --git a/modules/video_coding/decoder_database.cc b/modules/video_coding/decoder_database.cc
index 029ae45..32be39b 100644
--- a/modules/video_coding/decoder_database.cc
+++ b/modules/video_coding/decoder_database.cc
@@ -29,7 +29,10 @@
 VCMDecoderMapItem::~VCMDecoderMapItem() {}
 
 VCMDecoderDataBase::VCMDecoderDataBase()
-    : receive_codec_(), dec_map_(), dec_external_map_() {}
+    : current_payload_type_(0),
+      receive_codec_(),
+      dec_map_(),
+      dec_external_map_() {}
 
 VCMDecoderDataBase::~VCMDecoderDataBase() {
   ptr_decoder_.reset();
@@ -91,9 +94,10 @@
   }
   delete it->second;
   dec_map_.erase(it);
-  if (receive_codec_.plType == payload_type) {
+  if (payload_type == current_payload_type_) {
     // This codec is currently in use.
     memset(&receive_codec_, 0, sizeof(VideoCodec));
+    current_payload_type_ = 0;
   }
   return true;
 }
@@ -103,24 +107,27 @@
     VCMDecodedFrameCallback* decoded_frame_callback) {
   RTC_DCHECK(decoded_frame_callback->UserReceiveCallback());
   uint8_t payload_type = frame.PayloadType();
-  if (payload_type == receive_codec_.plType || payload_type == 0) {
+  if (payload_type == current_payload_type_ || payload_type == 0) {
     return ptr_decoder_.get();
   }
   // If decoder exists - delete.
   if (ptr_decoder_) {
     ptr_decoder_.reset();
     memset(&receive_codec_, 0, sizeof(VideoCodec));
+    current_payload_type_ = 0;
   }
   ptr_decoder_ = CreateAndInitDecoder(frame, &receive_codec_);
   if (!ptr_decoder_) {
     return nullptr;
   }
+  current_payload_type_ = frame.PayloadType();
   VCMReceiveCallback* callback = decoded_frame_callback->UserReceiveCallback();
-  callback->OnIncomingPayloadType(receive_codec_.plType);
+  callback->OnIncomingPayloadType(current_payload_type_);
   if (ptr_decoder_->RegisterDecodeCompleteCallback(decoded_frame_callback) <
       0) {
     ptr_decoder_.reset();
     memset(&receive_codec_, 0, sizeof(VideoCodec));
+    current_payload_type_ = 0;
     return nullptr;
   }
   return ptr_decoder_.get();