generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Only remove encoder state feedback for send channels.

Browse Source 
BUG=1000
TEST=See bug

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@2994 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
mflodman@webrtc.org 2012-10-25 13:06:22 +00:00
parent 1f8c02a4de
commit 8dde197788
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
webrtc/video_engine/vie_channel_manager.cc
View File

@ -229,7 +229,11 @@ int ViEChannelManager::DeleteChannel(int channel_id) {
group = FindGroup(channel_id); group = FindGroup(channel_id);
group->SetChannelRembStatus(channel_id, false, false, vie_channel, group->SetChannelRembStatus(channel_id, false, false, vie_channel,
vie_encoder); vie_encoder);
group->GetEncoderStateFeedback()->RemoveEncoder(vie_encoder);
// Remove the feedback if we're owning the encoder.
if (vie_encoder->channel_id() == channel_id) {
group->GetEncoderStateFeedback()->RemoveEncoder(vie_encoder);
}
unsigned int remote_ssrc = 0; unsigned int remote_ssrc = 0;
vie_channel->GetRemoteSSRC(&remote_ssrc); vie_channel->GetRemoteSSRC(&remote_ssrc);

1
webrtc/video_engine/vie_encoder.h
View File

@ -152,6 +152,7 @@ class ViEEncoder
// Disables recording of debugging information. // Disables recording of debugging information.
virtual int StopDebugRecording(); virtual int StopDebugRecording();
int channel_id() const { return channel_id_; }
protected: protected:
// Called by BitrateObserver. // Called by BitrateObserver.
void OnNetworkChanged(const uint32_t bitrate_bps, void OnNetworkChanged(const uint32_t bitrate_bps,