зеркало из https://github.com/mozilla/gecko-dev.git
Bug 839650: proxy AddTrack() to MSG thread via a custom command so we can get access to the current stream time r=ekr
This commit is contained in:
Randell Jesup
Родитель
a55cc2028d
Коммит
c8ed26cbac
|
|
@ -54,6 +54,7 @@
|
|||
'../../../xpcom/base',
|
||||
'$(DEPTH)/dist/include',
|
||||
'../../../dom/base',
|
||||
'../../../content/media',
|
||||
'../../../media/mtransport',
|
||||
'../trunk/webrtc',
|
||||
'../trunk/webrtc/video_engine/include',
|
||||
|
|
|
|||
|
|
@ -4,10 +4,12 @@
|
|||
|
||||
// Original author: ekr@rtfm.com
|
||||
|
||||
#include "CSFLog.h"
|
||||
|
||||
#include "MediaPipeline.h"
|
||||
|
||||
#ifndef USE_FAKE_MEDIA_STREAMS
|
||||
#include "MediaStreamGraphImpl.h"
|
||||
#endif
|
||||
|
||||
#include <math.h>
|
||||
|
||||
#include "nspr.h"
|
||||
|
|
@ -59,7 +61,7 @@ nsresult MediaPipeline::Init() {
|
|||
nsRefPtr<MediaPipeline>(this),
|
||||
&MediaPipeline::Init_s),
|
||||
NS_DISPATCH_NORMAL);
|
||||
|
||||
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
|
|
@ -842,22 +844,89 @@ nsresult MediaPipelineReceiveAudio::Init() {
|
|||
description_ += track_id_string;
|
||||
description_ += "]";
|
||||
|
||||
stream_->AddListener(listener_);
|
||||
listener_->AddSelf(new AudioSegment());
|
||||
|
||||
return MediaPipelineReceive::Init();
|
||||
}
|
||||
|
||||
|
||||
void GenericReceiveListener::AddSelf(MediaSegment* segment) {
|
||||
RefPtr<TrackAddedCallback> callback = new GenericReceiveCallback(this);
|
||||
AddTrackAndListener(source_, track_id_, track_rate_, this, segment, callback);
|
||||
}
|
||||
|
||||
// Add a track and listener on the MSG thread using the MSG command queue
|
||||
static void AddTrackAndListener(MediaStream* source,
|
||||
TrackID track_id, TrackRate track_rate,
|
||||
MediaStreamListener* listener, MediaSegment* segment,
|
||||
const RefPtr<TrackAddedCallback>& completed) {
|
||||
// This both adds the listener and the track
|
||||
#ifdef MOZILLA_INTERNAL_API
|
||||
class Message : public ControlMessage {
|
||||
public:
|
||||
Message(MediaStream* stream, TrackID track, TrackRate rate,
|
||||
MediaSegment* segment, MediaStreamListener* listener,
|
||||
const RefPtr<TrackAddedCallback>& completed)
|
||||
: ControlMessage(stream),
|
||||
track_id_(track),
|
||||
track_rate_(rate),
|
||||
segment_(segment),
|
||||
listener_(listener),
|
||||
completed_(completed) {}
|
||||
|
||||
virtual void Run() MOZ_OVERRIDE {
|
||||
StreamTime current_end = mStream->GetBufferEnd();
|
||||
TrackTicks current_ticks = TimeToTicksRoundUp(track_rate_, current_end);
|
||||
|
||||
mStream->AddListenerImpl(listener_.forget());
|
||||
|
||||
// Add a track 'now' to avoid possible underrun, especially if we add
|
||||
// a track "later".
|
||||
|
||||
if (current_end != 0L) {
|
||||
MOZ_MTLOG(MP_LOG_INFO, "added track @ " << current_end <<
|
||||
" -> " << MediaTimeToSeconds(current_end));
|
||||
}
|
||||
|
||||
// To avoid assertions, we need to insert a dummy segment that covers up
|
||||
// to the "start" time for the track
|
||||
segment_->AppendNullData(current_ticks);
|
||||
mStream->AsSourceStream()->AddTrack(track_id_, track_rate_,
|
||||
current_ticks, segment_);
|
||||
// AdvanceKnownTracksTicksTime(HEAT_DEATH_OF_UNIVERSE) means that in
|
||||
// theory per the API, we can't add more tracks before that
|
||||
// time. However, the impl actually allows it, and it avoids a whole
|
||||
// bunch of locking that would be required (and potential blocking)
|
||||
// if we used smaller values and updated them on each NotifyPull.
|
||||
mStream->AsSourceStream()->AdvanceKnownTracksTime(STREAM_TIME_MAX);
|
||||
|
||||
// We need to know how much has been "inserted" because we're given absolute
|
||||
// times in NotifyPull.
|
||||
completed_->TrackAdded(current_ticks);
|
||||
}
|
||||
private:
|
||||
TrackID track_id_;
|
||||
TrackRate track_rate_;
|
||||
MediaSegment* segment_;
|
||||
nsRefPtr<MediaStreamListener> listener_;
|
||||
const RefPtr<TrackAddedCallback> completed_;
|
||||
};
|
||||
|
||||
MOZ_ASSERT(listener);
|
||||
|
||||
source->GraphImpl()->AppendMessage(new Message(source, track_id, track_rate, segment, listener, completed));
|
||||
#else
|
||||
source->AsSourceStream()->AddTrack(track_id, track_rate, 0, segment);
|
||||
#endif
|
||||
}
|
||||
|
||||
MediaPipelineReceiveAudio::PipelineListener::PipelineListener(
|
||||
SourceMediaStream * source, TrackID track_id,
|
||||
const RefPtr<MediaSessionConduit>& conduit)
|
||||
: source_(source),
|
||||
track_id_(track_id),
|
||||
conduit_(conduit),
|
||||
played_(0) {
|
||||
mozilla::AudioSegment *segment = new mozilla::AudioSegment();
|
||||
source_->AddTrack(track_id_, 16000, 0, segment);
|
||||
source_->AdvanceKnownTracksTime(STREAM_TIME_MAX);
|
||||
: GenericReceiveListener(source, track_id, 16000), // XXX rate assumption
|
||||
conduit_(conduit)
|
||||
{
|
||||
MOZ_ASSERT(track_rate_%100 == 0);
|
||||
}
|
||||
|
||||
void MediaPipelineReceiveAudio::PipelineListener::
|
||||
|
|
@ -869,21 +938,33 @@ NotifyPull(MediaStreamGraph* graph, StreamTime desired_time) {
|
|||
}
|
||||
|
||||
// This comparison is done in total time to avoid accumulated roundoff errors.
|
||||
while (MillisecondsToMediaTime(played_) < desired_time) {
|
||||
// TODO(ekr@rtfm.com): Is there a way to avoid mallocating here?
|
||||
nsRefPtr<SharedBuffer> samples = SharedBuffer::Create(1000);
|
||||
while (TicksToTimeRoundDown(track_rate_, played_ticks_) < desired_time) {
|
||||
// TODO(ekr@rtfm.com): Is there a way to avoid mallocating here? Or reduce the size?
|
||||
// Max size given mono is 480*2*1 = 960 (48KHz)
|
||||
#define AUDIO_SAMPLE_BUFFER_MAX 1000
|
||||
MOZ_ASSERT((track_rate_/100)*sizeof(uint16_t) <= AUDIO_SAMPLE_BUFFER_MAX);
|
||||
|
||||
nsRefPtr<SharedBuffer> samples = SharedBuffer::Create(AUDIO_SAMPLE_BUFFER_MAX);
|
||||
int16_t *samples_data = static_cast<int16_t *>(samples->Data());
|
||||
int samples_length;
|
||||
|
||||
// This fetches 10ms of data
|
||||
MediaConduitErrorCode err =
|
||||
static_cast<AudioSessionConduit*>(conduit_.get())->GetAudioFrame(
|
||||
samples_data,
|
||||
16000, // Sampling rate fixed at 16 kHz for now
|
||||
0, // TODO(ekr@rtfm.com): better estimate of capture delay
|
||||
track_rate_,
|
||||
0, // TODO(ekr@rtfm.com): better estimate of "capture" (really playout) delay
|
||||
samples_length);
|
||||
MOZ_ASSERT(samples_length < AUDIO_SAMPLE_BUFFER_MAX);
|
||||
|
||||
if (err != kMediaConduitNoError)
|
||||
return;
|
||||
if (err != kMediaConduitNoError) {
|
||||
// Insert silence on conduit/GIPS failure (extremely unlikely)
|
||||
MOZ_MTLOG(PR_LOG_ERROR, "Audio conduit failed (" << err << ") to return data @ " << played_ticks_ <<
|
||||
" (desired " << desired_time << " -> " << MediaTimeToSeconds(desired_time) << ")");
|
||||
MOZ_ASSERT(err == kMediaConduitNoError);
|
||||
samples_length = (track_rate_/100)*sizeof(uint16_t); // if this is not enough we'll loop and provide more
|
||||
memset(samples_data, '\0', samples_length);
|
||||
}
|
||||
|
||||
MOZ_MTLOG(PR_LOG_DEBUG, "Audio conduit returned buffer of length " << samples_length);
|
||||
|
||||
|
|
@ -892,9 +973,15 @@ NotifyPull(MediaStreamGraph* graph, StreamTime desired_time) {
|
|||
channels.AppendElement(samples_data);
|
||||
segment.AppendFrames(samples.forget(), channels, samples_length);
|
||||
|
||||
source_->AppendToTrack(track_id_, &segment);
|
||||
|
||||
played_ += 10;
|
||||
// Handle track not actually added yet or removed/finished
|
||||
if (source_->AppendToTrack(track_id_, &segment)) {
|
||||
played_ticks_ += track_rate_/100; // 10ms in TrackTicks
|
||||
} else {
|
||||
MOZ_MTLOG(PR_LOG_ERROR, "AppendToTrack failed");
|
||||
// we can't un-read the data, but that's ok since we don't want to
|
||||
// buffer - but don't i-loop!
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -910,7 +997,9 @@ nsresult MediaPipelineReceiveVideo::Init() {
|
|||
description_ += track_id_string;
|
||||
description_ += "]";
|
||||
|
||||
stream_->AddListener(listener_);
|
||||
#ifdef MOZILLA_INTERNAL_API
|
||||
listener_->AddSelf(new VideoSegment());
|
||||
#endif
|
||||
|
||||
static_cast<VideoSessionConduit *>(conduit_.get())->
|
||||
AttachRenderer(renderer_);
|
||||
|
|
@ -920,22 +1009,16 @@ nsresult MediaPipelineReceiveVideo::Init() {
|
|||
|
||||
MediaPipelineReceiveVideo::PipelineListener::PipelineListener(
|
||||
SourceMediaStream* source, TrackID track_id)
|
||||
: source_(source),
|
||||
track_id_(track_id),
|
||||
: GenericReceiveListener(source, track_id, USECS_PER_S),
|
||||
width_(640),
|
||||
height_(480),
|
||||
#ifdef MOZILLA_INTERNAL_API
|
||||
played_(0),
|
||||
image_container_(),
|
||||
image_(),
|
||||
#endif
|
||||
width_(640),
|
||||
height_(480),
|
||||
#ifdef MOZILLA_INTERNAL_API
|
||||
image_container_(),
|
||||
image_(),
|
||||
#endif
|
||||
monitor_("Video PipelineListener") {
|
||||
monitor_("Video PipelineListener") {
|
||||
#ifdef MOZILLA_INTERNAL_API
|
||||
image_container_ = layers::LayerManager::CreateImageContainer();
|
||||
source_->AddTrack(track_id_, USECS_PER_S, 0, new VideoSegment());
|
||||
source_->AdvanceKnownTracksTime(STREAM_TIME_MAX);
|
||||
#endif
|
||||
}
|
||||
|
||||
|
|
@ -982,7 +1065,7 @@ NotifyPull(MediaStreamGraph* graph, StreamTime desired_time) {
|
|||
#ifdef MOZILLA_INTERNAL_API
|
||||
nsRefPtr<layers::Image> image = image_;
|
||||
TrackTicks target = TimeToTicksRoundUp(USECS_PER_S, desired_time);
|
||||
TrackTicks delta = target - played_;
|
||||
TrackTicks delta = target - played_ticks_;
|
||||
|
||||
// Don't append if we've already provided a frame that supposedly
|
||||
// goes past the current aDesiredTime Doing so means a negative
|
||||
|
|
@ -991,9 +1074,13 @@ NotifyPull(MediaStreamGraph* graph, StreamTime desired_time) {
|
|||
VideoSegment segment;
|
||||
segment.AppendFrame(image ? image.forget() : nullptr, delta,
|
||||
gfxIntSize(width_, height_));
|
||||
source_->AppendToTrack(track_id_, &(segment));
|
||||
|
||||
played_ = target;
|
||||
// Handle track not actually added yet or removed/finished
|
||||
if (source_->AppendToTrack(track_id_, &segment)) {
|
||||
played_ticks_ = target;
|
||||
} else {
|
||||
MOZ_MTLOG(PR_LOG_ERROR, "AppendToTrack failed");
|
||||
return;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
|
|
|||
|
|
@ -14,6 +14,7 @@
|
|||
#else
|
||||
#include "DOMMediaStream.h"
|
||||
#include "MediaStreamGraph.h"
|
||||
#include "VideoUtils.h"
|
||||
#endif
|
||||
#include "MediaConduitInterface.h"
|
||||
#include "AudioSegment.h"
|
||||
|
|
@ -226,6 +227,66 @@ class MediaPipeline : public sigslot::has_slots<> {
|
|||
bool IsRtp(const unsigned char *data, size_t len);
|
||||
};
|
||||
|
||||
class GenericReceiveListener : public MediaStreamListener
|
||||
{
|
||||
public:
|
||||
GenericReceiveListener(SourceMediaStream *source, TrackID track_id,
|
||||
TrackRate track_rate)
|
||||
: source_(source),
|
||||
track_id_(track_id),
|
||||
track_rate_(track_rate),
|
||||
played_ticks_(0) {}
|
||||
|
||||
virtual ~GenericReceiveListener() {}
|
||||
|
||||
void AddSelf(MediaSegment* segment);
|
||||
|
||||
void SetPlayedTicks(TrackTicks time) {
|
||||
played_ticks_ = time;
|
||||
}
|
||||
|
||||
void EndTrack() {
|
||||
source_->EndTrack(track_id_);
|
||||
}
|
||||
|
||||
protected:
|
||||
SourceMediaStream *source_;
|
||||
TrackID track_id_;
|
||||
TrackRate track_rate_;
|
||||
TrackTicks played_ticks_;
|
||||
};
|
||||
|
||||
class TrackAddedCallback {
|
||||
public:
|
||||
virtual void TrackAdded(TrackTicks current_ticks) = 0;
|
||||
|
||||
NS_INLINE_DECL_THREADSAFE_REFCOUNTING(TrackAddedCallback);
|
||||
|
||||
protected:
|
||||
virtual ~TrackAddedCallback() {}
|
||||
};
|
||||
|
||||
class GenericReceiveListener;
|
||||
|
||||
class GenericReceiveCallback : public TrackAddedCallback
|
||||
{
|
||||
public:
|
||||
GenericReceiveCallback(GenericReceiveListener* listener)
|
||||
: listener_(listener) {}
|
||||
|
||||
void TrackAdded(TrackTicks time) {
|
||||
listener_->SetPlayedTicks(time);
|
||||
}
|
||||
|
||||
private:
|
||||
RefPtr<GenericReceiveListener> listener_;
|
||||
};
|
||||
|
||||
// Add a track and listener on the MSG thread using the MSG command queue
|
||||
static void AddTrackAndListener(MediaStream* source,
|
||||
TrackID track_id, TrackRate track_rate,
|
||||
MediaStreamListener* listener, MediaSegment* segment,
|
||||
const RefPtr<TrackAddedCallback>& completed);
|
||||
|
||||
class ConduitDeleteEvent: public nsRunnable
|
||||
{
|
||||
|
|
@ -320,8 +381,7 @@ class MediaPipelineTransmit : public MediaPipeline {
|
|||
};
|
||||
|
||||
private:
|
||||
RefPtr<PipelineListener> listener_;
|
||||
|
||||
RefPtr<PipelineListener> listener_;
|
||||
};
|
||||
|
||||
|
||||
|
|
@ -373,6 +433,7 @@ class MediaPipelineReceiveAudio : public MediaPipelineReceive {
|
|||
|
||||
virtual void DetachMediaStream() {
|
||||
ASSERT_ON_THREAD(main_thread_);
|
||||
listener_->EndTrack();
|
||||
stream_->RemoveListener(listener_);
|
||||
// Remove our reference so that when the MediaStreamGraph
|
||||
// releases the listener, it will be destroyed.
|
||||
|
|
@ -384,7 +445,7 @@ class MediaPipelineReceiveAudio : public MediaPipelineReceive {
|
|||
|
||||
private:
|
||||
// Separate class to allow ref counting
|
||||
class PipelineListener : public MediaStreamListener {
|
||||
class PipelineListener : public GenericReceiveListener {
|
||||
public:
|
||||
PipelineListener(SourceMediaStream * source, TrackID track_id,
|
||||
const RefPtr<MediaSessionConduit>& conduit);
|
||||
|
|
@ -401,13 +462,10 @@ class MediaPipelineReceiveAudio : public MediaPipelineReceive {
|
|||
TrackTicks offset,
|
||||
uint32_t events,
|
||||
const MediaSegment& queued_media) MOZ_OVERRIDE {}
|
||||
virtual void NotifyPull(MediaStreamGraph* aGraph, StreamTime aDesiredTime) MOZ_OVERRIDE;
|
||||
virtual void NotifyPull(MediaStreamGraph* graph, StreamTime desired_time) MOZ_OVERRIDE;
|
||||
|
||||
private:
|
||||
SourceMediaStream *source_;
|
||||
TrackID track_id_;
|
||||
RefPtr<MediaSessionConduit> conduit_;
|
||||
uint64_t played_; // Amount of media played in milliseconds.
|
||||
};
|
||||
|
||||
RefPtr<PipelineListener> listener_;
|
||||
|
|
@ -437,6 +495,8 @@ class MediaPipelineReceiveVideo : public MediaPipelineReceive {
|
|||
virtual void DetachMediaStream() {
|
||||
ASSERT_ON_THREAD(main_thread_);
|
||||
|
||||
listener_->EndTrack();
|
||||
|
||||
conduit_ = nullptr; // Force synchronous destruction so we
|
||||
// stop generating video.
|
||||
|
||||
|
|
@ -478,17 +538,17 @@ class MediaPipelineReceiveVideo : public MediaPipelineReceive {
|
|||
};
|
||||
|
||||
// Separate class to allow ref counting
|
||||
class PipelineListener : public MediaStreamListener {
|
||||
class PipelineListener : public GenericReceiveListener {
|
||||
public:
|
||||
PipelineListener(SourceMediaStream * source, TrackID track_id);
|
||||
|
||||
// Implement MediaStreamListenerb
|
||||
// Implement MediaStreamListener
|
||||
virtual void NotifyQueuedTrackChanges(MediaStreamGraph* graph, TrackID tid,
|
||||
TrackRate rate,
|
||||
TrackTicks offset,
|
||||
uint32_t events,
|
||||
const MediaSegment& queued_media) {}
|
||||
virtual void NotifyPull(MediaStreamGraph* aGraph, StreamTime aDesiredTime);
|
||||
const MediaSegment& queued_media) MOZ_OVERRIDE {}
|
||||
virtual void NotifyPull(MediaStreamGraph* graph, StreamTime desired_time) MOZ_OVERRIDE;
|
||||
|
||||
// Accessors for external writes from the renderer
|
||||
void FrameSizeChange(unsigned int width,
|
||||
|
|
@ -507,11 +567,6 @@ class MediaPipelineReceiveVideo : public MediaPipelineReceive {
|
|||
|
||||
|
||||
private:
|
||||
SourceMediaStream *source_;
|
||||
TrackID track_id_;
|
||||
#ifdef MOZILLA_INTERNAL_API
|
||||
TrackTicks played_; // Amount of media played.
|
||||
#endif
|
||||
int width_;
|
||||
int height_;
|
||||
#ifdef MOZILLA_INTERNAL_API
|
||||
|
|
|
|||
|
|
@ -32,6 +32,8 @@ namespace mozilla {
|
|||
|
||||
class Fake_SourceMediaStream;
|
||||
|
||||
static const int64_t USECS_PER_S = 1000000;
|
||||
|
||||
class Fake_MediaStreamListener
|
||||
{
|
||||
public:
|
||||
|
|
@ -108,8 +110,9 @@ class Fake_SourceMediaStream : public Fake_MediaStream {
|
|||
|
||||
void AddTrack(mozilla::TrackID aID, mozilla::TrackRate aRate, mozilla::TrackTicks aStart,
|
||||
mozilla::MediaSegment* aSegment) {}
|
||||
void EndTrack(mozilla::TrackID aID) {}
|
||||
|
||||
void AppendToTrack(mozilla::TrackID aID, mozilla::MediaSegment* aSegment) {
|
||||
bool AppendToTrack(mozilla::TrackID aID, mozilla::MediaSegment* aSegment) {
|
||||
bool nonZeroSample = false;
|
||||
MOZ_ASSERT(aSegment);
|
||||
if(aSegment->GetType() == mozilla::MediaSegment::AUDIO) {
|
||||
|
|
@ -143,6 +146,7 @@ class Fake_SourceMediaStream : public Fake_MediaStream {
|
|||
//segment count.
|
||||
++mSegmentsAdded;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
void AdvanceKnownTracksTime(mozilla::StreamTime aKnownTime) {}
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче