From 4216c1b49070dfcd1403a2252411c9e085df529b Mon Sep 17 00:00:00 2001 From: Robert O'Callahan Date: Thu, 18 Sep 2014 17:05:04 +1200 Subject: [PATCH] Bug 1061046. Part 1.5: Expose MediaStream::GraphRate(). r=karlt This is guaranteed to work even if the stream has been disconnected from the graph, so it's preferred to Graph()->GraphRate(). --- content/media/MediaStreamGraph.h | 5 +++++ media/webrtc/signaling/test/FakeMediaStreams.h | 2 ++ 2 files changed, 7 insertions(+) diff --git a/content/media/MediaStreamGraph.h b/content/media/MediaStreamGraph.h index 9bc8adb78e8ec..f8a65c8be226f 100644 --- a/content/media/MediaStreamGraph.h +++ b/content/media/MediaStreamGraph.h @@ -334,6 +334,11 @@ class MediaStream : public mozilla::LinkedListElement { void SetGraphImpl(MediaStreamGraphImpl* aGraph); void SetGraphImpl(MediaStreamGraph* aGraph); + /** + * Returns sample rate of the graph. + */ + TrackRate GraphRate() { return mBuffer.GraphRate(); } + // Control API. // Since a stream can be played multiple ways, we need to combine independent // volume settings. The aKey parameter is used to keep volume settings diff --git a/media/webrtc/signaling/test/FakeMediaStreams.h b/media/webrtc/signaling/test/FakeMediaStreams.h index 58a9d88bc6a20..0c725f8461e1b 100644 --- a/media/webrtc/signaling/test/FakeMediaStreams.h +++ b/media/webrtc/signaling/test/FakeMediaStreams.h @@ -71,6 +71,8 @@ class Fake_MediaStream { public: Fake_MediaStream () : mListeners(), mMutex("Fake MediaStream") {} + uint32_t GraphRate() { return 16000; } + void AddListener(Fake_MediaStreamListener *aListener) { mozilla::MutexAutoLock lock(mMutex); mListeners.insert(aListener);