| 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 19 matching lines...) Expand all  Loading... | 
| 30   VideoRotation rotation; | 30   VideoRotation rotation; | 
| 31 }; | 31 }; | 
| 32 | 32 | 
| 33 class VCMDecodedFrameCallback : public DecodedImageCallback { | 33 class VCMDecodedFrameCallback : public DecodedImageCallback { | 
| 34  public: | 34  public: | 
| 35   VCMDecodedFrameCallback(VCMTiming* timing, Clock* clock); | 35   VCMDecodedFrameCallback(VCMTiming* timing, Clock* clock); | 
| 36     virtual ~VCMDecodedFrameCallback(); | 36     virtual ~VCMDecodedFrameCallback(); | 
| 37     void SetUserReceiveCallback(VCMReceiveCallback* receiveCallback); | 37     void SetUserReceiveCallback(VCMReceiveCallback* receiveCallback); | 
| 38     VCMReceiveCallback* UserReceiveCallback(); | 38     VCMReceiveCallback* UserReceiveCallback(); | 
| 39 | 39 | 
| 40     int32_t Decoded(VideoFrame& decodedImage) override; | 40     virtual int32_t Decoded(VideoFrame& decodedImage);  // NOLINT | 
| 41     int32_t Decoded(VideoFrame& decodedImage, int64_t decode_time_ms) override; | 41     virtual int32_t Decoded(VideoFrame& decodedImage,   // NOLINT | 
| 42     void Decoded(VideoFrame& decodedImage, | 42                             int64_t decode_time_ms); | 
| 43                  rtc::Optional<int32_t> decode_time_ms, | 43     virtual int32_t ReceivedDecodedReferenceFrame(const uint64_t pictureId); | 
| 44                  rtc::Optional<uint8_t> qp) override; | 44     virtual int32_t ReceivedDecodedFrame(const uint64_t pictureId); | 
| 45     int32_t ReceivedDecodedReferenceFrame(const uint64_t pictureId) override; |  | 
| 46     int32_t ReceivedDecodedFrame(const uint64_t pictureId) override; |  | 
| 47 | 45 | 
| 48     uint64_t LastReceivedPictureID() const; | 46     uint64_t LastReceivedPictureID() const; | 
| 49     void OnDecoderImplementationName(const char* implementation_name); | 47     void OnDecoderImplementationName(const char* implementation_name); | 
| 50 | 48 | 
| 51     void Map(uint32_t timestamp, VCMFrameInformation* frameInfo); | 49     void Map(uint32_t timestamp, VCMFrameInformation* frameInfo); | 
| 52     int32_t Pop(uint32_t timestamp); | 50     int32_t Pop(uint32_t timestamp); | 
| 53 | 51 | 
| 54  private: | 52  private: | 
| 55     // Protect |_receiveCallback| and |_timestampMap|. | 53     // Protect |_receiveCallback| and |_timestampMap|. | 
| 56     CriticalSectionWrapper* _critSect; | 54     CriticalSectionWrapper* _critSect; | 
| (...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 99   uint32_t _nextFrameInfoIdx; | 97   uint32_t _nextFrameInfoIdx; | 
| 100   VideoDecoder* const _decoder; | 98   VideoDecoder* const _decoder; | 
| 101   VideoCodecType _codecType; | 99   VideoCodecType _codecType; | 
| 102   bool _isExternal; | 100   bool _isExternal; | 
| 103   bool _keyFrameDecoded; | 101   bool _keyFrameDecoded; | 
| 104 }; | 102 }; | 
| 105 | 103 | 
| 106 }  // namespace webrtc | 104 }  // namespace webrtc | 
| 107 | 105 | 
| 108 #endif  // WEBRTC_MODULES_VIDEO_CODING_GENERIC_DECODER_H_ | 106 #endif  // WEBRTC_MODULES_VIDEO_CODING_GENERIC_DECODER_H_ | 
| OLD | NEW | 
|---|