wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1118432 - Mark virtual overridden functions as MOZ_OVERRIDE in WebRTC; r=jesup

Browse Source
This commit is contained in:
Ehsan Akhgari 2015-01-06 15:17:07 -05:00
parent a5266f9380
commit ff0792ce6b
8 changed files with 67 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
media/webrtc/signaling/src/jsep/JsepSessionImpl.h
View File

@ -140,7 +140,7 @@ public:
virtual const std::string GetLastError() const MOZ_OVERRIDE;
virtual bool
IsIceControlling() const
IsIceControlling() const MOZ_OVERRIDE
{
return mIceControlling;
}
@ -178,7 +178,7 @@ public:
}
virtual nsresult
GetNegotiatedTrackPair(size_t index, const JsepTrackPair** pair) const
GetNegotiatedTrackPair(size_t index, const JsepTrackPair** pair) const MOZ_OVERRIDE
{
if (index >= mNegotiatedTrackPairs.size())
return NS_ERROR_INVALID_ARG;

2
media/webrtc/signaling/src/jsep/JsepTrackImpl.h
View File

@ -63,7 +63,7 @@ public:
return nullptr;
}
virtual std::vector<uint8_t> GetUniquePayloadTypes() const
virtual std::vector<uint8_t> GetUniquePayloadTypes() const MOZ_OVERRIDE
{
return mUniquePayloadTypes;
}

38
media/webrtc/signaling/src/media-conduit/AudioConduit.h
View File

