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

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

Issue 1441673002: Move BitrateAllocator from BitrateController logic to Call. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebase Created 5 years, 1 month 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
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
11 #include "webrtc/video_engine/vie_encoder.h" 11 #include "webrtc/video_engine/vie_encoder.h"
12 12
13 #include <assert.h> 13 #include <assert.h>
14 14
15 #include <algorithm> 15 #include <algorithm>
16 16
17 #include "webrtc/base/checks.h" 17 #include "webrtc/base/checks.h"
18 #include "webrtc/base/logging.h" 18 #include "webrtc/base/logging.h"
19 #include "webrtc/base/trace_event.h" 19 #include "webrtc/base/trace_event.h"
20 #include "webrtc/call/bitrate_allocator.h"
20 #include "webrtc/common_video/interface/video_image.h" 21 #include "webrtc/common_video/interface/video_image.h"
21 #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" 22 #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
22 #include "webrtc/frame_callback.h" 23 #include "webrtc/frame_callback.h"
23 #include "webrtc/modules/bitrate_controller/include/bitrate_controller.h" 24 #include "webrtc/modules/bitrate_controller/include/bitrate_controller.h"
24 #include "webrtc/modules/pacing/include/paced_sender.h" 25 #include "webrtc/modules/pacing/include/paced_sender.h"
25 #include "webrtc/modules/utility/include/process_thread.h" 26 #include "webrtc/modules/utility/include/process_thread.h"
26 #include "webrtc/modules/video_coding/codecs/interface/video_codec_interface.h" 27 #include "webrtc/modules/video_coding/codecs/interface/video_codec_interface.h"
27 #include "webrtc/modules/video_coding/main/interface/video_coding.h" 28 #include "webrtc/modules/video_coding/main/interface/video_coding.h"
28 #include "webrtc/modules/video_coding/main/interface/video_coding_defines.h" 29 #include "webrtc/modules/video_coding/main/interface/video_coding_defines.h"
29 #include "webrtc/modules/video_coding/main/source/encoded_frame.h" 30 #include "webrtc/modules/video_coding/main/source/encoded_frame.h"
(...skipping 629 matching lines...) Expand 10 before | Expand all | Expand 10 after
659 const uint32_t width, 660 const uint32_t width,
660 const uint32_t height) { 661 const uint32_t height) {
661 return vpm_->SetTargetResolution(width, height, frame_rate); 662 return vpm_->SetTargetResolution(width, height, frame_rate);
662 } 663 }
663 664
664 void QMVideoSettingsCallback::SetTargetFramerate(int frame_rate) { 665 void QMVideoSettingsCallback::SetTargetFramerate(int frame_rate) {
665 vpm_->SetTargetFramerate(frame_rate); 666 vpm_->SetTargetFramerate(frame_rate);
666 } 667 }
667 668
668 } // namespace webrtc 669 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698