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

Avoid resetting encoder on identical settings.

Browse Source 
BUG=1681
R=holmer@google.com, stefan@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/1481005

git-svn-id: http://webrtc.googlecode.com/svn/trunk@4049 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
pbos@webrtc.org
2013-05-16 18:40:48 +00:00
parent 890f6092e6
commit b9bb3d1e7d
4 changed files with 172 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -68,9 +68,10 @@ class VCMCodecDataBase {
// Sets the sender side codec and initiates the desired codec given the
// VideoCodec struct.
// Returns true if the codec was successfully registered, false otherwise.
bool RegisterSendCodec(const VideoCodec* send_codec,
int number_of_cores,
int max_payload_size);
bool SetSendCodec(const VideoCodec* send_codec,
int number_of_cores,
int max_payload_size,
VCMEncodedFrameCallback* encoded_frame_callback);
// Gets the current send codec. Relevant for internal codecs only.
// Returns true if there is a send codec, false otherwise.
@ -93,15 +94,7 @@ class VCMCodecDataBase {
// if the external encoder was the send codec before being deregistered.
bool DeregisterExternalEncoder(uint8_t payload_type, bool* was_send_codec);
// Returns an encoder specified by the payload type in |settings|. The
// encoded frame callback of the encoder is set to |encoded_frame_callback|.
// If no such encoder already exists an instance will be created and
// initialized using |settings|.
// NULL is returned if no encoder with the specified payload type was found
// and the function failed to create one.
VCMGenericEncoder* GetEncoder(
const VideoCodec* settings,
VCMEncodedFrameCallback* encoded_frame_callback);
VCMGenericEncoder* GetEncoder();
bool SetPeriodicKeyFrames(bool enable);
@ -165,6 +158,9 @@ class VCMCodecDataBase {
VideoCodec* new_codec,
bool* external) const;
// 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;
@ -182,6 +178,7 @@ class VCMCodecDataBase {
int number_of_cores_;
int max_payload_size_;
bool periodic_key_frames_;
bool pending_encoder_reset_;
bool current_enc_is_external_;
VideoCodec send_codec_;
VideoCodec receive_codec_;