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 |
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
62 // Protect |_timestampMap|. | 62 // Protect |_timestampMap|. |
63 Clock* const _clock; | 63 Clock* const _clock; |
64 // This callback must be set before the decoder thread starts running | 64 // This callback must be set before the decoder thread starts running |
65 // and must only be unset when external threads (e.g decoder thread) | 65 // and must only be unset when external threads (e.g decoder thread) |
66 // have been stopped. Due to that, the variable should regarded as const | 66 // have been stopped. Due to that, the variable should regarded as const |
67 // while there are more than one threads involved, it must be set | 67 // while there are more than one threads involved, it must be set |
68 // from the same thread, and therfore a lock is not required to access it. | 68 // from the same thread, and therfore a lock is not required to access it. |
69 VCMReceiveCallback* _receiveCallback = nullptr; | 69 VCMReceiveCallback* _receiveCallback = nullptr; |
70 VCMTiming* _timing; | 70 VCMTiming* _timing; |
71 rtc::CriticalSection lock_; | 71 rtc::CriticalSection lock_; |
72 VCMTimestampMap _timestampMap GUARDED_BY(lock_); | 72 VCMTimestampMap _timestampMap RTC_GUARDED_BY(lock_); |
73 uint64_t _lastReceivedPictureID; | 73 uint64_t _lastReceivedPictureID; |
74 int64_t ntp_offset_; | 74 int64_t ntp_offset_; |
75 }; | 75 }; |
76 | 76 |
77 class VCMGenericDecoder { | 77 class VCMGenericDecoder { |
78 public: | 78 public: |
79 explicit VCMGenericDecoder(VideoDecoder* decoder, bool isExternal = false); | 79 explicit VCMGenericDecoder(VideoDecoder* decoder, bool isExternal = false); |
80 ~VCMGenericDecoder(); | 80 ~VCMGenericDecoder(); |
81 | 81 |
82 /** | 82 /** |
(...skipping 25 matching lines...) Expand all Loading... |
108 uint32_t _nextFrameInfoIdx; | 108 uint32_t _nextFrameInfoIdx; |
109 std::unique_ptr<VideoDecoder> decoder_; | 109 std::unique_ptr<VideoDecoder> decoder_; |
110 VideoCodecType _codecType; | 110 VideoCodecType _codecType; |
111 const bool _isExternal; | 111 const bool _isExternal; |
112 VideoContentType _last_keyframe_content_type; | 112 VideoContentType _last_keyframe_content_type; |
113 }; | 113 }; |
114 | 114 |
115 } // namespace webrtc | 115 } // namespace webrtc |
116 | 116 |
117 #endif // WEBRTC_MODULES_VIDEO_CODING_GENERIC_DECODER_H_ | 117 #endif // WEBRTC_MODULES_VIDEO_CODING_GENERIC_DECODER_H_ |
OLD | NEW |