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

Side by Side Diff: webrtc/media/engine/internaldecoderfactory.cc

Issue 2969623003: Update includes for webrtc/{base => rtc_base} rename (2/3) (Closed)
Patch Set: Rebased onto 224e65939af87443addfc5bb500fbf434728bd1c and restored sorting in clock.cc 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
« no previous file with comments | « webrtc/media/engine/fakewebrtcvoiceengine.h ('k') | webrtc/media/engine/payload_type_mapper.h » ('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) 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/media/engine/internaldecoderfactory.h" 11 #include "webrtc/media/engine/internaldecoderfactory.h"
12 12
13 #include <utility> 13 #include <utility>
14 14
15 #include "webrtc/base/logging.h"
16 #include "webrtc/modules/video_coding/codecs/h264/include/h264.h" 15 #include "webrtc/modules/video_coding/codecs/h264/include/h264.h"
17 #include "webrtc/modules/video_coding/codecs/vp8/include/vp8.h" 16 #include "webrtc/modules/video_coding/codecs/vp8/include/vp8.h"
18 #include "webrtc/modules/video_coding/codecs/vp9/include/vp9.h" 17 #include "webrtc/modules/video_coding/codecs/vp9/include/vp9.h"
18 #include "webrtc/rtc_base/logging.h"
19 19
20 namespace cricket { 20 namespace cricket {
21 21
22 namespace { 22 namespace {
23 23
24 // Video decoder class to be used for unknown codecs. Doesn't support decoding 24 // Video decoder class to be used for unknown codecs. Doesn't support decoding
25 // but logs messages to LS_ERROR. 25 // but logs messages to LS_ERROR.
26 class NullVideoDecoder : public webrtc::VideoDecoder { 26 class NullVideoDecoder : public webrtc::VideoDecoder {
27 public: 27 public:
28 int32_t InitDecode(const webrtc::VideoCodec* codec_settings, 28 int32_t InitDecode(const webrtc::VideoCodec* codec_settings,
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 return new NullVideoDecoder(); 81 return new NullVideoDecoder();
82 } 82 }
83 } 83 }
84 84
85 void InternalDecoderFactory::DestroyVideoDecoder( 85 void InternalDecoderFactory::DestroyVideoDecoder(
86 webrtc::VideoDecoder* decoder) { 86 webrtc::VideoDecoder* decoder) {
87 delete decoder; 87 delete decoder;
88 } 88 }
89 89
90 } // namespace cricket 90 } // namespace cricket
OLDNEW
« no previous file with comments | « webrtc/media/engine/fakewebrtcvoiceengine.h ('k') | webrtc/media/engine/payload_type_mapper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698