| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (c) 2015 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2015 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 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 69 LOG(LS_WARNING) << "Decoder falling back to software decoding."; | 69 LOG(LS_WARNING) << "Decoder falling back to software decoding."; |
| 70 fallback_decoder_.reset(VideoDecoder::Create(decoder_type_)); | 70 fallback_decoder_.reset(VideoDecoder::Create(decoder_type_)); |
| 71 if (fallback_decoder_->InitDecode(&codec_settings_, number_of_cores_) != | 71 if (fallback_decoder_->InitDecode(&codec_settings_, number_of_cores_) != |
| 72 WEBRTC_VIDEO_CODEC_OK) { | 72 WEBRTC_VIDEO_CODEC_OK) { |
| 73 LOG(LS_ERROR) << "Failed to initialize software-decoder fallback."; | 73 LOG(LS_ERROR) << "Failed to initialize software-decoder fallback."; |
| 74 fallback_decoder_.reset(); | 74 fallback_decoder_.reset(); |
| 75 return false; | 75 return false; |
| 76 } | 76 } |
| 77 if (callback_ != nullptr) | 77 if (callback_ != nullptr) |
| 78 fallback_decoder_->RegisterDecodeCompleteCallback(callback_); | 78 fallback_decoder_->RegisterDecodeCompleteCallback(callback_); |
| 79 fallback_implementation_name_ = |
| 80 std::string(fallback_decoder_->ImplementationName()) + |
| 81 " (fallback from: " + decoder_->ImplementationName() + ")"; |
| 79 return true; | 82 return true; |
| 80 } | 83 } |
| 81 | 84 |
| 82 int32_t VideoDecoderSoftwareFallbackWrapper::Decode( | 85 int32_t VideoDecoderSoftwareFallbackWrapper::Decode( |
| 83 const EncodedImage& input_image, | 86 const EncodedImage& input_image, |
| 84 bool missing_frames, | 87 bool missing_frames, |
| 85 const RTPFragmentationHeader* fragmentation, | 88 const RTPFragmentationHeader* fragmentation, |
| 86 const CodecSpecificInfo* codec_specific_info, | 89 const CodecSpecificInfo* codec_specific_info, |
| 87 int64_t render_time_ms) { | 90 int64_t render_time_ms) { |
| 88 // Try decoding with the provided decoder on every keyframe or when there's no | 91 // Try decoding with the provided decoder on every keyframe or when there's no |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 124 fallback_decoder_->Release(); | 127 fallback_decoder_->Release(); |
| 125 return decoder_->Release(); | 128 return decoder_->Release(); |
| 126 } | 129 } |
| 127 | 130 |
| 128 int32_t VideoDecoderSoftwareFallbackWrapper::Reset() { | 131 int32_t VideoDecoderSoftwareFallbackWrapper::Reset() { |
| 129 if (fallback_decoder_) | 132 if (fallback_decoder_) |
| 130 fallback_decoder_->Reset(); | 133 fallback_decoder_->Reset(); |
| 131 return decoder_->Reset(); | 134 return decoder_->Reset(); |
| 132 } | 135 } |
| 133 | 136 |
| 137 const char* VideoDecoderSoftwareFallbackWrapper::ImplementationName() const { |
| 138 if (fallback_decoder_) |
| 139 return fallback_implementation_name_.c_str(); |
| 140 return decoder_->ImplementationName(); |
| 141 } |
| 142 |
| 134 } // namespace webrtc | 143 } // namespace webrtc |
| OLD | NEW |