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 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
50 VideoStreamDecoder( | 50 VideoStreamDecoder( |
51 vcm::VideoReceiver* video_receiver, | 51 vcm::VideoReceiver* video_receiver, |
52 VCMFrameTypeCallback* vcm_frame_type_callback, | 52 VCMFrameTypeCallback* vcm_frame_type_callback, |
53 VCMPacketRequestCallback* vcm_packet_request_callback, | 53 VCMPacketRequestCallback* vcm_packet_request_callback, |
54 bool enable_nack, | 54 bool enable_nack, |
55 bool enable_fec, | 55 bool enable_fec, |
56 ReceiveStatisticsProxy* receive_statistics_proxy, | 56 ReceiveStatisticsProxy* receive_statistics_proxy, |
57 rtc::VideoSinkInterface<VideoFrame>* incoming_video_stream); | 57 rtc::VideoSinkInterface<VideoFrame>* incoming_video_stream); |
58 ~VideoStreamDecoder(); | 58 ~VideoStreamDecoder(); |
59 | 59 |
| 60 // TODO(ilnik): remove this once deprecated API is removed. |
| 61 using VCMReceiveCallback::FrameToRender; |
60 // Implements VCMReceiveCallback. | 62 // Implements VCMReceiveCallback. |
61 int32_t FrameToRender(VideoFrame& video_frame, | 63 int32_t FrameToRender(VideoFrame& video_frame, |
62 rtc::Optional<uint8_t> qp) override; | 64 rtc::Optional<uint8_t> qp, |
| 65 VideoContentType content_type) override; |
63 int32_t ReceivedDecodedReferenceFrame(const uint64_t picture_id) override; | 66 int32_t ReceivedDecodedReferenceFrame(const uint64_t picture_id) override; |
64 void OnIncomingPayloadType(int payload_type) override; | 67 void OnIncomingPayloadType(int payload_type) override; |
65 void OnDecoderImplementationName(const char* implementation_name) override; | 68 void OnDecoderImplementationName(const char* implementation_name) override; |
66 | 69 |
67 // Implements VCMReceiveStatisticsCallback. | 70 // Implements VCMReceiveStatisticsCallback. |
68 void OnReceiveRatesUpdated(uint32_t bit_rate, uint32_t frame_rate) override; | 71 void OnReceiveRatesUpdated(uint32_t bit_rate, uint32_t frame_rate) override; |
69 void OnDiscardedPacketsUpdated(int discarded_packets) override; | 72 void OnDiscardedPacketsUpdated(int discarded_packets) override; |
70 void OnFrameCountsUpdated(const FrameCounts& frame_counts) override; | 73 void OnFrameCountsUpdated(const FrameCounts& frame_counts) override; |
71 void OnCompleteFrame(bool is_keyframe, size_t size_bytes) override; | 74 void OnCompleteFrame(bool is_keyframe, size_t size_bytes) override; |
72 void OnFrameBufferTimingsUpdated(int decode_ms, | 75 void OnFrameBufferTimingsUpdated(int decode_ms, |
(...skipping 18 matching lines...) Expand all Loading... |
91 | 94 |
92 ReceiveStatisticsProxy* const receive_stats_callback_; | 95 ReceiveStatisticsProxy* const receive_stats_callback_; |
93 rtc::VideoSinkInterface<VideoFrame>* const incoming_video_stream_; | 96 rtc::VideoSinkInterface<VideoFrame>* const incoming_video_stream_; |
94 | 97 |
95 int64_t last_rtt_ms_ GUARDED_BY(crit_); | 98 int64_t last_rtt_ms_ GUARDED_BY(crit_); |
96 }; | 99 }; |
97 | 100 |
98 } // namespace webrtc | 101 } // namespace webrtc |
99 | 102 |
100 #endif // WEBRTC_VIDEO_VIDEO_STREAM_DECODER_H_ | 103 #endif // WEBRTC_VIDEO_VIDEO_STREAM_DECODER_H_ |
OLD | NEW |