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

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

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_channel_group.cc ('k') | webrtc/video_engine/vie_encoder.cc » ('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 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 class ViEEncoder : public RtcpIntraFrameObserver, 66 class ViEEncoder : public RtcpIntraFrameObserver,
67 public VideoEncoderRateObserver, 67 public VideoEncoderRateObserver,
68 public VCMPacketizationCallback, 68 public VCMPacketizationCallback,
69 public VCMSendStatisticsCallback, 69 public VCMSendStatisticsCallback,
70 public VideoCaptureCallback { 70 public VideoCaptureCallback {
71 public: 71 public:
72 friend class ViEBitrateObserver; 72 friend class ViEBitrateObserver;
73 73
74 ViEEncoder(int32_t channel_id, 74 ViEEncoder(int32_t channel_id,
75 uint32_t number_of_cores, 75 uint32_t number_of_cores,
76 const Config& config,
77 ProcessThread& module_process_thread, 76 ProcessThread& module_process_thread,
78 PacedSender* pacer, 77 PacedSender* pacer,
79 BitrateAllocator* bitrate_allocator, 78 BitrateAllocator* bitrate_allocator,
80 BitrateController* bitrate_controller, 79 BitrateController* bitrate_controller,
81 bool disable_default_encoder); 80 bool disable_default_encoder);
82 ~ViEEncoder(); 81 ~ViEEncoder();
83 82
84 bool Init(); 83 bool Init();
85 84
86 // This function is assumed to be called before any frames are delivered and 85 // This function is assumed to be called before any frames are delivered and
(...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after
238 bool video_suspended_ GUARDED_BY(data_cs_); 237 bool video_suspended_ GUARDED_BY(data_cs_);
239 I420FrameCallback* pre_encode_callback_ GUARDED_BY(callback_cs_); 238 I420FrameCallback* pre_encode_callback_ GUARDED_BY(callback_cs_);
240 const int64_t start_ms_; 239 const int64_t start_ms_;
241 240
242 SendStatisticsProxy* send_statistics_proxy_ GUARDED_BY(callback_cs_); 241 SendStatisticsProxy* send_statistics_proxy_ GUARDED_BY(callback_cs_);
243 }; 242 };
244 243
245 } // namespace webrtc 244 } // namespace webrtc
246 245
247 #endif // WEBRTC_VIDEO_ENGINE_VIE_ENCODER_H_ 246 #endif // WEBRTC_VIDEO_ENGINE_VIE_ENCODER_H_
OLDNEW
« no previous file with comments | « webrtc/video_engine/vie_channel_group.cc ('k') | webrtc/video_engine/vie_encoder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698