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

Side by Side Diff: webrtc/modules/video_coding/codec_database.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/codec_database.h" 11 #include "webrtc/modules/video_coding/codec_database.h"
12 12
13 #include "webrtc/base/checks.h"
14 #include "webrtc/base/logging.h"
13 #include "webrtc/modules/video_coding/codecs/h264/include/h264.h" 15 #include "webrtc/modules/video_coding/codecs/h264/include/h264.h"
14 #include "webrtc/modules/video_coding/codecs/i420/include/i420.h" 16 #include "webrtc/modules/video_coding/codecs/i420/include/i420.h"
15 #include "webrtc/modules/video_coding/codecs/vp8/include/vp8.h" 17 #include "webrtc/modules/video_coding/codecs/vp8/include/vp8.h"
16 #include "webrtc/modules/video_coding/codecs/vp9/include/vp9.h" 18 #include "webrtc/modules/video_coding/codecs/vp9/include/vp9.h"
17 #include "webrtc/modules/video_coding/internal_defines.h" 19 #include "webrtc/modules/video_coding/internal_defines.h"
18 #include "webrtc/rtc_base/checks.h"
19 #include "webrtc/rtc_base/logging.h"
20 20
21 namespace { 21 namespace {
22 const size_t kDefaultPayloadSize = 1440; 22 const size_t kDefaultPayloadSize = 1440;
23 const uint8_t kDefaultPayloadType = 100; 23 const uint8_t kDefaultPayloadType = 100;
24 } 24 }
25 25
26 namespace webrtc { 26 namespace webrtc {
27 27
28 VideoCodecVP8 VideoEncoder::GetDefaultVp8Settings() { 28 VideoCodecVP8 VideoEncoder::GetDefaultVp8Settings() {
29 VideoCodecVP8 vp8_settings; 29 VideoCodecVP8 vp8_settings;
(...skipping 562 matching lines...) Expand 10 before | Expand all | Expand 10 after
592 592
593 const VCMExtDecoderMapItem* VCMCodecDataBase::FindExternalDecoderItem( 593 const VCMExtDecoderMapItem* VCMCodecDataBase::FindExternalDecoderItem(
594 uint8_t payload_type) const { 594 uint8_t payload_type) const {
595 ExternalDecoderMap::const_iterator it = dec_external_map_.find(payload_type); 595 ExternalDecoderMap::const_iterator it = dec_external_map_.find(payload_type);
596 if (it != dec_external_map_.end()) { 596 if (it != dec_external_map_.end()) {
597 return (*it).second; 597 return (*it).second;
598 } 598 }
599 return nullptr; 599 return nullptr;
600 } 600 }
601 } // namespace webrtc 601 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/video_capture/windows/video_capture_factory_windows.cc ('k') | webrtc/modules/video_coding/codec_timer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698