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

Side by Side Diff: webrtc/modules/video_coding/video_codec_initializer.cc

Issue 2964773002: Revert "Update includes for webrtc/{base => rtc_base} rename (1/3)" (Closed)
Patch Set: Created 3 years, 5 months 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
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2016 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2016 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/modules/video_coding/include/video_codec_initializer.h" 11 #include "webrtc/modules/video_coding/include/video_codec_initializer.h"
12 12
13 #include "webrtc/base/basictypes.h"
14 #include "webrtc/base/logging.h"
13 #include "webrtc/common_types.h" 15 #include "webrtc/common_types.h"
14 #include "webrtc/common_video/include/video_bitrate_allocator.h" 16 #include "webrtc/common_video/include/video_bitrate_allocator.h"
15 #include "webrtc/modules/video_coding/codecs/vp8/screenshare_layers.h" 17 #include "webrtc/modules/video_coding/codecs/vp8/screenshare_layers.h"
16 #include "webrtc/modules/video_coding/codecs/vp8/simulcast_rate_allocator.h" 18 #include "webrtc/modules/video_coding/codecs/vp8/simulcast_rate_allocator.h"
17 #include "webrtc/modules/video_coding/codecs/vp8/temporal_layers.h" 19 #include "webrtc/modules/video_coding/codecs/vp8/temporal_layers.h"
18 #include "webrtc/modules/video_coding/include/video_coding_defines.h" 20 #include "webrtc/modules/video_coding/include/video_coding_defines.h"
19 #include "webrtc/modules/video_coding/utility/default_video_bitrate_allocator.h" 21 #include "webrtc/modules/video_coding/utility/default_video_bitrate_allocator.h"
20 #include "webrtc/rtc_base/basictypes.h"
21 #include "webrtc/rtc_base/logging.h"
22 #include "webrtc/system_wrappers/include/clock.h" 22 #include "webrtc/system_wrappers/include/clock.h"
23 23
24 namespace webrtc { 24 namespace webrtc {
25 25
26 bool VideoCodecInitializer::SetupCodec( 26 bool VideoCodecInitializer::SetupCodec(
27 const VideoEncoderConfig& config, 27 const VideoEncoderConfig& config,
28 const VideoSendStream::Config::EncoderSettings settings, 28 const VideoSendStream::Config::EncoderSettings settings,
29 const std::vector<VideoStream>& streams, 29 const std::vector<VideoStream>& streams,
30 bool nack_enabled, 30 bool nack_enabled,
31 VideoCodec* codec, 31 VideoCodec* codec,
(...skipping 192 matching lines...) Expand 10 before | Expand all | Expand 10 after
224 } 224 }
225 if (video_codec.maxBitrate < kEncoderMinBitrateKbps) 225 if (video_codec.maxBitrate < kEncoderMinBitrateKbps)
226 video_codec.maxBitrate = kEncoderMinBitrateKbps; 226 video_codec.maxBitrate = kEncoderMinBitrateKbps;
227 227
228 RTC_DCHECK_GT(streams[0].max_framerate, 0); 228 RTC_DCHECK_GT(streams[0].max_framerate, 0);
229 video_codec.maxFramerate = streams[0].max_framerate; 229 video_codec.maxFramerate = streams[0].max_framerate;
230 return video_codec; 230 return video_codec;
231 } 231 }
232 232
233 } // namespace webrtc 233 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/video_coding/utility/vp9_uncompressed_header_parser.cc ('k') | webrtc/modules/video_coding/video_coding_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698