Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-10 20:05:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 926598: fix some this-in-initializer warnings and remove tabs in MediaPipeline r=ekr

Browse Source
This commit is contained in:
Randell Jesup 2013-10-16 16:12:09 -04:00
parent e1c19dc4cb
commit 1c2211c83a
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
media/webrtc/signaling/src/mediapipeline/MediaPipeline.cpp
View File

@ -1,3 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
@ -148,15 +149,15 @@ nsresult MediaPipeline::TransportReady_s(TransportFlow *flow) {
// failure. bug 852665.
if (*state != MP_CONNECTING) {
MOZ_MTLOG(ML_ERROR, "Transport ready for flow in wrong state:" <<
description_ << ": " << (rtcp ? "rtcp" : "rtp"));
description_ << ": " << (rtcp ? "rtcp" : "rtp"));
return NS_ERROR_FAILURE;
}
nsresult res;
MOZ_MTLOG(ML_DEBUG, "Transport ready for pipeline " <<
static_cast<void *>(this) << " flow " << description_ << ": " <<
(rtcp ? "rtcp" : "rtp"));
static_cast<void *>(this) << " flow " << description_ << ": " <<
(rtcp ? "rtcp" : "rtp"));
// Now instantiate the SRTP objects
TransportLayerDtls *dtls = static_cast<TransportLayerDtls *>(

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

@ -1,3 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
@ -83,7 +84,6 @@ class MediaPipeline : public sigslot::has_slots<> {
rtcp_state_(MP_CONNECTING),
main_thread_(main_thread),
sts_thread_(sts_thread),
transport_(new PipelineTransport(this)),
rtp_send_srtp_(),
rtcp_send_srtp_(),
rtp_recv_srtp_(),
@ -102,6 +102,8 @@ class MediaPipeline : public sigslot::has_slots<> {
if (!rtcp_transport_) {
rtcp_transport_ = rtp_transport;
}
// PipelineTransport() will access this->sts_thread_; moved here for safety
transport_ = new PipelineTransport(this);
}
virtual ~MediaPipeline();
@ -145,7 +147,7 @@ class MediaPipeline : public sigslot::has_slots<> {
// Implement the TransportInterface functions
PipelineTransport(MediaPipeline *pipeline)
: pipeline_(pipeline),
sts_thread_(pipeline->sts_thread_) {}
sts_thread_(pipeline->sts_thread_) {}
void Detach() { pipeline_ = NULL; }
MediaPipeline *pipeline() const { return pipeline_; }
@ -183,12 +185,12 @@ class MediaPipeline : public sigslot::has_slots<> {
Direction direction_;
RefPtr<MediaStream> stream_; // A pointer to the stream we are servicing.
// Written on the main thread.
// Used on STS and MediaStreamGraph threads.
// Written on the main thread.
// Used on STS and MediaStreamGraph threads.
TrackID track_id_; // The track on the stream.
// Written and used as the stream_;
RefPtr<MediaSessionConduit> conduit_; // Our conduit. Written on the main
// thread. Read on STS thread.
// thread. Read on STS thread.
// The transport objects. Read/written on STS thread.
RefPtr<TransportFlow> rtp_transport_;
@ -385,10 +387,10 @@ class MediaPipelineTransmit : public MediaPipeline {
const MediaSegment& media);
virtual void ProcessAudioChunk(AudioSessionConduit *conduit,
TrackRate rate, AudioChunk& chunk);
TrackRate rate, AudioChunk& chunk);
#ifdef MOZILLA_INTERNAL_API
virtual void ProcessVideoChunk(VideoSessionConduit *conduit,
TrackRate rate, VideoChunk& chunk);
TrackRate rate, VideoChunk& chunk);
#endif
RefPtr<MediaSessionConduit> conduit_;
volatile bool active_;
@ -517,7 +519,7 @@ class MediaPipelineReceiveVideo : public MediaPipelineReceive {
MediaPipelineReceive(pc, main_thread, sts_thread,
stream, track_id, conduit, rtp_transport,
rtcp_transport),
renderer_(new PipelineRenderer(this)),
renderer_(new PipelineRenderer(MOZ_THIS_IN_INITIALIZER_LIST())),
listener_(new PipelineListener(stream->AsSourceStream(), track_id)) {
}