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

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

Issue 1426953003: Remove redudant encoder rate calls. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: remove redundant function 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
« no previous file with comments | « webrtc/video_engine/vie_encoder.h ('k') | no next file » | 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 240 matching lines...) Expand 10 before | Expand all | Expand 10 after
251 return -1; 251 return -1;
252 } 252 }
253 return 0; 253 return 0;
254 } 254 }
255 255
256 int32_t ViEEncoder::GetEncoder(VideoCodec* video_codec) { 256 int32_t ViEEncoder::GetEncoder(VideoCodec* video_codec) {
257 *video_codec = vcm_->GetSendCodec(); 257 *video_codec = vcm_->GetSendCodec();
258 return 0; 258 return 0;
259 } 259 }
260 260
261 int32_t ViEEncoder::GetCodecConfigParameters(
262 unsigned char config_parameters[kConfigParameterSize],
263 unsigned char& config_parameters_size) {
264 int32_t num_parameters =
265 vcm_->CodecConfigParameters(config_parameters, kConfigParameterSize);
266 if (num_parameters <= 0) {
267 config_parameters_size = 0;
268 return -1;
269 }
270 config_parameters_size = static_cast<unsigned char>(num_parameters);
271 return 0;
272 }
273
274 int32_t ViEEncoder::ScaleInputImage(bool enable) { 261 int32_t ViEEncoder::ScaleInputImage(bool enable) {
275 VideoFrameResampling resampling_mode = kFastRescaling; 262 VideoFrameResampling resampling_mode = kFastRescaling;
276 // TODO(mflodman) What? 263 // TODO(mflodman) What?
277 if (enable) { 264 if (enable) {
278 // kInterpolation is currently not supported. 265 // kInterpolation is currently not supported.
279 LOG_F(LS_ERROR) << "Not supported."; 266 LOG_F(LS_ERROR) << "Not supported.";
280 return -1; 267 return -1;
281 } 268 }
282 vpm_->SetInputFrameResampleMode(resampling_mode); 269 vpm_->SetInputFrameResampleMode(resampling_mode);
283 270
(...skipping 430 matching lines...) Expand 10 before | Expand all | Expand 10 after
714 const uint32_t width, 701 const uint32_t width,
715 const uint32_t height) { 702 const uint32_t height) {
716 return vpm_->SetTargetResolution(width, height, frame_rate); 703 return vpm_->SetTargetResolution(width, height, frame_rate);
717 } 704 }
718 705
719 void QMVideoSettingsCallback::SetTargetFramerate(int frame_rate) { 706 void QMVideoSettingsCallback::SetTargetFramerate(int frame_rate) {
720 vpm_->SetTargetFramerate(frame_rate); 707 vpm_->SetTargetFramerate(frame_rate);
721 } 708 }
722 709
723 } // namespace webrtc 710 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/video_engine/vie_encoder.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698