| Index: webrtc/video/vie_channel.h
|
| diff --git a/webrtc/video/vie_channel.h b/webrtc/video/vie_channel.h
|
| index 597ac5bfe0d87e47cdfeaeef6add4325cdc32668..c705ebbedeed23dc640eaf03eaa6993616baa895 100644
|
| --- a/webrtc/video/vie_channel.h
|
| +++ b/webrtc/video/vie_channel.h
|
| @@ -99,11 +99,10 @@ class ViEChannel : public VCMFrameTypeCallback,
|
| CallStatsObserver* GetStatsObserver();
|
|
|
| // Implements VCMReceiveCallback.
|
| - virtual int32_t FrameToRender(VideoFrame& video_frame); // NOLINT
|
| + int32_t FrameToRender(VideoFrame& video_frame) override; // NOLINT
|
|
|
| // Implements VCMReceiveCallback.
|
| - virtual int32_t ReceivedDecodedReferenceFrame(
|
| - const uint64_t picture_id);
|
| + int32_t ReceivedDecodedReferenceFrame(const uint64_t picture_id) override;
|
|
|
| // Implements VCMReceiveCallback.
|
| void OnIncomingPayloadType(int payload_type) override;
|
| @@ -115,20 +114,20 @@ class ViEChannel : public VCMFrameTypeCallback,
|
| void OnFrameCountsUpdated(const FrameCounts& frame_counts) override;
|
|
|
| // Implements VCMDecoderTimingCallback.
|
| - virtual void OnDecoderTiming(int decode_ms,
|
| - int max_decode_ms,
|
| - int current_delay_ms,
|
| - int target_delay_ms,
|
| - int jitter_buffer_ms,
|
| - int min_playout_delay_ms,
|
| - int render_delay_ms);
|
| + void OnDecoderTiming(int decode_ms,
|
| + int max_decode_ms,
|
| + int current_delay_ms,
|
| + int target_delay_ms,
|
| + int jitter_buffer_ms,
|
| + int min_playout_delay_ms,
|
| + int render_delay_ms) override;
|
|
|
| // Implements FrameTypeCallback.
|
| - virtual int32_t RequestKeyFrame();
|
| + int32_t RequestKeyFrame() override;
|
|
|
| // Implements FrameTypeCallback.
|
| - virtual int32_t SliceLossIndicationRequest(
|
| - const uint64_t picture_id);
|
| + int32_t SliceLossIndicationRequest(
|
| + const uint64_t picture_id) override;
|
|
|
| // Implements VideoPacketRequestCallback.
|
| int32_t ResendPackets(const uint16_t* sequence_numbers,
|
|
|