Chromium Code Reviews| 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 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 53 VCMFrameTypeCallback* vcm_frame_type_callback, | 53 VCMFrameTypeCallback* vcm_frame_type_callback, | 
| 54 VCMPacketRequestCallback* vcm_packet_request_callback, | 54 VCMPacketRequestCallback* vcm_packet_request_callback, | 
| 55 bool enable_nack, | 55 bool enable_nack, | 
| 56 bool enable_fec, | 56 bool enable_fec, | 
| 57 ReceiveStatisticsProxy* receive_statistics_proxy, | 57 ReceiveStatisticsProxy* receive_statistics_proxy, | 
| 58 rtc::VideoSinkInterface<VideoFrame>* incoming_video_stream, | 58 rtc::VideoSinkInterface<VideoFrame>* incoming_video_stream, | 
| 59 I420FrameCallback* pre_render_callback); | 59 I420FrameCallback* pre_render_callback); | 
| 60 ~VideoStreamDecoder(); | 60 ~VideoStreamDecoder(); | 
| 61 | 61 | 
| 62 // Implements VCMReceiveCallback. | 62 // Implements VCMReceiveCallback. | 
| 63 int32_t FrameToRender(VideoFrame& video_frame) override; // NOLINT | 63 int32_t FrameToRender(VideoFrame& video_frame, int qp) override; // NOLINT | 
| 
 
hbos
2017/01/25 11:31:13
rtc::Optional<uint64_t>
 
 | |
| 64 int32_t ReceivedDecodedReferenceFrame(const uint64_t picture_id) override; | 64 int32_t ReceivedDecodedReferenceFrame(const uint64_t picture_id) override; | 
| 65 void OnIncomingPayloadType(int payload_type) override; | 65 void OnIncomingPayloadType(int payload_type) override; | 
| 66 void OnDecoderImplementationName(const char* implementation_name) override; | 66 void OnDecoderImplementationName(const char* implementation_name) override; | 
| 67 | 67 | 
| 68 // Implements VCMReceiveStatisticsCallback. | 68 // Implements VCMReceiveStatisticsCallback. | 
| 69 void OnReceiveRatesUpdated(uint32_t bit_rate, uint32_t frame_rate) override; | 69 void OnReceiveRatesUpdated(uint32_t bit_rate, uint32_t frame_rate) override; | 
| 70 void OnDiscardedPacketsUpdated(int discarded_packets) override; | 70 void OnDiscardedPacketsUpdated(int discarded_packets) override; | 
| 71 void OnFrameCountsUpdated(const FrameCounts& frame_counts) override; | 71 void OnFrameCountsUpdated(const FrameCounts& frame_counts) override; | 
| 72 | 72 | 
| 73 // Implements VCMDecoderTimingCallback. | 73 // Implements VCMDecoderTimingCallback. | 
| (...skipping 23 matching lines...) Expand all Loading... | |
| 97 // TODO(tommi): This callback is basically the same thing as the one above. | 97 // TODO(tommi): This callback is basically the same thing as the one above. | 
| 98 // We shouldn't need to support both. | 98 // We shouldn't need to support both. | 
| 99 I420FrameCallback* const pre_render_callback_; | 99 I420FrameCallback* const pre_render_callback_; | 
| 100 | 100 | 
| 101 int64_t last_rtt_ms_ GUARDED_BY(crit_); | 101 int64_t last_rtt_ms_ GUARDED_BY(crit_); | 
| 102 }; | 102 }; | 
| 103 | 103 | 
| 104 } // namespace webrtc | 104 } // namespace webrtc | 
| 105 | 105 | 
| 106 #endif // WEBRTC_VIDEO_VIDEO_STREAM_DECODER_H_ | 106 #endif // WEBRTC_VIDEO_VIDEO_STREAM_DECODER_H_ | 
| OLD | NEW |