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 27 matching lines...) Expand all Loading... |
38 VCMDecodedFrameCallback(VCMTiming& timing, Clock* clock); | 38 VCMDecodedFrameCallback(VCMTiming& timing, Clock* clock); |
39 virtual ~VCMDecodedFrameCallback(); | 39 virtual ~VCMDecodedFrameCallback(); |
40 void SetUserReceiveCallback(VCMReceiveCallback* receiveCallback); | 40 void SetUserReceiveCallback(VCMReceiveCallback* receiveCallback); |
41 VCMReceiveCallback* UserReceiveCallback(); | 41 VCMReceiveCallback* UserReceiveCallback(); |
42 | 42 |
43 virtual int32_t Decoded(VideoFrame& decodedImage); | 43 virtual int32_t Decoded(VideoFrame& decodedImage); |
44 virtual int32_t ReceivedDecodedReferenceFrame(const uint64_t pictureId); | 44 virtual int32_t ReceivedDecodedReferenceFrame(const uint64_t pictureId); |
45 virtual int32_t ReceivedDecodedFrame(const uint64_t pictureId); | 45 virtual int32_t ReceivedDecodedFrame(const uint64_t pictureId); |
46 | 46 |
47 uint64_t LastReceivedPictureID() const; | 47 uint64_t LastReceivedPictureID() const; |
| 48 void OnDecoderImplementationName(const char* implementation_name); |
48 | 49 |
49 void Map(uint32_t timestamp, VCMFrameInformation* frameInfo); | 50 void Map(uint32_t timestamp, VCMFrameInformation* frameInfo); |
50 int32_t Pop(uint32_t timestamp); | 51 int32_t Pop(uint32_t timestamp); |
51 | 52 |
52 private: | 53 private: |
53 // Protect |_receiveCallback| and |_timestampMap|. | 54 // Protect |_receiveCallback| and |_timestampMap|. |
54 CriticalSectionWrapper* _critSect; | 55 CriticalSectionWrapper* _critSect; |
55 Clock* _clock; | 56 Clock* _clock; |
56 VCMReceiveCallback* _receiveCallback; // Guarded by |_critSect|. | 57 VCMReceiveCallback* _receiveCallback GUARDED_BY(_critSect); |
57 VCMTiming& _timing; | 58 VCMTiming& _timing; |
58 VCMTimestampMap _timestampMap; // Guarded by |_critSect|. | 59 VCMTimestampMap _timestampMap GUARDED_BY(_critSect); |
59 uint64_t _lastReceivedPictureID; | 60 uint64_t _lastReceivedPictureID; |
60 }; | 61 }; |
61 | 62 |
62 | 63 |
63 class VCMGenericDecoder | 64 class VCMGenericDecoder |
64 { | 65 { |
65 friend class VCMCodecDataBase; | 66 friend class VCMCodecDataBase; |
66 public: | 67 public: |
67 VCMGenericDecoder(VideoDecoder& decoder, bool isExternal = false); | 68 VCMGenericDecoder(VideoDecoder& decoder, bool isExternal = false); |
68 ~VCMGenericDecoder(); | 69 ~VCMGenericDecoder(); |
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
103 uint32_t _nextFrameInfoIdx; | 104 uint32_t _nextFrameInfoIdx; |
104 VideoDecoder& _decoder; | 105 VideoDecoder& _decoder; |
105 VideoCodecType _codecType; | 106 VideoCodecType _codecType; |
106 bool _isExternal; | 107 bool _isExternal; |
107 bool _keyFrameDecoded; | 108 bool _keyFrameDecoded; |
108 }; | 109 }; |
109 | 110 |
110 } // namespace webrtc | 111 } // namespace webrtc |
111 | 112 |
112 #endif // WEBRTC_MODULES_VIDEO_CODING_GENERIC_DECODER_H_ | 113 #endif // WEBRTC_MODULES_VIDEO_CODING_GENERIC_DECODER_H_ |
OLD | NEW |