| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2012 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 #ifndef WEBRTC_MODULES_VIDEO_CODING_GENERIC_DECODER_H_ | 11 #ifndef WEBRTC_MODULES_VIDEO_CODING_GENERIC_DECODER_H_ |
| 12 #define WEBRTC_MODULES_VIDEO_CODING_GENERIC_DECODER_H_ | 12 #define WEBRTC_MODULES_VIDEO_CODING_GENERIC_DECODER_H_ |
| 13 | 13 |
| 14 #include "webrtc/base/criticalsection.h" | |
| 15 #include "webrtc/base/thread_checker.h" | |
| 16 #include "webrtc/modules/include/module_common_types.h" | 14 #include "webrtc/modules/include/module_common_types.h" |
| 17 #include "webrtc/modules/video_coding/encoded_frame.h" | 15 #include "webrtc/modules/video_coding/encoded_frame.h" |
| 18 #include "webrtc/modules/video_coding/include/video_codec_interface.h" | 16 #include "webrtc/modules/video_coding/include/video_codec_interface.h" |
| 19 #include "webrtc/modules/video_coding/timestamp_map.h" | 17 #include "webrtc/modules/video_coding/timestamp_map.h" |
| 20 #include "webrtc/modules/video_coding/timing.h" | 18 #include "webrtc/modules/video_coding/timing.h" |
| 19 #include "webrtc/rtc_base/criticalsection.h" |
| 20 #include "webrtc/rtc_base/thread_checker.h" |
| 21 | 21 |
| 22 namespace webrtc { | 22 namespace webrtc { |
| 23 | 23 |
| 24 class VCMReceiveCallback; | 24 class VCMReceiveCallback; |
| 25 | 25 |
| 26 enum { kDecoderFrameMemoryLength = 10 }; | 26 enum { kDecoderFrameMemoryLength = 10 }; |
| 27 | 27 |
| 28 struct VCMFrameInformation { | 28 struct VCMFrameInformation { |
| 29 int64_t renderTimeMs; | 29 int64_t renderTimeMs; |
| 30 int64_t decodeStartTimeMs; | 30 int64_t decodeStartTimeMs; |
| (...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 111 VideoDecoder* const _decoder; | 111 VideoDecoder* const _decoder; |
| 112 VideoCodecType _codecType; | 112 VideoCodecType _codecType; |
| 113 bool _isExternal; | 113 bool _isExternal; |
| 114 bool _keyFrameDecoded; | 114 bool _keyFrameDecoded; |
| 115 VideoContentType _last_keyframe_content_type; | 115 VideoContentType _last_keyframe_content_type; |
| 116 }; | 116 }; |
| 117 | 117 |
| 118 } // namespace webrtc | 118 } // namespace webrtc |
| 119 | 119 |
| 120 #endif // WEBRTC_MODULES_VIDEO_CODING_GENERIC_DECODER_H_ | 120 #endif // WEBRTC_MODULES_VIDEO_CODING_GENERIC_DECODER_H_ |
| OLD | NEW |