@ -56,13 +56,13 @@ public:
* APIs used by the registered external transport to this Conduit to
* feed in received RTP Frames to the VoiceEngine for decoding
*/
virtual MediaConduitErrorCode ReceivedRTPPacket(const void *data, int len);
virtual MediaConduitErrorCode ReceivedRTPPacket(const void *data, int len) MOZ_OVERRIDE;
/**
* APIs used by the registered external transport to this Conduit to
* feed in received RTCP Frames to the VoiceEngine for decoding
*/
virtual MediaConduitErrorCode ReceivedRTCPPacket(const void *data, int len);
virtual MediaConduitErrorCode ReceivedRTCPPacket(const void *data, int len) MOZ_OVERRIDE;
/**
* Function to configure send codec for the audio session
@ -72,7 +72,7 @@ public:
* NOTE: This API can be invoked multiple time. Invoking this API may involve restarting
* transmission sub-system on the engine.
*/
virtual MediaConduitErrorCode ConfigureSendMediaCodec(const AudioCodecConfig* codecConfig);
virtual MediaConduitErrorCode ConfigureSendMediaCodec(const AudioCodecConfig* codecConfig) MOZ_OVERRIDE;
/**
* Function to configure list of receive codecs for the audio session
* @param sendSessionConfig: CodecConfiguration
@ -83,18 +83,18 @@ public:
* transmission sub-system on the engine.
*/
virtual MediaConduitErrorCode ConfigureRecvMediaCodecs(
const std::vector<AudioCodecConfig* >& codecConfigList);
const std::vector<AudioCodecConfig* >& codecConfigList) MOZ_OVERRIDE;
/**
* Function to enable the audio level extension
* @param enabled: enable extension
*/
virtual MediaConduitErrorCode EnableAudioLevelExtension(bool enabled, uint8_t id);
virtual MediaConduitErrorCode EnableAudioLevelExtension(bool enabled, uint8_t id) MOZ_OVERRIDE;
/**
* Register External Transport to this Conduit. RTP and RTCP frames from the VoiceEngine
* shall be passed to the registered transport for transporting externally.
*/
virtual MediaConduitErrorCode AttachTransport(mozilla::RefPtr<TransportInterface> aTransport);
virtual MediaConduitErrorCode AttachTransport(mozilla::RefPtr<TransportInterface> aTransport) MOZ_OVERRIDE;
/**
* Function to deliver externally captured audio sample for encoding and transport
* @param audioData [in]: Pointer to array containing a frame of audio
@ -114,7 +114,7 @@ public:
virtual MediaConduitErrorCode SendAudioFrame(const int16_t speechData[],
int32_t lengthSamples,
int32_t samplingFreqHz,
int32_t capture_time);
int32_t capture_time) MOZ_OVERRIDE;
/**
* Function to grab a decoded audio-sample from the media engine for rendering
@ -135,23 +135,23 @@ public:
virtual MediaConduitErrorCode GetAudioFrame(int16_t speechData[],
int32_t samplingFreqHz,
int32_t capture_delay,
int& lengthSamples);
int& lengthSamples) MOZ_OVERRIDE;
/**
* Webrtc transport implementation to send and receive RTP packet.
* AudioConduit registers itself as ExternalTransport to the VoiceEngine
*/
virtual int SendPacket(int channel, const void *data, int len) ;
virtual int SendPacket(int channel, const void *data, int len) MOZ_OVERRIDE;
/**
* Webrtc transport implementation to send and receive RTCP packet.
* AudioConduit registers itself as ExternalTransport to the VoiceEngine
*/
virtual int SendRTCPPacket(int channel, const void *data, int len) ;
virtual int SendRTCPPacket(int channel, const void *data, int len) MOZ_OVERRIDE;
virtual uint64_t CodecPluginID() { return 0; }
virtual uint64_t CodecPluginID() MOZ_OVERRIDE { return 0; }
WebrtcAudioConduit():
mOtherDirection(nullptr),
@ -178,14 +178,14 @@ public:
int GetChannel() { return mChannel; }
webrtc::VoiceEngine* GetVoiceEngine() { return mVoiceEngine; }
bool SetLocalSSRC(unsigned int ssrc) MOZ_OVERRIDE;
bool GetLocalSSRC(unsigned int* ssrc);
bool GetRemoteSSRC(unsigned int* ssrc);
bool GetLocalSSRC(unsigned int* ssrc) MOZ_OVERRIDE;
bool GetRemoteSSRC(unsigned int* ssrc) MOZ_OVERRIDE;
bool SetLocalCNAME(const char* cname) MOZ_OVERRIDE;
bool GetVideoEncoderStats(double* framerateMean,
double* framerateStdDev,
double* bitrateMean,
double* bitrateStdDev,
uint32_t* droppedFrames)
uint32_t* droppedFrames) MOZ_OVERRIDE
{
return false;
}
@ -193,23 +193,23 @@ public:
double* framerateStdDev,
double* bitrateMean,
double* bitrateStdDev,
uint32_t* discardedPackets)
uint32_t* discardedPackets) MOZ_OVERRIDE
{
return false;
}
bool GetAVStats(int32_t* jitterBufferDelayMs,
int32_t* playoutBufferDelayMs,
int32_t* avSyncOffsetMs);
bool GetRTPStats(unsigned int* jitterMs, unsigned int* cumulativeLost);
int32_t* avSyncOffsetMs) MOZ_OVERRIDE;
bool GetRTPStats(unsigned int* jitterMs, unsigned int* cumulativeLost) MOZ_OVERRIDE;
bool GetRTCPReceiverReport(DOMHighResTimeStamp* timestamp,
uint32_t* jitterMs,
uint32_t* packetsReceived,
uint64_t* bytesReceived,
uint32_t *cumulativeLost,
int32_t* rttMs);
int32_t* rttMs) MOZ_OVERRIDE;
bool GetRTCPSenderReport(DOMHighResTimeStamp* timestamp,
unsigned int* packetsSent,
uint64_t* bytesSent);
uint64_t* bytesSent) MOZ_OVERRIDE;
private:
WebrtcAudioConduit(const WebrtcAudioConduit& other) MOZ_DELETE;

60
media/webrtc/signaling/src/media-conduit/VideoConduit.h
View File

