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

Side by Side Diff: webrtc/test/configurable_frame_size_encoder.cc

Issue 2510583002: Reland #2 of Issue 2434073003: Extract bitrate allocation ... (Closed)
Patch Set: Addressed comments Created 4 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
« no previous file with comments | « webrtc/test/configurable_frame_size_encoder.h ('k') | webrtc/test/fake_encoder.h » ('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) 2013 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2013 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/test/configurable_frame_size_encoder.h" 11 #include "webrtc/test/configurable_frame_size_encoder.h"
12 12
13 #include <string.h> 13 #include <string.h>
14 14
15 #include "webrtc/base/checks.h"
15 #include "webrtc/common_video/include/video_image.h" 16 #include "webrtc/common_video/include/video_image.h"
16 #include "webrtc/modules/video_coding/include/video_codec_interface.h" 17 #include "webrtc/modules/video_coding/include/video_codec_interface.h"
17 #include "webrtc/test/gtest.h" 18 #include "webrtc/test/gtest.h"
18 19
19 namespace webrtc { 20 namespace webrtc {
20 namespace test { 21 namespace test {
21 22
22 ConfigurableFrameSizeEncoder::ConfigurableFrameSizeEncoder( 23 ConfigurableFrameSizeEncoder::ConfigurableFrameSizeEncoder(
23 size_t max_frame_size) 24 size_t max_frame_size)
24 : callback_(NULL), 25 : callback_(NULL),
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 66
66 int32_t ConfigurableFrameSizeEncoder::Release() { 67 int32_t ConfigurableFrameSizeEncoder::Release() {
67 return WEBRTC_VIDEO_CODEC_OK; 68 return WEBRTC_VIDEO_CODEC_OK;
68 } 69 }
69 70
70 int32_t ConfigurableFrameSizeEncoder::SetChannelParameters(uint32_t packet_loss, 71 int32_t ConfigurableFrameSizeEncoder::SetChannelParameters(uint32_t packet_loss,
71 int64_t rtt) { 72 int64_t rtt) {
72 return WEBRTC_VIDEO_CODEC_OK; 73 return WEBRTC_VIDEO_CODEC_OK;
73 } 74 }
74 75
75 int32_t ConfigurableFrameSizeEncoder::SetRates(uint32_t new_bit_rate, 76 int32_t ConfigurableFrameSizeEncoder::SetRateAllocation(
76 uint32_t frame_rate) { 77 const BitrateAllocation& allocation,
78 uint32_t framerate) {
77 return WEBRTC_VIDEO_CODEC_OK; 79 return WEBRTC_VIDEO_CODEC_OK;
78 } 80 }
79 81
80 int32_t ConfigurableFrameSizeEncoder::SetPeriodicKeyFrames(bool enable) { 82 int32_t ConfigurableFrameSizeEncoder::SetPeriodicKeyFrames(bool enable) {
81 return WEBRTC_VIDEO_CODEC_OK; 83 return WEBRTC_VIDEO_CODEC_OK;
82 } 84 }
83 85
84 int32_t ConfigurableFrameSizeEncoder::SetFrameSize(size_t size) { 86 int32_t ConfigurableFrameSizeEncoder::SetFrameSize(size_t size) {
85 assert(size <= max_frame_size_); 87 RTC_DCHECK_LE(size, max_frame_size_);
86 current_frame_size_ = size; 88 current_frame_size_ = size;
87 return WEBRTC_VIDEO_CODEC_OK; 89 return WEBRTC_VIDEO_CODEC_OK;
88 } 90 }
89 91
90 } // namespace test 92 } // namespace test
91 } // namespace webrtc 93 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/test/configurable_frame_size_encoder.h ('k') | webrtc/test/fake_encoder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698