| 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 |
| 11 #include "webrtc/video_decoder.h" | 11 #include "webrtc/video_decoder.h" |
| 12 | 12 |
| 13 #include "webrtc/base/checks.h" | 13 #include "webrtc/base/checks.h" |
| 14 #include "webrtc/modules/video_coding/codecs/h264/include/h264.h" | 14 #include "webrtc/modules/video_coding/codecs/h264/include/h264.h" |
| 15 #include "webrtc/modules/video_coding/codecs/vp8/include/vp8.h" | 15 #include "webrtc/modules/video_coding/codecs/vp8/include/vp8.h" |
| 16 #include "webrtc/modules/video_coding/codecs/vp9/include/vp9.h" | 16 #include "webrtc/modules/video_coding/codecs/vp9/include/vp9.h" |
| 17 #include "webrtc/system_wrappers/interface/logging.h" | 17 #include "webrtc/system_wrappers/interface/logging.h" |
| 18 | 18 |
| 19 namespace webrtc { | 19 namespace webrtc { |
| 20 VideoDecoder* VideoDecoder::Create(VideoDecoder::DecoderType codec_type) { | 20 VideoDecoder* VideoDecoder::Create(VideoDecoder::DecoderType codec_type) { |
| 21 switch (codec_type) { | 21 switch (codec_type) { |
| 22 case kH264: | 22 case kH264: |
| 23 DCHECK(H264Decoder::IsSupported()); | 23 RTC_DCHECK(H264Decoder::IsSupported()); |
| 24 return H264Decoder::Create(); | 24 return H264Decoder::Create(); |
| 25 case kVp8: | 25 case kVp8: |
| 26 return VP8Decoder::Create(); | 26 return VP8Decoder::Create(); |
| 27 case kVp9: | 27 case kVp9: |
| 28 return VP9Decoder::Create(); | 28 return VP9Decoder::Create(); |
| 29 case kUnsupportedCodec: | 29 case kUnsupportedCodec: |
| 30 RTC_NOTREACHED(); | 30 RTC_NOTREACHED(); |
| 31 return nullptr; | 31 return nullptr; |
| 32 } | 32 } |
| 33 RTC_NOTREACHED(); | 33 RTC_NOTREACHED(); |
| (...skipping 23 matching lines...) Expand all Loading... |
| 57 | 57 |
| 58 int32_t VideoDecoderSoftwareFallbackWrapper::InitDecode( | 58 int32_t VideoDecoderSoftwareFallbackWrapper::InitDecode( |
| 59 const VideoCodec* codec_settings, | 59 const VideoCodec* codec_settings, |
| 60 int32_t number_of_cores) { | 60 int32_t number_of_cores) { |
| 61 codec_settings_ = *codec_settings; | 61 codec_settings_ = *codec_settings; |
| 62 number_of_cores_ = number_of_cores; | 62 number_of_cores_ = number_of_cores; |
| 63 return decoder_->InitDecode(codec_settings, number_of_cores); | 63 return decoder_->InitDecode(codec_settings, number_of_cores); |
| 64 } | 64 } |
| 65 | 65 |
| 66 bool VideoDecoderSoftwareFallbackWrapper::InitFallbackDecoder() { | 66 bool VideoDecoderSoftwareFallbackWrapper::InitFallbackDecoder() { |
| 67 CHECK(decoder_type_ != kUnsupportedCodec) | 67 RTC_CHECK(decoder_type_ != kUnsupportedCodec) |
| 68 << "Decoder requesting fallback to codec not supported in software."; | 68 << "Decoder requesting fallback to codec not supported in software."; |
| 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) |
| (...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 125 return decoder_->Release(); | 125 return decoder_->Release(); |
| 126 } | 126 } |
| 127 | 127 |
| 128 int32_t VideoDecoderSoftwareFallbackWrapper::Reset() { | 128 int32_t VideoDecoderSoftwareFallbackWrapper::Reset() { |
| 129 if (fallback_decoder_) | 129 if (fallback_decoder_) |
| 130 fallback_decoder_->Reset(); | 130 fallback_decoder_->Reset(); |
| 131 return decoder_->Reset(); | 131 return decoder_->Reset(); |
| 132 } | 132 } |
| 133 | 133 |
| 134 } // namespace webrtc | 134 } // namespace webrtc |
| OLD | NEW |