@ -79,20 +79,20 @@ public:
* Note: Multiple invocations of this API shall remove an existing renderer
* and attaches the new to the Conduit.
*/
virtual MediaConduitErrorCode AttachRenderer(mozilla::RefPtr<VideoRenderer> aVideoRenderer);
virtual void DetachRenderer();
virtual MediaConduitErrorCode AttachRenderer(mozilla::RefPtr<VideoRenderer> aVideoRenderer) MOZ_OVERRIDE;
virtual void DetachRenderer() MOZ_OVERRIDE;
/**
* APIs used by the registered external transport to this Conduit to
* feed in received RTP Frames to the VideoEngine for decoding
*/
virtual MediaConduitErrorCode ReceivedRTPPacket(const void *data, int len);
virtual MediaConduitErrorCode ReceivedRTPPacket(const void *data, int len) MOZ_OVERRIDE;
/**
* APIs used by the registered external transport to this Conduit to
* feed in received RTP Frames to the VideoEngine for decoding
*/
virtual MediaConduitErrorCode ReceivedRTCPPacket(const void *data, int len);
virtual MediaConduitErrorCode ReceivedRTCPPacket(const void *data, int len) MOZ_OVERRIDE;
/**
* Function to configure send codec for the video session
@ -102,7 +102,7 @@ public:
* NOTE: This API can be invoked multiple time. Invoking this API may involve restarting
* transmission sub-system on the engine.
*/
virtual MediaConduitErrorCode ConfigureSendMediaCodec(const VideoCodecConfig* codecInfo);
virtual MediaConduitErrorCode ConfigureSendMediaCodec(const VideoCodecConfig* codecInfo) MOZ_OVERRIDE;
/**
* Function to configure list of receive codecs for the video session
@ -114,21 +114,21 @@ public:
* transmission sub-system on the engine.
*/
virtual MediaConduitErrorCode ConfigureRecvMediaCodecs(
const std::vector<VideoCodecConfig* >& codecConfigList);
const std::vector<VideoCodecConfig* >& codecConfigList) MOZ_OVERRIDE;
/**
* Register Transport for this Conduit. RTP and RTCP frames from the VideoEngine
* shall be passed to the registered transport for transporting externally.
*/
virtual MediaConduitErrorCode AttachTransport(mozilla::RefPtr<TransportInterface> aTransport);
virtual MediaConduitErrorCode AttachTransport(mozilla::RefPtr<TransportInterface> aTransport) MOZ_OVERRIDE;
/**
* Function to select and change the encoding resolution based on incoming frame size
* and current available bandwidth.
* @param width, height: dimensions of the frame
*/
virtual bool SelectSendResolution(unsigned short width,
unsigned short height);
bool SelectSendResolution(unsigned short width,
unsigned short height);
/**
* Function to deliver a capture video frame for encoding and transport
@ -146,44 +146,44 @@ public:
unsigned short width,
unsigned short height,
VideoType video_type,
uint64_t capture_time);
uint64_t capture_time) MOZ_OVERRIDE;
/**
* Set an external encoder object |encoder| to the payload type |pltype|
* for sender side codec.
*/
virtual MediaConduitErrorCode SetExternalSendCodec(VideoCodecConfig* config,
VideoEncoder* encoder);
VideoEncoder* encoder) MOZ_OVERRIDE;
/**
* Set an external decoder object |decoder| to the payload type |pltype|
* for receiver side codec.
*/
virtual MediaConduitErrorCode SetExternalRecvCodec(VideoCodecConfig* config,
VideoDecoder* decoder);
VideoDecoder* decoder) MOZ_OVERRIDE;
/**
* Webrtc transport implementation to send and receive RTP packet.
* VideoConduit registers itself as ExternalTransport to the VideoEngine
*/
virtual int SendPacket(int channel, const void *data, int len) ;
virtual int SendPacket(int channel, const void *data, int len) MOZ_OVERRIDE;
/**
* Webrtc transport implementation to send and receive RTCP packet.
* VideoConduit registers itself as ExternalTransport to the VideoEngine
*/
virtual int SendRTCPPacket(int channel, const void *data, int len) ;
virtual int SendRTCPPacket(int channel, const void *data, int len) MOZ_OVERRIDE;
/**
* Webrtc External Renderer Implementation APIs.
* Raw I420 Frames are delivred to the VideoConduit by the VideoEngine
*/
virtual int FrameSizeChange(unsigned int, unsigned int, unsigned int);
virtual int FrameSizeChange(unsigned int, unsigned int, unsigned int) MOZ_OVERRIDE;
virtual int DeliverFrame(unsigned char*,int, uint32_t , int64_t,
void *handle);
void *handle) MOZ_OVERRIDE;
/**
* Does DeliverFrame() support a null buffer and non-null handle
@ -191,7 +191,7 @@ public:
* B2G support it (when using HW video decoder with graphic buffer output).
* XXX Investigate! Especially for Android
*/
virtual bool IsTextureSupported() {
virtual bool IsTextureSupported() MOZ_OVERRIDE {
#ifdef WEBRTC_GONK
return true;
#else
@ -199,24 +199,24 @@ public:
#endif
}
virtual uint64_t CodecPluginID();
virtual uint64_t CodecPluginID() MOZ_OVERRIDE;
unsigned short SendingWidth() {
unsigned short SendingWidth() MOZ_OVERRIDE {
return mSendingWidth;
}
unsigned short SendingHeight() {
unsigned short SendingHeight() MOZ_OVERRIDE {
return mSendingHeight;
}
unsigned int SendingMaxFs() {
unsigned int SendingMaxFs() MOZ_OVERRIDE {
if(mCurSendCodecConfig) {
return mCurSendCodecConfig->mMaxFrameSize;
}
return 0;
}
unsigned int SendingMaxFr() {
unsigned int SendingMaxFr() MOZ_OVERRIDE {
if(mCurSendCodecConfig) {
return mCurSendCodecConfig->mMaxFrameRate;
}
@ -231,32 +231,32 @@ public:
int GetChannel() { return mChannel; }
webrtc::VideoEngine* GetVideoEngine() { return mVideoEngine; }
bool GetLocalSSRC(unsigned int* ssrc) MOZ_OVERRIDE;
bool SetLocalSSRC(unsigned int ssrc);
bool GetRemoteSSRC(unsigned int* ssrc);
bool SetLocalSSRC(unsigned int ssrc) MOZ_OVERRIDE;
bool GetRemoteSSRC(unsigned int* ssrc) MOZ_OVERRIDE;
bool SetLocalCNAME(const char* cname) MOZ_OVERRIDE;
bool GetVideoEncoderStats(double* framerateMean,
double* framerateStdDev,
double* bitrateMean,
double* bitrateStdDev,
uint32_t* droppedFrames);
uint32_t* droppedFrames) MOZ_OVERRIDE;
bool GetVideoDecoderStats(double* framerateMean,
double* framerateStdDev,
double* bitrateMean,
double* bitrateStdDev,
uint32_t* discardedPackets);
uint32_t* discardedPackets) MOZ_OVERRIDE;
bool GetAVStats(int32_t* jitterBufferDelayMs,
int32_t* playoutBufferDelayMs,
int32_t* avSyncOffsetMs);
bool GetRTPStats(unsigned int* jitterMs, unsigned int* cumulativeLost);
int32_t* avSyncOffsetMs) MOZ_OVERRIDE;
bool GetRTPStats(unsigned int* jitterMs, unsigned int* cumulativeLost) MOZ_OVERRIDE;
bool GetRTCPReceiverReport(DOMHighResTimeStamp* timestamp,
uint32_t* jitterMs,
uint32_t* packetsReceived,
uint64_t* bytesReceived,
uint32_t* cumulativeLost,
int32_t* rttMs);
int32_t* rttMs) MOZ_OVERRIDE;
bool GetRTCPSenderReport(DOMHighResTimeStamp* timestamp,
unsigned int* packetsSent,
uint64_t* bytesSent);
uint64_t* bytesSent) MOZ_OVERRIDE;
uint64_t MozVideoLatencyAvg();
private:

6
media/webrtc/signaling/src/media-conduit/WebrtcGmpVideoCodec.h
View File

@ -112,10 +112,10 @@ public:
return mGMP ? mGMP->ParentID() : mCachedPluginId;
}
virtual void Terminated();
virtual void Terminated() MOZ_OVERRIDE;
virtual int32_t InitDecode(const webrtc::VideoCodec* aCodecSettings,
int32_t aNumberOfCores);
int32_t aNumberOfCores) MOZ_OVERRIDE;
virtual int32_t Decode(const webrtc::EncodedImage& aInputImage,
bool aMissingFrames,
const webrtc::RTPFragmentationHeader* aFragmentation,
@ -123,7 +123,7 @@ public:
int64_t aRenderTimeMs = -1) MOZ_OVERRIDE;
virtual int32_t RegisterDecodeCompleteCallback(webrtc::DecodedImageCallback* aCallback) MOZ_OVERRIDE;
virtual int32_t Release();
virtual int32_t Release() MOZ_OVERRIDE;
virtual int32_t Reset() MOZ_OVERRIDE;

