Chromium Code Reviews| Index: webrtc/modules/video_coding/main/source/generic_decoder.h |
| diff --git a/webrtc/modules/video_coding/main/source/generic_decoder.h b/webrtc/modules/video_coding/main/source/generic_decoder.h |
| index 09929e64f47b081b1c63e5c43afb350c331634f6..11bb76b96d99cd67b511f71940d7da9286a8c58e 100644 |
| --- a/webrtc/modules/video_coding/main/source/generic_decoder.h |
| +++ b/webrtc/modules/video_coding/main/source/generic_decoder.h |
| @@ -45,6 +45,7 @@ public: |
| virtual int32_t ReceivedDecodedFrame(const uint64_t pictureId); |
| uint64_t LastReceivedPictureID() const; |
| + void OnDecoderImplementationName(const char* implementation_name); |
|
hta-webrtc
2015/10/29 11:35:03
This implies that collecting implementation name d
pbos-webrtc
2015/10/29 16:08:05
No, this will only be called on the encoding threa
|
| void Map(uint32_t timestamp, VCMFrameInformation* frameInfo); |
| int32_t Pop(uint32_t timestamp); |
| @@ -53,9 +54,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; |
| }; |