Delete payload_type from VCMEncoderDatabase and vcm::VideoSender.
Bug: webrtc:8830
Change-Id: Ie6a874023618a5540e138b34edfcad1ce6e8d391
Reviewed-on: https://webrtc-review.googlesource.com/62102
Commit-Queue: Niels Moller <nisse@webrtc.org>
Reviewed-by: Erik Språng <sprang@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#22474}diff --git a/modules/video_coding/encoder_database.cc b/modules/video_coding/encoder_database.cc
index c37d47b..80716df 100644
--- a/modules/video_coding/encoder_database.cc
+++ b/modules/video_coding/encoder_database.cc
@@ -25,7 +25,6 @@
max_payload_size_(kDefaultPayloadSize),
pending_encoder_reset_(true),
send_codec_(),
- encoder_payload_type_(0),
external_encoder_(nullptr),
internal_source_(false),
encoded_frame_callback_(encoded_frame_callback) {}
@@ -43,7 +42,6 @@
max_payload_size = kDefaultPayloadSize;
}
RTC_DCHECK_GE(number_of_cores, 1);
- RTC_DCHECK_GE(send_codec->plType, 1);
// Make sure the start bit rate is sane...
RTC_DCHECK_LE(send_codec->startBitrate, 1000000);
RTC_DCHECK(send_codec->codecType != kVideoCodecUnknown);
@@ -88,8 +86,6 @@
// If encoder exists, will destroy it and create new one.
DeleteEncoder();
- RTC_DCHECK_EQ(encoder_payload_type_, send_codec_.plType)
- << "Encoder not registered for payload type " << send_codec_.plType;
ptr_encoder_.reset(new VCMGenericEncoder(
external_encoder_, encoded_frame_callback_, internal_source_));
encoded_frame_callback_->SetInternalSource(internal_source_);
@@ -105,32 +101,19 @@
return true;
}
-bool VCMEncoderDataBase::DeregisterExternalEncoder(uint8_t payload_type,
- bool* was_send_codec) {
- RTC_DCHECK(was_send_codec);
- *was_send_codec = false;
- if (encoder_payload_type_ != payload_type) {
- return false;
- }
- if (send_codec_.plType == payload_type) {
- // De-register as send codec if needed.
- DeleteEncoder();
- memset(&send_codec_, 0, sizeof(VideoCodec));
- *was_send_codec = true;
- }
- encoder_payload_type_ = 0;
+void VCMEncoderDataBase::DeregisterExternalEncoder() {
+ DeleteEncoder();
+ memset(&send_codec_, 0, sizeof(VideoCodec));
external_encoder_ = nullptr;
internal_source_ = false;
- return true;
}
void VCMEncoderDataBase::RegisterExternalEncoder(VideoEncoder* external_encoder,
- uint8_t payload_type,
bool internal_source) {
// Since only one encoder can be used at a given time, only one external
// encoder can be registered/used.
+ RTC_CHECK(external_encoder_ == nullptr);
external_encoder_ = external_encoder;
- encoder_payload_type_ = payload_type;
internal_source_ = internal_source;
pending_encoder_reset_ = true;
}
@@ -140,9 +123,8 @@
if (!ptr_encoder_)
return true;
- // Does not check startBitrate or maxFramerate
+ // Does not check startBitrate, maxFramerate or plType
if (new_send_codec.codecType != send_codec_.codecType ||
- new_send_codec.plType != send_codec_.plType ||
new_send_codec.width != send_codec_.width ||
new_send_codec.height != send_codec_.height ||
new_send_codec.maxBitrate != send_codec_.maxBitrate ||