8
media/webrtc/signaling/src/mediapipeline/MediaPipeline.h
View File

@ -386,7 +386,7 @@ public:
#endif
// Called on the main thread.
virtual void DetachMediaStream() {
virtual void DetachMediaStream() MOZ_OVERRIDE {
ASSERT_ON_THREAD(main_thread_);
domstream_->RemoveDirectListener(listener_);
domstream_ = nullptr;
@ -396,7 +396,7 @@ public:
}
// Override MediaPipeline::TransportReady.
virtual nsresult TransportReady_s(TransportInfo &info);
virtual nsresult TransportReady_s(TransportInfo &info) MOZ_OVERRIDE;
// Replace a track with a different one
// In non-compliance with the likely final spec, allow the new
@ -560,7 +560,7 @@ class MediaPipelineReceiveAudio : public MediaPipelineReceive {
track_id, conduit)) {
}
virtual void DetachMediaStream() {
virtual void DetachMediaStream() MOZ_OVERRIDE {
ASSERT_ON_THREAD(main_thread_);
listener_->EndTrack();
stream_->RemoveListener(listener_);
@ -624,7 +624,7 @@ class MediaPipelineReceiveVideo : public MediaPipelineReceive {
}
// Called on the main thread.
virtual void DetachMediaStream() {
virtual void DetachMediaStream() MOZ_OVERRIDE {
ASSERT_ON_THREAD(main_thread_);
listener_->EndTrack();

2
media/webrtc/signaling/src/peerconnection/PeerConnectionCtx.cpp
View File

@ -60,7 +60,7 @@ public:
}
NS_IMETHODIMP Observe(nsISupports* aSubject, const char* aTopic,
const char16_t* aData) {
const char16_t* aData) MOZ_OVERRIDE {
if (strcmp(aTopic, NS_XPCOM_SHUTDOWN_OBSERVER_ID) == 0) {
CSFLogDebug(logTag, "Shutting down PeerConnectionCtx");
PeerConnectionCtx::Destroy();

8
media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.h
View File

@ -265,7 +265,13 @@ public:
const std::string& aId);
// DataConnection observers
void NotifyDataChannel(already_AddRefed<mozilla::DataChannel> aChannel);
void NotifyDataChannel(already_AddRefed<mozilla::DataChannel> aChannel)
#ifdef MOZILLA_INTERNAL_API
// PeerConnectionImpl only inherits from mozilla::DataChannelConnection
// inside libxul.
MOZ_OVERRIDE
#endif
;
// Get the media object
const nsRefPtr<PeerConnectionMedia>& media() const {