| 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; | |
| 62 // Implements VCMReceiveCallback. | 60 // Implements VCMReceiveCallback. |
| 63 int32_t FrameToRender(VideoFrame& video_frame, | 61 int32_t FrameToRender(VideoFrame& video_frame, |
| 64 rtc::Optional<uint8_t> qp, | 62 rtc::Optional<uint8_t> qp, |
| 65 VideoContentType content_type) override; | 63 VideoContentType content_type) override; |
| 66 int32_t ReceivedDecodedReferenceFrame(const uint64_t picture_id) override; | 64 int32_t ReceivedDecodedReferenceFrame(const uint64_t picture_id) override; |
| 67 void OnIncomingPayloadType(int payload_type) override; | 65 void OnIncomingPayloadType(int payload_type) override; |
| 68 void OnDecoderImplementationName(const char* implementation_name) override; | 66 void OnDecoderImplementationName(const char* implementation_name) override; |
| 69 | 67 |
| 70 // Implements VCMReceiveStatisticsCallback. | 68 // Implements VCMReceiveStatisticsCallback. |
| 71 void OnReceiveRatesUpdated(uint32_t bit_rate, uint32_t frame_rate) override; | 69 void OnReceiveRatesUpdated(uint32_t bit_rate, uint32_t frame_rate) override; |
| (...skipping 22 matching lines...) Expand all Loading... |
| 94 | 92 |
| 95 ReceiveStatisticsProxy* const receive_stats_callback_; | 93 ReceiveStatisticsProxy* const receive_stats_callback_; |
| 96 rtc::VideoSinkInterface<VideoFrame>* const incoming_video_stream_; | 94 rtc::VideoSinkInterface<VideoFrame>* const incoming_video_stream_; |
| 97 | 95 |
| 98 int64_t last_rtt_ms_ GUARDED_BY(crit_); | 96 int64_t last_rtt_ms_ GUARDED_BY(crit_); |
| 99 }; | 97 }; |
| 100 | 98 |
| 101 } // namespace webrtc | 99 } // namespace webrtc |
| 102 | 100 |
| 103 #endif // WEBRTC_VIDEO_VIDEO_STREAM_DECODER_H_ | 101 #endif // WEBRTC_VIDEO_VIDEO_STREAM_DECODER_H_ |
| OLD | NEW |