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

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
« no previous file with comments | « webrtc/video/video_send_stream_tests.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 bool enable_fec, 74 bool enable_fec,
75 int payload_type_red, 75 int payload_type_red,
76 int payload_type_fec); 76 int payload_type_fec);
77 77
78 RtpState GetRtpStateForSsrc(uint32_t ssrc) const; 78 RtpState GetRtpStateForSsrc(uint32_t ssrc) const;
79 79
80 80
81 CallStatsObserver* GetStatsObserver(); 81 CallStatsObserver* GetStatsObserver();
82 82
83 // Implements VCMReceiveCallback. 83 // Implements VCMReceiveCallback.
84 virtual int32_t FrameToRender(VideoFrame& video_frame); // NOLINT 84 int32_t FrameToRender(VideoFrame& video_frame) override; // NOLINT
85 85
86 // Implements VCMReceiveCallback. 86 // Implements VCMReceiveCallback.
87 virtual int32_t ReceivedDecodedReferenceFrame( 87 int32_t ReceivedDecodedReferenceFrame(const uint64_t picture_id) override;
88 const uint64_t picture_id);
89 88
90 // Implements VCMReceiveCallback. 89 // Implements VCMReceiveCallback.
91 void OnIncomingPayloadType(int payload_type) override; 90 void OnIncomingPayloadType(int payload_type) override;
92 void OnDecoderImplementationName(const char* implementation_name) override; 91 void OnDecoderImplementationName(const char* implementation_name) override;
93 92
94 // Implements VCMReceiveStatisticsCallback. 93 // Implements VCMReceiveStatisticsCallback.
95 void OnReceiveRatesUpdated(uint32_t bit_rate, uint32_t frame_rate) override; 94 void OnReceiveRatesUpdated(uint32_t bit_rate, uint32_t frame_rate) override;
96 void OnDiscardedPacketsUpdated(int discarded_packets) override; 95 void OnDiscardedPacketsUpdated(int discarded_packets) override;
97 void OnFrameCountsUpdated(const FrameCounts& frame_counts) override; 96 void OnFrameCountsUpdated(const FrameCounts& frame_counts) override;
98 97
99 // Implements VCMDecoderTimingCallback. 98 // Implements VCMDecoderTimingCallback.
100 virtual void OnDecoderTiming(int decode_ms, 99 void OnDecoderTiming(int decode_ms,
101 int max_decode_ms, 100 int max_decode_ms,
102 int current_delay_ms, 101 int current_delay_ms,
103 int target_delay_ms, 102 int target_delay_ms,
104 int jitter_buffer_ms, 103 int jitter_buffer_ms,
105 int min_playout_delay_ms, 104 int min_playout_delay_ms,
106 int render_delay_ms); 105 int render_delay_ms) override;
107 106
108 // Implements FrameTypeCallback. 107 // Implements FrameTypeCallback.
109 virtual int32_t RequestKeyFrame(); 108 int32_t RequestKeyFrame() override;
110 109
111 // Implements FrameTypeCallback. 110 // Implements FrameTypeCallback.
112 virtual int32_t SliceLossIndicationRequest( 111 int32_t SliceLossIndicationRequest(
113 const uint64_t picture_id); 112 const uint64_t picture_id) override;
114 113
115 // Implements VideoPacketRequestCallback. 114 // Implements VideoPacketRequestCallback.
116 int32_t ResendPackets(const uint16_t* sequence_numbers, 115 int32_t ResendPackets(const uint16_t* sequence_numbers,
117 uint16_t length) override; 116 uint16_t length) override;
118 117
119 void RegisterPreRenderCallback(I420FrameCallback* pre_render_callback); 118 void RegisterPreRenderCallback(I420FrameCallback* pre_render_callback);
120 119
121 void RegisterRtcpPacketTypeCounterObserver( 120 void RegisterRtcpPacketTypeCounterObserver(
122 RtcpPacketTypeCounterObserver* observer); 121 RtcpPacketTypeCounterObserver* observer);
123 void RegisterReceiveStatisticsProxy( 122 void RegisterReceiveStatisticsProxy(
(...skipping 29 matching lines...) Expand all
153 152
154 int max_nack_reordering_threshold_; 153 int max_nack_reordering_threshold_;
155 I420FrameCallback* pre_render_callback_ GUARDED_BY(crit_); 154 I420FrameCallback* pre_render_callback_ GUARDED_BY(crit_);
156 155
157 int64_t last_rtt_ms_ GUARDED_BY(crit_); 156 int64_t last_rtt_ms_ GUARDED_BY(crit_);
158 }; 157 };
159 158
160 } // namespace webrtc 159 } // namespace webrtc
161 160
162 #endif // WEBRTC_VIDEO_VIE_CHANNEL_H_ 161 #endif // WEBRTC_VIDEO_VIE_CHANNEL_H_
OLDNEW
« no previous file with comments | « 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