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

Moving the pacer and the pacer thread to ChannelGroup.

Browse Source 
This means all channels within the same group will share the same pacing queue and scheduler. It also means padding will be computed and sent by a single pacer. To accomplish this I also introduce a PacketRouter which finds the RTP module which owns the packet to be paced out.

BUG=4323
R=mflodman@webrtc.org, pbos@webrtc.org

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

Cr-Commit-Position: refs/heads/master@{#8864}
This commit is contained in:
Stefan Holmer
2015-03-26 11:11:06 +01:00
parent 5225dd8180
commit e590416722
47 changed files with 928 additions and 687 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
webrtc/modules/video_coding/main/source/codec_database.cc
View File

@ -270,6 +270,9 @@ bool VCMCodecDataBase::SetSendCodec(
}
}
if (new_send_codec.startBitrate > new_send_codec.maxBitrate)
new_send_codec.startBitrate = new_send_codec.maxBitrate;
if (!reset_required) {
reset_required = RequiresEncoderReset(new_send_codec);
}
@ -277,7 +280,7 @@ bool VCMCodecDataBase::SetSendCodec(
memcpy(&send_codec_, &new_send_codec, sizeof(send_codec_));
if (!reset_required) {
encoded_frame_callback->SetPayloadType(send_codec->plType);
encoded_frame_callback->SetPayloadType(send_codec_.plType);
if (ptr_encoder_->RegisterEncodeCallback(encoded_frame_callback) < 0) {
LOG(LS_ERROR) << "Failed to register encoded-frame callback.";
return false;
@ -287,20 +290,19 @@ bool VCMCodecDataBase::SetSendCodec(
// If encoder exists, will destroy it and create new one.
DeleteEncoder();
if (send_codec->plType == external_payload_type_) {
if (send_codec_.plType == external_payload_type_) {
// External encoder.
ptr_encoder_ = new VCMGenericEncoder(
external_encoder_, encoder_rate_observer_, internal_source_);
current_enc_is_external_ = true;
} else {
ptr_encoder_ = CreateEncoder(send_codec->codecType);
ptr_encoder_ = CreateEncoder(send_codec_.codecType);
current_enc_is_external_ = false;
if (!ptr_encoder_)
return false;
}
encoded_frame_callback->SetPayloadType(send_codec->plType);
if (ptr_encoder_->InitEncode(send_codec,
number_of_cores_,
encoded_frame_callback->SetPayloadType(send_codec_.plType);
if (ptr_encoder_->InitEncode(&send_codec_, number_of_cores_,
max_payload_size_) < 0) {
LOG(LS_ERROR) << "Failed to initialize video encoder.";
DeleteEncoder();