Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(59)

Side by Side Diff: webrtc/video_engine/vie_encoder.cc

Issue 1250513006: Remove webrtc::Config from ViEChannelGroup. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: remove experiment.h from build files Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « webrtc/video_engine/vie_encoder.h ('k') | webrtc/webrtc.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 uint8_t fraction_lost, 96 uint8_t fraction_lost,
97 int64_t rtt) { 97 int64_t rtt) {
98 owner_->OnNetworkChanged(bitrate_bps, fraction_lost, rtt); 98 owner_->OnNetworkChanged(bitrate_bps, fraction_lost, rtt);
99 } 99 }
100 private: 100 private:
101 ViEEncoder* owner_; 101 ViEEncoder* owner_;
102 }; 102 };
103 103
104 ViEEncoder::ViEEncoder(int32_t channel_id, 104 ViEEncoder::ViEEncoder(int32_t channel_id,
105 uint32_t number_of_cores, 105 uint32_t number_of_cores,
106 const Config& config,
107 ProcessThread& module_process_thread, 106 ProcessThread& module_process_thread,
108 PacedSender* pacer, 107 PacedSender* pacer,
109 BitrateAllocator* bitrate_allocator, 108 BitrateAllocator* bitrate_allocator,
110 BitrateController* bitrate_controller, 109 BitrateController* bitrate_controller,
111 bool disable_default_encoder) 110 bool disable_default_encoder)
112 : channel_id_(channel_id), 111 : channel_id_(channel_id),
113 number_of_cores_(number_of_cores), 112 number_of_cores_(number_of_cores),
114 disable_default_encoder_(disable_default_encoder), 113 disable_default_encoder_(disable_default_encoder),
115 vpm_(VideoProcessingModule::Create(ViEModuleId(-1, channel_id))), 114 vpm_(VideoProcessingModule::Create(ViEModuleId(-1, channel_id))),
116 qm_callback_(new QMVideoSettingsCallback(vpm_.get())), 115 qm_callback_(new QMVideoSettingsCallback(vpm_.get())),
(...skipping 752 matching lines...) Expand 10 before | Expand all | Expand 10 after
869 const uint32_t width, 868 const uint32_t width,
870 const uint32_t height) { 869 const uint32_t height) {
871 return vpm_->SetTargetResolution(width, height, frame_rate); 870 return vpm_->SetTargetResolution(width, height, frame_rate);
872 } 871 }
873 872
874 void QMVideoSettingsCallback::SetTargetFramerate(int frame_rate) { 873 void QMVideoSettingsCallback::SetTargetFramerate(int frame_rate) {
875 vpm_->SetTargetFramerate(frame_rate); 874 vpm_->SetTargetFramerate(frame_rate);
876 } 875 }
877 876
878 } // namespace webrtc 877 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/video_engine/vie_encoder.h ('k') | webrtc/webrtc.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698