generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove FPS->kilo-FPS conversion in VideoSender.

Browse Source 
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}
This commit is contained in:
Peter Boström 2015-05-12 12:22:14 +02:00
parent e5ff00a1c6
commit df664536af
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
webrtc/modules/video_coding/main/source/media_optimization.cc
View File

@ -142,10 +142,10 @@ void MediaOptimization::Reset() {
void MediaOptimization::SetEncodingData(VideoCodecType send_codec_type, void MediaOptimization::SetEncodingData(VideoCodecType send_codec_type,
int32_t max_bit_rate, int32_t max_bit_rate,
uint32_t frame_rate,
uint32_t target_bitrate, uint32_t target_bitrate,
uint16_t width, uint16_t width,
uint16_t height, uint16_t height,
uint32_t frame_rate,
int num_layers, int num_layers,
int32_t mtu) { int32_t mtu) {
CriticalSectionScoped lock(crit_sect_.get()); CriticalSectionScoped lock(crit_sect_.get());

2
webrtc/modules/video_coding/main/source/media_optimization.h
View File

@ -41,10 +41,10 @@ class MediaOptimization {
// Informs media optimization of initial encoding state. // Informs media optimization of initial encoding state.
void SetEncodingData(VideoCodecType send_codec_type, void SetEncodingData(VideoCodecType send_codec_type,
int32_t max_bit_rate, int32_t max_bit_rate,
uint32_t frame_rate,
uint32_t bit_rate, uint32_t bit_rate,
uint16_t width, uint16_t width,
uint16_t height, uint16_t height,
uint32_t frame_rate,
int num_temporal_layers, int num_temporal_layers,
int32_t mtu); int32_t mtu);

2
webrtc/modules/video_coding/main/source/video_sender.cc
View File

@ -154,10 +154,10 @@ int32_t VideoSender::RegisterSendCodec(const VideoCodec* sendCodec,
_mediaOpt.SetEncodingData(sendCodec->codecType, _mediaOpt.SetEncodingData(sendCodec->codecType,
sendCodec->maxBitrate * 1000, sendCodec->maxBitrate * 1000,
sendCodec->maxFramerate * 1000,
sendCodec->startBitrate * 1000, sendCodec->startBitrate * 1000,
sendCodec->width, sendCodec->width,
sendCodec->height, sendCodec->height,
sendCodec->maxFramerate,
numLayers, numLayers,
maxPayloadSize); maxPayloadSize);
return VCM_OK; return VCM_OK;