Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(246)

Side by Side Diff: webrtc/video/vie_channel.h

Issue 1921653002: Enable -Winconsistent-missing-override flag. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebase. Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 const uint32_t rate) override; 92 const uint32_t rate) override;
93 void OnIncomingSSRCChanged(const uint32_t ssrc) override; 93 void OnIncomingSSRCChanged(const uint32_t ssrc) override;
94 void OnIncomingCSRCChanged(const uint32_t CSRC, const bool added) override; 94 void OnIncomingCSRCChanged(const uint32_t CSRC, const bool added) override;
95 95
96 // Gets the module used by the channel. 96 // Gets the module used by the channel.
97 ViEReceiver* vie_receiver(); 97 ViEReceiver* vie_receiver();
98 98
99 CallStatsObserver* GetStatsObserver(); 99 CallStatsObserver* GetStatsObserver();
100 100
101 // Implements VCMReceiveCallback. 101 // Implements VCMReceiveCallback.
102 virtual int32_t FrameToRender(VideoFrame& video_frame); // NOLINT 102 int32_t FrameToRender(VideoFrame& video_frame) override; // NOLINT
103 103
104 // Implements VCMReceiveCallback. 104 // Implements VCMReceiveCallback.
105 virtual int32_t ReceivedDecodedReferenceFrame( 105 int32_t ReceivedDecodedReferenceFrame(const uint64_t picture_id) override;
106 const uint64_t picture_id);
107 106
108 // Implements VCMReceiveCallback. 107 // Implements VCMReceiveCallback.
109 void OnIncomingPayloadType(int payload_type) override; 108 void OnIncomingPayloadType(int payload_type) override;
110 void OnDecoderImplementationName(const char* implementation_name) override; 109 void OnDecoderImplementationName(const char* implementation_name) override;
111 110
112 // Implements VCMReceiveStatisticsCallback. 111 // Implements VCMReceiveStatisticsCallback.
113 void OnReceiveRatesUpdated(uint32_t bit_rate, uint32_t frame_rate) override; 112 void OnReceiveRatesUpdated(uint32_t bit_rate, uint32_t frame_rate) override;
114 void OnDiscardedPacketsUpdated(int discarded_packets) override; 113 void OnDiscardedPacketsUpdated(int discarded_packets) override;
115 void OnFrameCountsUpdated(const FrameCounts& frame_counts) override; 114 void OnFrameCountsUpdated(const FrameCounts& frame_counts) override;
116 115
117 // Implements VCMDecoderTimingCallback. 116 // Implements VCMDecoderTimingCallback.
118 virtual void OnDecoderTiming(int decode_ms, 117 void OnDecoderTiming(int decode_ms,
119 int max_decode_ms, 118 int max_decode_ms,
120 int current_delay_ms, 119 int current_delay_ms,
121 int target_delay_ms, 120 int target_delay_ms,
122 int jitter_buffer_ms, 121 int jitter_buffer_ms,
123 int min_playout_delay_ms, 122 int min_playout_delay_ms,
124 int render_delay_ms); 123 int render_delay_ms) override;
125 124
126 // Implements FrameTypeCallback. 125 // Implements FrameTypeCallback.
127 virtual int32_t RequestKeyFrame(); 126 int32_t RequestKeyFrame() override;
128 127
129 // Implements FrameTypeCallback. 128 // Implements FrameTypeCallback.
130 virtual int32_t SliceLossIndicationRequest( 129 int32_t SliceLossIndicationRequest(
131 const uint64_t picture_id); 130 const uint64_t picture_id) override;
132 131
133 // Implements VideoPacketRequestCallback. 132 // Implements VideoPacketRequestCallback.
134 int32_t ResendPackets(const uint16_t* sequence_numbers, 133 int32_t ResendPackets(const uint16_t* sequence_numbers,
135 uint16_t length) override; 134 uint16_t length) override;
136 135
137 void RegisterPreRenderCallback(I420FrameCallback* pre_render_callback); 136 void RegisterPreRenderCallback(I420FrameCallback* pre_render_callback);
138 137
139 void RegisterRtcpPacketTypeCounterObserver( 138 void RegisterRtcpPacketTypeCounterObserver(
140 RtcpPacketTypeCounterObserver* observer); 139 RtcpPacketTypeCounterObserver* observer);
141 void RegisterReceiveStatisticsProxy( 140 void RegisterReceiveStatisticsProxy(
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
173 172
174 int max_nack_reordering_threshold_; 173 int max_nack_reordering_threshold_;
175 I420FrameCallback* pre_render_callback_ GUARDED_BY(crit_); 174 I420FrameCallback* pre_render_callback_ GUARDED_BY(crit_);
176 175
177 int64_t last_rtt_ms_ GUARDED_BY(crit_); 176 int64_t last_rtt_ms_ GUARDED_BY(crit_);
178 }; 177 };
179 178
180 } // namespace webrtc 179 } // namespace webrtc
181 180
182 #endif // WEBRTC_VIDEO_VIE_CHANNEL_H_ 181 #endif // WEBRTC_VIDEO_VIE_CHANNEL_H_
OLDNEW
« webrtc/build/common.gypi ('K') | « webrtc/video/video_send_stream_tests.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698