Bug 825611 - Fix unit tests to match fix to MediaPipeline. r=jesup

This commit is contained in:
EKR 2013-01-05 14:52:11 -08:00
Родитель d70f7ca23e
Коммит 41ca9a78eb
2 изменённых файлов: 5 добавлений и 3 удалений

Просмотреть файл

@ -32,7 +32,7 @@ class Fake_SourceMediaStream;
class Fake_MediaStreamListener
{
public:
public:
virtual ~Fake_MediaStreamListener() {}
virtual void NotifyQueuedTrackChanges(mozilla::MediaStreamGraph* aGraph, mozilla::TrackID aID,
@ -45,7 +45,6 @@ public:
NS_INLINE_DECL_THREADSAFE_REFCOUNTING(Fake_MediaStreamListener)
};
// Note: only one listener supported
class Fake_MediaStream {
public:
@ -100,6 +99,7 @@ protected:
class Fake_SourceMediaStream : public Fake_MediaStream {
public:
Fake_SourceMediaStream() : mSegmentsAdded(0),
mDesiredTime(0),
mPullEnabled(false),
mStop(false),
mPeriodic(new Fake_MediaPeriodic(this)) {}
@ -166,6 +166,7 @@ class Fake_SourceMediaStream : public Fake_MediaStream {
protected:
int mSegmentsAdded;
uint64_t mDesiredTime;
bool mPullEnabled;
bool mStop;
nsRefPtr<Fake_MediaPeriodic> mPeriodic;

Просмотреть файл

@ -53,7 +53,8 @@ void Fake_SourceMediaStream::Periodic() {
if (mPullEnabled && !mStop) {
for (std::set<Fake_MediaStreamListener *>::iterator it =
mListeners.begin(); it != mListeners.end(); ++it) {
(*it)->NotifyPull(NULL, mozilla::MillisecondsToMediaTime(10));
mDesiredTime += 10;
(*it)->NotifyPull(NULL, mozilla::MillisecondsToMediaTime(mDesiredTime));
}
}
}