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

Side by Side Diff: webrtc/video/video_encoder.cc

Issue 1415413004: Use webrtc/base/logging.h for video. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: redo Created 5 years, 2 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
« no previous file with comments | « webrtc/video/video_decoder.cc ('k') | webrtc/video/video_receive_stream.cc » ('j') | 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) 2015 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2015 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/video_encoder.h" 11 #include "webrtc/video_encoder.h"
12 12
13 #include "webrtc/base/checks.h" 13 #include "webrtc/base/checks.h"
14 #include "webrtc/base/logging.h"
14 #include "webrtc/modules/video_coding/codecs/h264/include/h264.h" 15 #include "webrtc/modules/video_coding/codecs/h264/include/h264.h"
15 #include "webrtc/modules/video_coding/codecs/vp8/include/vp8.h" 16 #include "webrtc/modules/video_coding/codecs/vp8/include/vp8.h"
16 #include "webrtc/modules/video_coding/codecs/vp9/include/vp9.h" 17 #include "webrtc/modules/video_coding/codecs/vp9/include/vp9.h"
17 #include "webrtc/system_wrappers/interface/logging.h"
18 18
19 namespace webrtc { 19 namespace webrtc {
20 VideoEncoder* VideoEncoder::Create(VideoEncoder::EncoderType codec_type) { 20 VideoEncoder* VideoEncoder::Create(VideoEncoder::EncoderType codec_type) {
21 switch (codec_type) { 21 switch (codec_type) {
22 case kH264: 22 case kH264:
23 RTC_DCHECK(H264Encoder::IsSupported()); 23 RTC_DCHECK(H264Encoder::IsSupported());
24 return H264Encoder::Create(); 24 return H264Encoder::Create();
25 case kVp8: 25 case kVp8:
26 return VP8Encoder::Create(); 26 return VP8Encoder::Create();
27 case kVp9: 27 case kVp9:
(...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after
182 return encoder_->SupportsNativeHandle(); 182 return encoder_->SupportsNativeHandle();
183 } 183 }
184 184
185 int VideoEncoderSoftwareFallbackWrapper::GetTargetFramerate() { 185 int VideoEncoderSoftwareFallbackWrapper::GetTargetFramerate() {
186 if (fallback_encoder_) 186 if (fallback_encoder_)
187 return fallback_encoder_->GetTargetFramerate(); 187 return fallback_encoder_->GetTargetFramerate();
188 return encoder_->GetTargetFramerate(); 188 return encoder_->GetTargetFramerate();
189 } 189 }
190 190
191 } // namespace webrtc 191 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/video/video_decoder.cc ('k') | webrtc/video/video_receive_stream.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698