zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added override keyword to overridden methods to stop compiler warnings.

Browse Source 
BUG=

Review URL: https://codereview.webrtc.org/1417543002

Cr-Commit-Position: refs/heads/master@{#10433}
This commit is contained in:
rlester
2015-10-27 14:22:16 -07:00
committed by Commit bot
parent fce4a945b8
commit ec9d187f70
2 changed files with 41 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
talk/media/webrtc/webrtcvideoframe.h
View File

@ -79,10 +79,10 @@ class WebRtcVideoFrame : public VideoFrame {
int64_t elapsed_time_ns, int64_t time_stamp_ns);
bool InitToBlack(int w, int h, size_t pixel_width, size_t pixel_height,
int64_t time_stamp_ns);
int64_t time_stamp_ns) override;
// From base class VideoFrame.
virtual bool Reset(uint32_t format,
bool Reset(uint32_t format,
int w,
int h,
int dw,
@ -93,39 +93,41 @@ class WebRtcVideoFrame : public VideoFrame {
size_t pixel_height,
int64_t time_stamp_ns,
webrtc::VideoRotation rotation,
bool apply_rotation);
bool apply_rotation) override;
virtual size_t GetWidth() const;
virtual size_t GetHeight() const;
virtual const uint8_t* GetYPlane() const;
virtual const uint8_t* GetUPlane() const;
virtual const uint8_t* GetVPlane() const;
virtual uint8_t* GetYPlane();
virtual uint8_t* GetUPlane();
virtual uint8_t* GetVPlane();
virtual int32_t GetYPitch() const;
virtual int32_t GetUPitch() const;
virtual int32_t GetVPitch() const;
virtual void* GetNativeHandle() const;
virtual rtc::scoped_refptr<webrtc::VideoFrameBuffer> GetVideoFrameBuffer()
const;
size_t GetWidth() const override;
size_t GetHeight() const override;
const uint8_t* GetYPlane() const override;
const uint8_t* GetUPlane() const override;
const uint8_t* GetVPlane() const override;
uint8_t* GetYPlane() override;
uint8_t* GetUPlane() override;
uint8_t* GetVPlane() override;
int32_t GetYPitch() const override;
int32_t GetUPitch() const override;
int32_t GetVPitch() const override;
void* GetNativeHandle() const override;
rtc::scoped_refptr<webrtc::VideoFrameBuffer> GetVideoFrameBuffer()
const override;
virtual size_t GetPixelWidth() const { return pixel_width_; }
virtual size_t GetPixelHeight() const { return pixel_height_; }
virtual int64_t GetTimeStamp() const { return time_stamp_ns_; }
virtual void SetTimeStamp(int64_t time_stamp_ns) {
size_t GetPixelWidth() const override { return pixel_width_; }
size_t GetPixelHeight() const override { return pixel_height_; }
int64_t GetTimeStamp() const override { return time_stamp_ns_; }
void SetTimeStamp(int64_t time_stamp_ns) override {
time_stamp_ns_ = time_stamp_ns;
}
virtual webrtc::VideoRotation GetVideoRotation() const { return rotation_; }
webrtc::VideoRotation GetVideoRotation() const override {
return rotation_;
}
virtual VideoFrame* Copy() const;
virtual bool IsExclusive() const;
virtual bool MakeExclusive();
virtual size_t ConvertToRgbBuffer(uint32_t to_fourcc,
uint8_t* buffer,
size_t size,
int stride_rgb) const;
VideoFrame* Copy() const override;
bool IsExclusive() const override;
bool MakeExclusive() override;
size_t ConvertToRgbBuffer(uint32_t to_fourcc,
uint8_t* buffer,
size_t size,
int stride_rgb) const override;
const VideoFrame* GetCopyWithRotationApplied() const override;
@ -135,9 +137,9 @@ class WebRtcVideoFrame : public VideoFrame {
}
private:
virtual VideoFrame* CreateEmptyFrame(int w, int h, size_t pixel_width,
size_t pixel_height,
int64_t time_stamp_ns) const;
VideoFrame* CreateEmptyFrame(int w, int h, size_t pixel_width,
size_t pixel_height,
int64_t time_stamp_ns) const override;
// An opaque reference counted handle that stores the pixel data.
rtc::scoped_refptr<webrtc::VideoFrameBuffer> video_frame_buffer_;

12
talk/session/media/channel.h
View File

@ -164,7 +164,8 @@ class BaseChannel
void SetReadyToSend(bool rtcp, bool ready);
// Only public for unit tests. Otherwise, consider protected.
virtual int SetOption(SocketType type, rtc::Socket::Option o, int val);
int SetOption(SocketType type, rtc::Socket::Option o, int val)
override;
SrtpFilter* srtp_filter() { return &srtp_filter_; }
@ -198,9 +199,10 @@ class BaseChannel
void FlushRtcpMessages();
// NetworkInterface implementation, called by MediaEngine
virtual bool SendPacket(rtc::Buffer* packet,
const rtc::PacketOptions& options);
virtual bool SendRtcp(rtc::Buffer* packet, const rtc::PacketOptions& options);
bool SendPacket(rtc::Buffer* packet,
const rtc::PacketOptions& options) override;
bool SendRtcp(rtc::Buffer* packet, const rtc::PacketOptions& options)
override;
// From TransportChannel
void OnWritableState(TransportChannel* channel);
@ -277,7 +279,7 @@ class BaseChannel
std::string* error_desc);
// From MessageHandler
virtual void OnMessage(rtc::Message* pmsg);
void OnMessage(rtc::Message* pmsg) override;
// Handled in derived classes
// Get the SRTP ciphers to use for RTP media