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

Side by Side Diff: webrtc/media/engine/videodecodersoftwarefallbackwrapper.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
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/videodecodersoftwarefallbackwrapper.h" 11 #include "webrtc/media/engine/videodecodersoftwarefallbackwrapper.h"
12 12
13 #include <string> 13 #include <string>
14 14
15 #include "webrtc/base/checks.h"
16 #include "webrtc/base/logging.h"
17 #include "webrtc/base/trace_event.h"
18 #include "webrtc/media/engine/internaldecoderfactory.h" 15 #include "webrtc/media/engine/internaldecoderfactory.h"
19 #include "webrtc/modules/video_coding/include/video_error_codes.h" 16 #include "webrtc/modules/video_coding/include/video_error_codes.h"
17 #include "webrtc/rtc_base/checks.h"
18 #include "webrtc/rtc_base/logging.h"
19 #include "webrtc/rtc_base/trace_event.h"
20 20
21 namespace webrtc { 21 namespace webrtc {
22 22
23 VideoDecoderSoftwareFallbackWrapper::VideoDecoderSoftwareFallbackWrapper( 23 VideoDecoderSoftwareFallbackWrapper::VideoDecoderSoftwareFallbackWrapper(
24 VideoCodecType codec_type, 24 VideoCodecType codec_type,
25 VideoDecoder* decoder) 25 VideoDecoder* decoder)
26 : codec_type_(codec_type), 26 : codec_type_(codec_type),
27 decoder_(decoder), 27 decoder_(decoder),
28 decoder_initialized_(false), 28 decoder_initialized_(false),
29 callback_(nullptr) {} 29 callback_(nullptr) {}
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
138 return decoder_->PrefersLateDecoding(); 138 return decoder_->PrefersLateDecoding();
139 } 139 }
140 140
141 const char* VideoDecoderSoftwareFallbackWrapper::ImplementationName() const { 141 const char* VideoDecoderSoftwareFallbackWrapper::ImplementationName() const {
142 if (fallback_decoder_) 142 if (fallback_decoder_)
143 return fallback_implementation_name_.c_str(); 143 return fallback_implementation_name_.c_str();
144 return decoder_->ImplementationName(); 144 return decoder_->ImplementationName();
145 } 145 }
146 146
147 } // namespace webrtc 147 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/media/engine/simulcast.cc ('k') | webrtc/media/engine/videodecodersoftwarefallbackwrapper_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698