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 12 matching lines...) Loading... |
23 | 23 |
24 class VCMReceiveCallback; | 24 class VCMReceiveCallback; |
25 | 25 |
26 enum { kDecoderFrameMemoryLength = 10 }; | 26 enum { kDecoderFrameMemoryLength = 10 }; |
27 | 27 |
28 struct VCMFrameInformation { | 28 struct VCMFrameInformation { |
29 int64_t renderTimeMs; | 29 int64_t renderTimeMs; |
30 int64_t decodeStartTimeMs; | 30 int64_t decodeStartTimeMs; |
31 void* userData; | 31 void* userData; |
32 VideoRotation rotation; | 32 VideoRotation rotation; |
| 33 VideoContentType content_type; |
33 }; | 34 }; |
34 | 35 |
35 class VCMDecodedFrameCallback : public DecodedImageCallback { | 36 class VCMDecodedFrameCallback : public DecodedImageCallback { |
36 public: | 37 public: |
37 VCMDecodedFrameCallback(VCMTiming* timing, Clock* clock); | 38 VCMDecodedFrameCallback(VCMTiming* timing, Clock* clock); |
38 ~VCMDecodedFrameCallback() override; | 39 ~VCMDecodedFrameCallback() override; |
39 void SetUserReceiveCallback(VCMReceiveCallback* receiveCallback); | 40 void SetUserReceiveCallback(VCMReceiveCallback* receiveCallback); |
40 VCMReceiveCallback* UserReceiveCallback(); | 41 VCMReceiveCallback* UserReceiveCallback(); |
41 | 42 |
42 int32_t Decoded(VideoFrame& decodedImage) override; | 43 int32_t Decoded(VideoFrame& decodedImage) override; |
(...skipping 59 matching lines...) Loading... |
102 bool PrefersLateDecoding() const; | 103 bool PrefersLateDecoding() const; |
103 | 104 |
104 private: | 105 private: |
105 VCMDecodedFrameCallback* _callback; | 106 VCMDecodedFrameCallback* _callback; |
106 VCMFrameInformation _frameInfos[kDecoderFrameMemoryLength]; | 107 VCMFrameInformation _frameInfos[kDecoderFrameMemoryLength]; |
107 uint32_t _nextFrameInfoIdx; | 108 uint32_t _nextFrameInfoIdx; |
108 VideoDecoder* const _decoder; | 109 VideoDecoder* const _decoder; |
109 VideoCodecType _codecType; | 110 VideoCodecType _codecType; |
110 bool _isExternal; | 111 bool _isExternal; |
111 bool _keyFrameDecoded; | 112 bool _keyFrameDecoded; |
| 113 VideoContentType _last_keyframe_content_type; |
112 }; | 114 }; |
113 | 115 |
114 } // namespace webrtc | 116 } // namespace webrtc |
115 | 117 |
116 #endif // WEBRTC_MODULES_VIDEO_CODING_GENERIC_DECODER_H_ | 118 #endif // WEBRTC_MODULES_VIDEO_CODING_GENERIC_DECODER_H_ |
OLD | NEW |