From 6cb74fd77aa08edc967f20a15ce4823b0268e5ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=85sa=20Persson?= Date: Fri, 1 Jun 2018 15:13:42 +0200 Subject: [PATCH] Remove unused methods in VCMDecoderDataBase. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug: none Change-Id: Ice538b4be577b4a474b9a16bcec4977eb73d22fb Reviewed-on: https://webrtc-review.googlesource.com/80540 Reviewed-by: Rasmus Brandt Commit-Queue: Åsa Persson Cr-Commit-Position: refs/heads/master@{#23530} --- modules/video_coding/decoder_database.cc | 20 ++++++-------------- modules/video_coding/decoder_database.h | 15 ++++----------- 2 files changed, 10 insertions(+), 25 deletions(-) diff --git a/modules/video_coding/decoder_database.cc b/modules/video_coding/decoder_database.cc index 692de8ac7b..908a94a75e 100644 --- a/modules/video_coding/decoder_database.cc +++ b/modules/video_coding/decoder_database.cc @@ -43,12 +43,12 @@ VCMDecoderDataBase::~VCMDecoderDataBase() { bool VCMDecoderDataBase::DeregisterExternalDecoder(uint8_t payload_type) { ExternalDecoderMap::iterator it = dec_external_map_.find(payload_type); if (it == dec_external_map_.end()) { - // Not found + // Not found. return false; } // 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) + // frame after RegisterReceiveCodec). if (ptr_decoder_ && ptr_decoder_->IsSameDecoder((*it).second->external_decoder_instance)) { // Release it if it was registered and in use. @@ -60,28 +60,24 @@ bool VCMDecoderDataBase::DeregisterExternalDecoder(uint8_t payload_type) { return true; } -// Add the external encoder object to the list of external decoders. +// 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(VideoDecoder* external_decoder, uint8_t payload_type) { - // Check if payload value already exists, if so - erase old and insert new. + // If payload value already exists, erase old and insert new. VCMExtDecoderMapItem* ext_decoder = new VCMExtDecoderMapItem(external_decoder, payload_type); DeregisterExternalDecoder(payload_type); dec_external_map_[payload_type] = ext_decoder; } -bool VCMDecoderDataBase::DecoderRegistered() const { - return !dec_map_.empty(); -} - bool VCMDecoderDataBase::RegisterReceiveCodec(const VideoCodec* receive_codec, int number_of_cores, bool require_key_frame) { if (number_of_cores < 0) { return false; } - // Check if payload value already exists, if so - erase old and insert new. + // If payload value already exists, erase old and insert new. DeregisterReceiveCodec(receive_codec->plType); if (receive_codec->codecType == kVideoCodecUnknown) { return false; @@ -114,7 +110,7 @@ VCMGenericDecoder* VCMDecoderDataBase::GetDecoder( if (payload_type == receive_codec_.plType || payload_type == 0) { return ptr_decoder_.get(); } - // Check for exisitng decoder, if exists - delete. + // If decoder exists - delete. if (ptr_decoder_) { ptr_decoder_.reset(); memset(&receive_codec_, 0, sizeof(VideoCodec)); @@ -134,10 +130,6 @@ VCMGenericDecoder* VCMDecoderDataBase::GetDecoder( return ptr_decoder_.get(); } -VCMGenericDecoder* VCMDecoderDataBase::GetCurrentDecoder() { - return ptr_decoder_.get(); -} - bool VCMDecoderDataBase::PrefersLateDecoding() const { return ptr_decoder_ ? ptr_decoder_->PrefersLateDecoding() : true; } diff --git a/modules/video_coding/decoder_database.h b/modules/video_coding/decoder_database.h index 8c03edb880..c3779c5362 100644 --- a/modules/video_coding/decoder_database.h +++ b/modules/video_coding/decoder_database.h @@ -47,27 +47,20 @@ class VCMDecoderDataBase { void RegisterExternalDecoder(VideoDecoder* external_decoder, uint8_t payload_type); - bool DecoderRegistered() const; - bool RegisterReceiveCodec(const VideoCodec* receive_codec, int number_of_cores, bool require_key_frame); - bool DeregisterReceiveCodec(uint8_t payload_type); - // Returns a decoder specified by |payload_type|. The decoded frame callback - // of the encoder is set to |decoded_frame_callback|. If no such decoder - // already exists an instance will be created and initialized. - // NULL is returned if no encoder with the specified payload type was found + // Returns a decoder specified by frame.PayloadType. The decoded frame + // callback of the decoder is set to |decoded_frame_callback|. If no such + // decoder already exists an instance will be created and initialized. + // nullptr is returned if no decoder with the specified payload type was found // and the function failed to create one. VCMGenericDecoder* GetDecoder( const VCMEncodedFrame& frame, VCMDecodedFrameCallback* decoded_frame_callback); - // Returns the current decoder (i.e. the same value as was last returned from - // GetDecoder(); - VCMGenericDecoder* GetCurrentDecoder(); - // Returns true if the currently active decoder prefer to decode frames late. // That means that frames must be decoded near the render times stamp. bool PrefersLateDecoding() const;