Chromium Code Reviews| Index: webrtc/video_engine/vie_channel.cc |
| diff --git a/webrtc/video_engine/vie_channel.cc b/webrtc/video_engine/vie_channel.cc |
| index d0465b209de0b0d23151a02629dbe68c4e6e9cb7..8f4d2c6d59a9f3737fba29cdfcf3384186605ffb 100644 |
| --- a/webrtc/video_engine/vie_channel.cc |
| +++ b/webrtc/video_engine/vie_channel.cc |
| @@ -91,8 +91,7 @@ ViEChannel::ViEChannel(int32_t channel_id, |
| PacedSender* paced_sender, |
| PacketRouter* packet_router, |
| size_t max_rtp_streams, |
| - bool sender, |
| - bool disable_default_encoder) |
| + bool sender) |
| : channel_id_(channel_id), |
| engine_id_(engine_id), |
| number_of_cores_(number_of_cores), |
| @@ -116,7 +115,6 @@ ViEChannel::ViEChannel(int32_t channel_id, |
| packet_router_(packet_router), |
| bandwidth_observer_(bandwidth_observer), |
| decoder_reset_(true), |
| - disable_default_encoder_(disable_default_encoder), |
| nack_history_size_sender_(kSendSidePacketHistorySize), |
| max_nack_reordering_threshold_(kMaxPacketAgeToNack), |
| pre_render_callback_(NULL), |
| @@ -172,24 +170,6 @@ int32_t ViEChannel::Init() { |
| module_process_thread_->RegisterModule(vcm_); |
| module_process_thread_->RegisterModule(&vie_sync_); |
| -#ifdef VIDEOCODEC_VP8 |
|
stefan-webrtc
2015/07/23 08:34:38
I don't fully understand how this is related to th
pbos-webrtc
2015/07/23 08:51:09
All call sites (of CreateSendChannel and CreateRec
stefan-webrtc
2015/07/23 12:43:46
Thanks
|
| - if (!disable_default_encoder_) { |
| - VideoCodec video_codec; |
| - if (vcm_->Codec(kVideoCodecVP8, &video_codec) == VCM_OK) { |
| - rtp_rtcp_modules_[0]->RegisterSendPayload(video_codec); |
| - // TODO(holmer): Can we call SetReceiveCodec() here instead? |
| - if (!vie_receiver_.RegisterPayload(video_codec)) { |
| - return -1; |
| - } |
| - vcm_->RegisterReceiveCodec(&video_codec, number_of_cores_); |
| - vcm_->RegisterSendCodec(&video_codec, number_of_cores_, |
| - rtp_rtcp_modules_[0]->MaxDataPayloadLength()); |
| - } else { |
| - RTC_NOTREACHED(); |
| - } |
| - } |
| -#endif |
| - |
| return 0; |
| } |