| 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..00f925e96a3a5cd18a8cf082189e30da0e05e33b 100644 | 
| --- a/webrtc/modules/video_coding/generic_decoder.h | 
| +++ b/webrtc/modules/video_coding/generic_decoder.h | 
| @@ -17,98 +17,94 @@ | 
| #include "webrtc/modules/video_coding/timestamp_map.h" | 
| #include "webrtc/modules/video_coding/timing.h" | 
|  | 
| -namespace webrtc | 
| -{ | 
| +namespace webrtc { | 
|  | 
| class VCMReceiveCallback; | 
|  | 
| enum { kDecoderFrameMemoryLength = 10 }; | 
|  | 
| -struct VCMFrameInformation | 
| -{ | 
| -    int64_t     renderTimeMs; | 
| -    int64_t     decodeStartTimeMs; | 
| -    void*             userData; | 
| -    VideoRotation rotation; | 
| +struct VCMFrameInformation { | 
| +  int64_t renderTimeMs; | 
| +  int64_t decodeStartTimeMs; | 
| +  void* userData; | 
| +  VideoRotation rotation; | 
| }; | 
|  | 
| -class VCMDecodedFrameCallback : public DecodedImageCallback | 
| -{ | 
| -public: | 
| -    VCMDecodedFrameCallback(VCMTiming& timing, Clock* clock); | 
| -    virtual ~VCMDecodedFrameCallback(); | 
| -    void SetUserReceiveCallback(VCMReceiveCallback* receiveCallback); | 
| -    VCMReceiveCallback* UserReceiveCallback(); | 
| - | 
| -    virtual int32_t Decoded(VideoFrame& decodedImage); | 
| -    virtual int32_t Decoded(VideoFrame& decodedImage, int64_t decode_time_ms); | 
| -    virtual int32_t ReceivedDecodedReferenceFrame(const uint64_t pictureId); | 
| -    virtual int32_t ReceivedDecodedFrame(const uint64_t pictureId); | 
| - | 
| -    uint64_t LastReceivedPictureID() const; | 
| - | 
| -    void Map(uint32_t timestamp, VCMFrameInformation* frameInfo); | 
| -    int32_t Pop(uint32_t timestamp); | 
| - | 
| -private: | 
| -    // Protect |_receiveCallback| and |_timestampMap|. | 
| -    CriticalSectionWrapper* _critSect; | 
| -    Clock* _clock; | 
| -    VCMReceiveCallback* _receiveCallback;  // Guarded by |_critSect|. | 
| -    VCMTiming& _timing; | 
| -    VCMTimestampMap _timestampMap;  // Guarded by |_critSect|. | 
| -    uint64_t _lastReceivedPictureID; | 
| +class VCMDecodedFrameCallback : public DecodedImageCallback { | 
| + public: | 
| +  VCMDecodedFrameCallback(VCMTiming* timing, Clock* clock); | 
| +  virtual ~VCMDecodedFrameCallback(); | 
| +  void SetUserReceiveCallback(VCMReceiveCallback* receiveCallback); | 
| +  VCMReceiveCallback* UserReceiveCallback(); | 
| + | 
| +  virtual int32_t Decoded(VideoFrame& decodedImage);  // NOLINT | 
| +  virtual int32_t Decoded(VideoFrame& decodedImage,  // NOLINT | 
| +                          int64_t decode_time_ms); | 
| +  virtual int32_t ReceivedDecodedReferenceFrame(const uint64_t pictureId); | 
| +  virtual int32_t ReceivedDecodedFrame(const uint64_t pictureId); | 
| + | 
| +  uint64_t LastReceivedPictureID() const; | 
| + | 
| +  void Map(uint32_t timestamp, VCMFrameInformation* frameInfo); | 
| +  int32_t Pop(uint32_t timestamp); | 
| + | 
| + private: | 
| +  // Protect |_receiveCallback| and |_timestampMap|. | 
| +  CriticalSectionWrapper* _critSect; | 
| +  Clock* _clock; | 
| +  VCMReceiveCallback* _receiveCallback;  // Guarded by |_critSect|. | 
| +  VCMTiming* _timing; | 
| +  VCMTimestampMap _timestampMap;  // Guarded by |_critSect|. | 
| +  uint64_t _lastReceivedPictureID; | 
| }; | 
|  | 
| - | 
| -class VCMGenericDecoder | 
| -{ | 
| -    friend class VCMCodecDataBase; | 
| -public: | 
| -    VCMGenericDecoder(VideoDecoder* decoder, bool isExternal = false); | 
| -    ~VCMGenericDecoder(); | 
| - | 
| -    /** | 
| -    * Initialize the decoder with the information from the VideoCodec | 
| -    */ | 
| -    int32_t InitDecode(const VideoCodec* settings, | 
| -                             int32_t numberOfCores); | 
| - | 
| -    /** | 
| -    * Decode to a raw I420 frame, | 
| -    * | 
| -    * inputVideoBuffer reference to encoded video frame | 
| -    */ | 
| -    int32_t Decode(const VCMEncodedFrame& inputFrame, int64_t nowMs); | 
| - | 
| -    /** | 
| -    * Free the decoder memory | 
| -    */ | 
| -    int32_t Release(); | 
| - | 
| -    /** | 
| -    * Reset the decoder state, prepare for a new call | 
| -    */ | 
| -    int32_t Reset(); | 
| - | 
| -    /** | 
| -    * Set decode callback. Deregistering while decoding is illegal. | 
| -    */ | 
| -    int32_t RegisterDecodeCompleteCallback(VCMDecodedFrameCallback* callback); | 
| - | 
| -    bool External() const; | 
| -    bool PrefersLateDecoding() const; | 
| - | 
| -private: | 
| -    VCMDecodedFrameCallback*    _callback; | 
| -    VCMFrameInformation         _frameInfos[kDecoderFrameMemoryLength]; | 
| -    uint32_t                    _nextFrameInfoIdx; | 
| -    VideoDecoder* const         _decoder; | 
| -    VideoCodecType              _codecType; | 
| -    bool                        _isExternal; | 
| -    bool                        _keyFrameDecoded; | 
| +class VCMGenericDecoder { | 
| +  friend class VCMCodecDataBase; | 
| + | 
| + public: | 
| +  explicit VCMGenericDecoder(VideoDecoder* decoder, bool isExternal = false); | 
| +  ~VCMGenericDecoder(); | 
| + | 
| +  /** | 
| +  * Initialize the decoder with the information from the VideoCodec | 
| +  */ | 
| +  int32_t InitDecode(const VideoCodec* settings, int32_t numberOfCores); | 
| + | 
| +  /** | 
| +  * Decode to a raw I420 frame, | 
| +  * | 
| +  * inputVideoBuffer reference to encoded video frame | 
| +  */ | 
| +  int32_t Decode(const VCMEncodedFrame& inputFrame, int64_t nowMs); | 
| + | 
| +  /** | 
| +  * Free the decoder memory | 
| +  */ | 
| +  int32_t Release(); | 
| + | 
| +  /** | 
| +  * Reset the decoder state, prepare for a new call | 
| +  */ | 
| +  int32_t Reset(); | 
| + | 
| +  /** | 
| +  * Set decode callback. Deregistering while decoding is illegal. | 
| +  */ | 
| +  int32_t RegisterDecodeCompleteCallback(VCMDecodedFrameCallback* callback); | 
| + | 
| +  bool External() const; | 
| +  bool PrefersLateDecoding() const; | 
| + | 
| + private: | 
| +  VCMDecodedFrameCallback* _callback; | 
| +  VCMFrameInformation _frameInfos[kDecoderFrameMemoryLength]; | 
| +  uint32_t _nextFrameInfoIdx; | 
| +  VideoDecoder* const _decoder; | 
| +  VideoCodecType _codecType; | 
| +  bool _isExternal; | 
| +  bool _keyFrameDecoded; | 
| }; | 
|  | 
| }  // namespace webrtc | 
|  | 
| -#endif // WEBRTC_MODULES_VIDEO_CODING_GENERIC_DECODER_H_ | 
| +#endif  // WEBRTC_MODULES_VIDEO_CODING_GENERIC_DECODER_H_ | 
|  |