zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove unused methods in VCMDecoderDataBase.

Browse Source 
Bug: none
Change-Id: Ice538b4be577b4a474b9a16bcec4977eb73d22fb
Reviewed-on: https://webrtc-review.googlesource.com/80540
Reviewed-by: Rasmus Brandt <brandtr@webrtc.org>
Commit-Queue: Åsa Persson <asapersson@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#23530}
This commit is contained in:
Åsa Persson
2018-06-01 15:13:42 +02:00
committed by Commit Bot
parent 97e04884bd
commit 6cb74fd77a
2 changed files with 10 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
modules/video_coding/decoder_database.cc
View File

@ -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;
}