zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move class VideoCodec from common_types.h to its own api header file.

Browse Source 
Bug: webrtc:7660
Change-Id: I91f19bfc2565461328f30081f8383e136419aefb
Reviewed-on: https://webrtc-review.googlesource.com/79881
Commit-Queue: Niels Moller <nisse@webrtc.org>
Reviewed-by: Rasmus Brandt <brandtr@webrtc.org>
Reviewed-by: Danil Chapovalov <danilchap@webrtc.org>
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#23544}
This commit is contained in:
Niels Möller
2018-06-08 08:46:04 +02:00
committed by Commit Bot
parent b616d09e1b
commit efc71e565e
23 changed files with 185 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/video_coding/video_codec_initializer.cc
View File

@ -140,9 +140,9 @@ VideoCodec VideoCodecInitializer::VideoEncoderConfigToVideoCodec(
sim_stream->active = streams[i].active;
video_codec.width =
std::max(video_codec.width, static_cast<uint16_t>(streams[i].width));
std::max(video_codec.width, streams[i].width);
video_codec.height =
std::max(video_codec.height, static_cast<uint16_t>(streams[i].height));
std::max(video_codec.height, streams[i].height);
video_codec.minBitrate =
std::min(static_cast<uint16_t>(video_codec.minBitrate),
static_cast<uint16_t>(streams[i].min_bitrate_bps / 1000));