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 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
54 | 54 |
55 struct VCMFrameCount { | 55 struct VCMFrameCount { |
56 uint32_t numKeyFrames; | 56 uint32_t numKeyFrames; |
57 uint32_t numDeltaFrames; | 57 uint32_t numDeltaFrames; |
58 }; | 58 }; |
59 | 59 |
60 // Callback class used for passing decoded frames which are ready to be | 60 // Callback class used for passing decoded frames which are ready to be |
61 // rendered. | 61 // rendered. |
62 class VCMReceiveCallback { | 62 class VCMReceiveCallback { |
63 public: | 63 public: |
| 64 // TODO(ilnik): Once deprecation is complete, change this to pure virtual. |
64 virtual int32_t FrameToRender(VideoFrame& videoFrame, // NOLINT | 65 virtual int32_t FrameToRender(VideoFrame& videoFrame, // NOLINT |
65 rtc::Optional<uint8_t> qp) = 0; | 66 rtc::Optional<uint8_t> qp, |
| 67 VideoContentType /*content_type*/) { |
| 68 return FrameToRender(videoFrame, qp); |
| 69 } |
| 70 // DEPRECATED. Use the other overloaded version. |
| 71 virtual int32_t FrameToRender(VideoFrame& videoFrame, // NOLINT |
| 72 rtc::Optional<uint8_t> qp) { |
| 73 return -1; |
| 74 } |
66 virtual int32_t ReceivedDecodedReferenceFrame(const uint64_t pictureId) { | 75 virtual int32_t ReceivedDecodedReferenceFrame(const uint64_t pictureId) { |
67 return -1; | 76 return -1; |
68 } | 77 } |
69 // Called when the current receive codec changes. | 78 // Called when the current receive codec changes. |
70 virtual void OnIncomingPayloadType(int payload_type) {} | 79 virtual void OnIncomingPayloadType(int payload_type) {} |
71 virtual void OnDecoderImplementationName(const char* implementation_name) {} | 80 virtual void OnDecoderImplementationName(const char* implementation_name) {} |
72 | 81 |
73 protected: | 82 protected: |
74 virtual ~VCMReceiveCallback() {} | 83 virtual ~VCMReceiveCallback() {} |
75 }; | 84 }; |
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
155 public: | 164 public: |
156 virtual void RequestKeyFrame() = 0; | 165 virtual void RequestKeyFrame() = 0; |
157 | 166 |
158 protected: | 167 protected: |
159 virtual ~KeyFrameRequestSender() {} | 168 virtual ~KeyFrameRequestSender() {} |
160 }; | 169 }; |
161 | 170 |
162 } // namespace webrtc | 171 } // namespace webrtc |
163 | 172 |
164 #endif // WEBRTC_MODULES_VIDEO_CODING_INCLUDE_VIDEO_CODING_DEFINES_H_ | 173 #endif // WEBRTC_MODULES_VIDEO_CODING_INCLUDE_VIDEO_CODING_DEFINES_H_ |
OLD | NEW |