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

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

Issue 2764573002: Deliver video frames on Android, on the decode thread. (Closed)
Patch Set: Update comments Created 3 years, 8 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
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
131 decoder_initialized_ = false; 131 decoder_initialized_ = false;
132 return decoder_->Release(); 132 return decoder_->Release();
133 } 133 }
134 134
135 bool VideoDecoderSoftwareFallbackWrapper::PrefersLateDecoding() const { 135 bool VideoDecoderSoftwareFallbackWrapper::PrefersLateDecoding() const {
136 if (fallback_decoder_) 136 if (fallback_decoder_)
137 return fallback_decoder_->PrefersLateDecoding(); 137 return fallback_decoder_->PrefersLateDecoding();
138 return decoder_->PrefersLateDecoding(); 138 return decoder_->PrefersLateDecoding();
139 } 139 }
140 140
141 #if defined(WEBRTC_ANDROID)
142 void VideoDecoderSoftwareFallbackWrapper::PollDecodedFrames() {
143 if (fallback_decoder_)
144 return fallback_decoder_->PollDecodedFrames();
145 return decoder_->PollDecodedFrames();
146 }
147 #endif
148
141 const char* VideoDecoderSoftwareFallbackWrapper::ImplementationName() const { 149 const char* VideoDecoderSoftwareFallbackWrapper::ImplementationName() const {
142 if (fallback_decoder_) 150 if (fallback_decoder_)
143 return fallback_implementation_name_.c_str(); 151 return fallback_implementation_name_.c_str();
144 return decoder_->ImplementationName(); 152 return decoder_->ImplementationName();
145 } 153 }
146 154
147 } // namespace webrtc 155 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/media/engine/videodecodersoftwarefallbackwrapper.h ('k') | webrtc/modules/video_coding/codec_database.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698