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