| OLD | NEW |
| 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 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 87 decoder_->InitDecode(&codec_settings_, number_of_cores_) == | 87 decoder_->InitDecode(&codec_settings_, number_of_cores_) == |
| 88 WEBRTC_VIDEO_CODEC_OK; | 88 WEBRTC_VIDEO_CODEC_OK; |
| 89 } | 89 } |
| 90 if (decoder_initialized_) { | 90 if (decoder_initialized_) { |
| 91 ret = decoder_->Decode(input_image, missing_frames, fragmentation, | 91 ret = decoder_->Decode(input_image, missing_frames, fragmentation, |
| 92 codec_specific_info, render_time_ms); | 92 codec_specific_info, render_time_ms); |
| 93 } | 93 } |
| 94 if (ret == WEBRTC_VIDEO_CODEC_OK) { | 94 if (ret == WEBRTC_VIDEO_CODEC_OK) { |
| 95 if (fallback_decoder_) { | 95 if (fallback_decoder_) { |
| 96 // Decode OK -> stop using fallback decoder. | 96 // Decode OK -> stop using fallback decoder. |
| 97 LOG(LS_INFO) | 97 LOG(LS_WARNING) |
| 98 << "Decode OK, no longer using the software fallback decoder."; | 98 << "Decode OK, no longer using the software fallback decoder."; |
| 99 fallback_decoder_->Release(); | 99 fallback_decoder_->Release(); |
| 100 fallback_decoder_.reset(); | 100 fallback_decoder_.reset(); |
| 101 return WEBRTC_VIDEO_CODEC_OK; | 101 return WEBRTC_VIDEO_CODEC_OK; |
| 102 } | 102 } |
| 103 } | 103 } |
| 104 if (ret != WEBRTC_VIDEO_CODEC_FALLBACK_SOFTWARE) | 104 if (ret != WEBRTC_VIDEO_CODEC_FALLBACK_SOFTWARE) |
| 105 return ret; | 105 return ret; |
| 106 if (!fallback_decoder_) { | 106 if (!fallback_decoder_) { |
| 107 // Try to initialize fallback decoder. | 107 // Try to initialize fallback decoder. |
| (...skipping 30 matching lines...) Expand all Loading... |
| 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 |
| OLD | NEW |