Cleanup VCMDecoderDataBase and neigbour VCMGenericDecoder classes

Remove private members that are no longer used or always have same value
Use less allocations

Bug: None
Change-Id: I5430c2356f0039212baf8b248b92775e8852ce1b
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/227765
Reviewed-by: Erik Språng <sprang@webrtc.org>
Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#34665}
This commit is contained in:
Danil Chapovalov
2021-08-06 12:30:02 +02:00
committed by WebRTC LUCI CQ
parent 5c3c103c41
commit 7b78a3142d
7 changed files with 83 additions and 172 deletions

View File

@ -11,7 +11,6 @@
#ifndef MODULES_VIDEO_CODING_GENERIC_DECODER_H_
#define MODULES_VIDEO_CODING_GENERIC_DECODER_H_
#include <memory>
#include <string>
#include "api/sequence_checker.h"
@ -77,8 +76,7 @@ class VCMDecodedFrameCallback : public DecodedImageCallback {
class VCMGenericDecoder {
public:
explicit VCMGenericDecoder(std::unique_ptr<VideoDecoder> decoder);
explicit VCMGenericDecoder(VideoDecoder* decoder, bool isExternal = false);
explicit VCMGenericDecoder(VideoDecoder* decoder);
~VCMGenericDecoder();
/**
@ -99,14 +97,12 @@ class VCMGenericDecoder {
int32_t RegisterDecodeCompleteCallback(VCMDecodedFrameCallback* callback);
bool IsSameDecoder(VideoDecoder* decoder) const {
return decoder_.get() == decoder;
return decoder_ == decoder;
}
private:
VCMDecodedFrameCallback* _callback;
std::unique_ptr<VideoDecoder> decoder_;
VideoCodecType _codecType;
const bool _isExternal;
VCMDecodedFrameCallback* _callback = nullptr;
VideoDecoder* const decoder_;
VideoContentType _last_keyframe_content_type;
VideoDecoder::DecoderInfo decoder_info_;
};