--- a/media/webrtc/signaling/src/mediapipeline/MediaPipeline.h
+++ b/media/webrtc/signaling/src/mediapipeline/MediaPipeline.h
@@ -397,37 +397,37 @@ public:
nsAutoPtr<MediaPipelineFilter> filter) :
MediaPipeline(pc, TRANSMIT, main_thread, sts_thread, track_id, level,
conduit, rtp_transport, rtcp_transport, filter),
listener_(new PipelineListener(conduit)),
domtrack_(domtrack)
{}
// Initialize (stuff here may fail)
- virtual nsresult Init() override;
+ nsresult Init() override;
virtual void AttachToTrack(const std::string& track_id);
// written and used from MainThread
- virtual bool IsVideo() const override;
+ bool IsVideo() const override;
#if !defined(MOZILLA_EXTERNAL_LINKAGE)
// When the principal of the domtrack changes, it calls through to here
// so that we can determine whether to enable track transmission.
// `track` has to be null or equal `domtrack_` for us to apply the update.
virtual void UpdateSinkIdentity_m(dom::MediaStreamTrack* track,
nsIPrincipal* principal,
const PeerIdentity* sinkIdentity);
#endif
// Called on the main thread.
- virtual void DetachMedia() override;
+ void DetachMedia() override;
// Override MediaPipeline::TransportReady.
- virtual nsresult TransportReady_s(TransportInfo &info) override;
+ nsresult TransportReady_s(TransportInfo &info) override;
// Replace a track with a different one
// In non-compliance with the likely final spec, allow the new
// track to be part of a different stream (since we don't support
// multiple tracks of a type in a stream yet). bug 1056650
virtual nsresult ReplaceTrack(dom::MediaStreamTrack& domtrack);
@@ -600,26 +600,26 @@ class MediaPipelineReceiveAudio : public
bool queue_track) :
MediaPipelineReceive(pc, main_thread, sts_thread,
stream, media_stream_track_id, level, conduit,
rtp_transport, rtcp_transport, filter),
listener_(new PipelineListener(stream, numeric_track_id, conduit,
queue_track)) {
}
- virtual void DetachMedia() override {
+ void DetachMedia() override {
ASSERT_ON_THREAD(main_thread_);
if (stream_) {
stream_->RemoveListener(listener_);
stream_ = nullptr;
}
}
- virtual nsresult Init() override;
- virtual bool IsVideo() const override { return false; }
+ nsresult Init() override;
+ bool IsVideo() const override { return false; }
#ifndef USE_FAKE_MEDIA_STREAMS
void SetPrincipalHandle_m(const PrincipalHandle& principal_handle) override
{
listener_->SetPrincipalHandle_m(principal_handle);
}
#endif // USE_FAKE_MEDIA_STREAMS
@@ -645,23 +645,23 @@ class MediaPipelineReceiveAudio : public
ConduitDeleteEvent(conduit_.forget()));
MOZ_ASSERT(!NS_FAILED(rv),"Could not dispatch conduit shutdown to main");
if (NS_FAILED(rv)) {
MOZ_CRASH();
}
}
// Implement MediaStreamListener
- virtual void NotifyQueuedTrackChanges(MediaStreamGraph* graph, TrackID tid,
- StreamTime offset,
- uint32_t events,
- const MediaSegment& queued_media,
- MediaStream* input_stream,
- TrackID input_tid) override {}
- virtual void NotifyPull(MediaStreamGraph* graph, StreamTime desired_time) override;
+ void NotifyQueuedTrackChanges(MediaStreamGraph* graph, TrackID tid,
+ StreamTime offset,
+ uint32_t events,
+ const MediaSegment& queued_media,
+ MediaStream* input_stream,
+ TrackID input_tid) override {}
+ void NotifyPull(MediaStreamGraph* graph, StreamTime desired_time) override;
private:
RefPtr<MediaSessionConduit> conduit_;
};
RefPtr<PipelineListener> listener_;
};
@@ -690,33 +690,33 @@ class MediaPipelineReceiveVideo : public
MediaPipelineReceive(pc, main_thread, sts_thread,
stream, media_stream_track_id, level, conduit,
rtp_transport, rtcp_transport, filter),
renderer_(new PipelineRenderer(this)),
listener_(new PipelineListener(stream, numeric_track_id, queue_track)) {
}
// Called on the main thread.
- virtual void DetachMedia() override {
+ void DetachMedia() override {
ASSERT_ON_THREAD(main_thread_);
listener_->EndTrack();
// stop generating video and thus stop invoking the PipelineRenderer
// and PipelineListener - the renderer has a raw ptr to the Pipeline to
// avoid cycles, and the render callbacks are invoked from a different
// thread so simple null-checks would cause TSAN bugs without locks.
static_cast<VideoSessionConduit*>(conduit_.get())->DetachRenderer();
if (stream_) {
stream_->RemoveListener(listener_);
stream_ = nullptr;
}
}
- virtual nsresult Init() override;
- virtual bool IsVideo() const override { return true; }
+ nsresult Init() override;
+ bool IsVideo() const override { return true; }
#ifndef USE_FAKE_MEDIA_STREAMS
void SetPrincipalHandle_m(const PrincipalHandle& principal_handle) override
{
listener_->SetPrincipalHandle_m(principal_handle);
}
#endif // USE_FAKE_MEDIA_STREAMS
@@ -724,39 +724,39 @@ class MediaPipelineReceiveVideo : public
class PipelineRenderer : public VideoRenderer {
public:
explicit PipelineRenderer(MediaPipelineReceiveVideo *pipeline) :
pipeline_(pipeline) {}
void Detach() { pipeline_ = nullptr; }
// Implement VideoRenderer
- virtual void FrameSizeChange(unsigned int width,
- unsigned int height,
- unsigned int number_of_streams) override {
+ void FrameSizeChange(unsigned int width,
+ unsigned int height,
+ unsigned int number_of_streams) override {
pipeline_->listener_->FrameSizeChange(width, height, number_of_streams);
}
- virtual void RenderVideoFrame(const unsigned char* buffer,
- size_t buffer_size,
- uint32_t time_stamp,
- int64_t render_time,
- const ImageHandle& handle) override {
+ void RenderVideoFrame(const unsigned char* buffer,
+ size_t buffer_size,
+ uint32_t time_stamp,
+ int64_t render_time,
+ const ImageHandle& handle) override {
pipeline_->listener_->RenderVideoFrame(buffer, buffer_size,
time_stamp, render_time,
handle.GetImage());
}
- virtual void RenderVideoFrame(const unsigned char* buffer,
- size_t buffer_size,
- uint32_t y_stride,
- uint32_t cbcr_stride,
- uint32_t time_stamp,
- int64_t render_time,
- const ImageHandle& handle) override {
+ void RenderVideoFrame(const unsigned char* buffer,
+ size_t buffer_size,
+ uint32_t y_stride,
+ uint32_t cbcr_stride,
+ uint32_t time_stamp,
+ int64_t render_time,
+ const ImageHandle& handle) override {
pipeline_->listener_->RenderVideoFrame(buffer, buffer_size,
y_stride, cbcr_stride,
time_stamp, render_time,
handle.GetImage());
}
private:
MediaPipelineReceiveVideo *pipeline_; // Raw pointer to avoid cycles
@@ -764,23 +764,23 @@ class MediaPipelineReceiveVideo : public
// Separate class to allow ref counting
class PipelineListener : public GenericReceiveListener {
public:
PipelineListener(SourceMediaStream * source, TrackID track_id,
bool queue_track);
// Implement MediaStreamListener
- virtual void NotifyQueuedTrackChanges(MediaStreamGraph* graph, TrackID tid,
- StreamTime offset,
- uint32_t events,
- const MediaSegment& queued_media,
- MediaStream* input_stream,
- TrackID input_tid) override {}
- virtual void NotifyPull(MediaStreamGraph* graph, StreamTime desired_time) override;
+ void NotifyQueuedTrackChanges(MediaStreamGraph* graph, TrackID tid,
+ StreamTime offset,
+ uint32_t events,
+ const MediaSegment& queued_media,
+ MediaStream* input_stream,
+ TrackID input_tid) override {}
+ void NotifyPull(MediaStreamGraph* graph, StreamTime desired_time) override;
// Accessors for external writes from the renderer
void FrameSizeChange(unsigned int width,
unsigned int height,
unsigned int number_of_streams) {
ReentrantMonitorAutoEnter enter(monitor_);
width_ = width;