| Index: webrtc/modules/video_coding/generic_decoder.h
|
| diff --git a/webrtc/modules/video_coding/generic_decoder.h b/webrtc/modules/video_coding/generic_decoder.h
|
| index 40a9845c9450ed0aec788c714f8e930eaf5b3019..b23462ffee76fc7a05d5a1d4f6168f1de85a2bca 100644
|
| --- a/webrtc/modules/video_coding/generic_decoder.h
|
| +++ b/webrtc/modules/video_coding/generic_decoder.h
|
| @@ -46,6 +46,7 @@ public:
|
| virtual int32_t ReceivedDecodedFrame(const uint64_t pictureId);
|
|
|
| uint64_t LastReceivedPictureID() const;
|
| + void OnDecoderImplementationName(const char* implementation_name);
|
|
|
| void Map(uint32_t timestamp, VCMFrameInformation* frameInfo);
|
| int32_t Pop(uint32_t timestamp);
|
| @@ -54,9 +55,9 @@ private:
|
| // Protect |_receiveCallback| and |_timestampMap|.
|
| CriticalSectionWrapper* _critSect;
|
| Clock* _clock;
|
| - VCMReceiveCallback* _receiveCallback; // Guarded by |_critSect|.
|
| + VCMReceiveCallback* _receiveCallback GUARDED_BY(_critSect);
|
| VCMTiming& _timing;
|
| - VCMTimestampMap _timestampMap; // Guarded by |_critSect|.
|
| + VCMTimestampMap _timestampMap GUARDED_BY(_critSect);
|
| uint64_t _lastReceivedPictureID;
|
| };
|
|
|
|
|