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.h b/modules/video_coding/encoder_database.h
index 61e0720..a9db4e1 100644
--- a/modules/video_coding/encoder_database.h
+++ b/modules/video_coding/encoder_database.h
@@ -34,13 +34,10 @@
// video source and doesn't need the user to provide it with frames via
// the Encode() method.
void RegisterExternalEncoder(VideoEncoder* external_encoder,
- uint8_t payload_type,
bool internal_source);
- // Deregisters an external encoder. Returns true if the encoder was
- // found and deregistered, false otherwise. |was_send_codec| is set to true
- // if the external encoder was the send codec before being deregistered.
- bool DeregisterExternalEncoder(uint8_t payload_type, bool* was_send_codec);
+ // Deregisters any external encoder.
+ void DeregisterExternalEncoder();
VCMGenericEncoder* GetEncoder();
@@ -57,7 +54,6 @@
size_t max_payload_size_;
bool pending_encoder_reset_;
VideoCodec send_codec_;
- uint8_t encoder_payload_type_;
VideoEncoder* external_encoder_;
bool internal_source_;
VCMEncodedFrameCallback* const encoded_frame_callback_;