From df664536afe1e216b022abafe601dec210897f4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Peter=20Bostr=C3=B6m?= Date: Tue, 12 May 2015 12:22:14 +0200 Subject: [PATCH] Remove FPS->kilo-FPS conversion in VideoSender. Wat. Also moving the parameter to make sure this doesn't happen as easily (right now it was part of a bitrate conversion from kilobits to bits). BUG= R=mflodman@webrtc.org, stefan@webrtc.org Review URL: https://webrtc-codereview.appspot.com/51819004 Cr-Commit-Position: refs/heads/master@{#9177} --- webrtc/modules/video_coding/main/source/media_optimization.cc | 2 +- webrtc/modules/video_coding/main/source/media_optimization.h | 2 +- webrtc/modules/video_coding/main/source/video_sender.cc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/webrtc/modules/video_coding/main/source/media_optimization.cc b/webrtc/modules/video_coding/main/source/media_optimization.cc index 8e17833e85..524a7b2b70 100644 --- a/webrtc/modules/video_coding/main/source/media_optimization.cc +++ b/webrtc/modules/video_coding/main/source/media_optimization.cc @@ -142,10 +142,10 @@ void MediaOptimization::Reset() { void MediaOptimization::SetEncodingData(VideoCodecType send_codec_type, int32_t max_bit_rate, - uint32_t frame_rate, uint32_t target_bitrate, uint16_t width, uint16_t height, + uint32_t frame_rate, int num_layers, int32_t mtu) { CriticalSectionScoped lock(crit_sect_.get()); diff --git a/webrtc/modules/video_coding/main/source/media_optimization.h b/webrtc/modules/video_coding/main/source/media_optimization.h index 30833423f0..3ab31f29af 100644 --- a/webrtc/modules/video_coding/main/source/media_optimization.h +++ b/webrtc/modules/video_coding/main/source/media_optimization.h @@ -41,10 +41,10 @@ class MediaOptimization { // Informs media optimization of initial encoding state. void SetEncodingData(VideoCodecType send_codec_type, int32_t max_bit_rate, - uint32_t frame_rate, uint32_t bit_rate, uint16_t width, uint16_t height, + uint32_t frame_rate, int num_temporal_layers, int32_t mtu); diff --git a/webrtc/modules/video_coding/main/source/video_sender.cc b/webrtc/modules/video_coding/main/source/video_sender.cc index df504cd647..4d368b5c76 100644 --- a/webrtc/modules/video_coding/main/source/video_sender.cc +++ b/webrtc/modules/video_coding/main/source/video_sender.cc @@ -154,10 +154,10 @@ int32_t VideoSender::RegisterSendCodec(const VideoCodec* sendCodec, _mediaOpt.SetEncodingData(sendCodec->codecType, sendCodec->maxBitrate * 1000, - sendCodec->maxFramerate * 1000, sendCodec->startBitrate * 1000, sendCodec->width, sendCodec->height, + sendCodec->maxFramerate, numLayers, maxPayloadSize); return VCM_OK;