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

Side by Side Diff: webrtc/modules/video_coding/codecs/vp8/vp8_impl.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) 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2012 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/codecs/vp8/vp8_impl.h" 11 #include "webrtc/modules/video_coding/codecs/vp8/vp8_impl.h"
12 12
13 #include <stdlib.h> 13 #include <stdlib.h>
14 #include <string.h> 14 #include <string.h>
15 #include <time.h> 15 #include <time.h>
16 #include <algorithm> 16 #include <algorithm>
17 #include <string> 17 #include <string>
18 18
19 // NOTE(ajm): Path provided by gyp. 19 // NOTE(ajm): Path provided by gyp.
20 #include "libyuv/scale.h" // NOLINT 20 #include "libyuv/scale.h" // NOLINT
21 #include "libyuv/convert.h" // NOLINT 21 #include "libyuv/convert.h" // NOLINT
22 22
23 #include "webrtc/base/checks.h"
24 #include "webrtc/base/random.h"
25 #include "webrtc/base/timeutils.h"
26 #include "webrtc/base/trace_event.h"
23 #include "webrtc/common_types.h" 27 #include "webrtc/common_types.h"
24 #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" 28 #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
25 #include "webrtc/modules/include/module_common_types.h" 29 #include "webrtc/modules/include/module_common_types.h"
26 #include "webrtc/modules/video_coding/codecs/vp8/include/vp8_common_types.h" 30 #include "webrtc/modules/video_coding/codecs/vp8/include/vp8_common_types.h"
27 #include "webrtc/modules/video_coding/codecs/vp8/screenshare_layers.h" 31 #include "webrtc/modules/video_coding/codecs/vp8/screenshare_layers.h"
28 #include "webrtc/modules/video_coding/codecs/vp8/simulcast_rate_allocator.h" 32 #include "webrtc/modules/video_coding/codecs/vp8/simulcast_rate_allocator.h"
29 #include "webrtc/modules/video_coding/codecs/vp8/temporal_layers.h" 33 #include "webrtc/modules/video_coding/codecs/vp8/temporal_layers.h"
30 #include "webrtc/modules/video_coding/include/video_codec_interface.h" 34 #include "webrtc/modules/video_coding/include/video_codec_interface.h"
31 #include "webrtc/rtc_base/checks.h"
32 #include "webrtc/rtc_base/random.h"
33 #include "webrtc/rtc_base/timeutils.h"
34 #include "webrtc/rtc_base/trace_event.h"
35 #include "webrtc/system_wrappers/include/clock.h" 35 #include "webrtc/system_wrappers/include/clock.h"
36 #include "webrtc/system_wrappers/include/field_trial.h" 36 #include "webrtc/system_wrappers/include/field_trial.h"
37 #include "webrtc/system_wrappers/include/metrics.h" 37 #include "webrtc/system_wrappers/include/metrics.h"
38 38
39 namespace webrtc { 39 namespace webrtc {
40 namespace { 40 namespace {
41 41
42 const char kVp8PostProcArmFieldTrial[] = "WebRTC-VP8-Postproc-Arm"; 42 const char kVp8PostProcArmFieldTrial[] = "WebRTC-VP8-Postproc-Arm";
43 const char kVp8GfBoostFieldTrial[] = "WebRTC-VP8-GfBoost"; 43 const char kVp8GfBoostFieldTrial[] = "WebRTC-VP8-GfBoost";
44 44
(...skipping 1105 matching lines...) Expand 10 before | Expand all | Expand 10 after
1150 buffer_pool_.Release(); 1150 buffer_pool_.Release();
1151 inited_ = false; 1151 inited_ = false;
1152 return WEBRTC_VIDEO_CODEC_OK; 1152 return WEBRTC_VIDEO_CODEC_OK;
1153 } 1153 }
1154 1154
1155 const char* VP8DecoderImpl::ImplementationName() const { 1155 const char* VP8DecoderImpl::ImplementationName() const {
1156 return "libvpx"; 1156 return "libvpx";
1157 } 1157 }
1158 1158
1159 } // namespace webrtc 1159 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698