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

Remove internal encoders from VCMCodecDatabase.

Browse Source 
Encoders need to be externally provided. To use software encoders they
need to be created and registered from the outside.

BUG=webrtc:1695
R=stefan@webrtc.org

Review URL: https://codereview.webrtc.org/1394823002 .

Cr-Commit-Position: refs/heads/master@{#10283}
This commit is contained in:
Peter Boström
2015-10-15 12:01:38 +02:00
parent 6435c1f004
commit ab73d13c4b
3 changed files with 21 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
webrtc/modules/video_coding/main/source/codec_database.h
View File

@ -151,8 +151,6 @@ class VCMCodecDataBase {
// Determines whether a new codec has to be created or not.
// Checks every setting apart from maxFramerate and startBitrate.
bool RequiresEncoderReset(const VideoCodec& send_codec);
// Create an internal encoder given a codec type.
VCMGenericEncoder* CreateEncoder(const VideoCodecType type) const;
void DeleteEncoder();
@ -168,14 +166,13 @@ class VCMCodecDataBase {
size_t max_payload_size_;
bool periodic_key_frames_;
bool pending_encoder_reset_;
bool current_enc_is_external_;
VideoCodec send_codec_;
VideoCodec receive_codec_;
uint8_t external_payload_type_;
uint8_t encoder_payload_type_;
VideoEncoder* external_encoder_;
bool internal_source_;
VideoEncoderRateObserver* const encoder_rate_observer_;
VCMGenericEncoder* ptr_encoder_;
rtc::scoped_ptr<VCMGenericEncoder> ptr_encoder_;
VCMGenericDecoder* ptr_decoder_;
DecoderMap dec_map_;
ExternalDecoderMap dec_external_map_;