Bug 1277198. Part 3 - remove AudioStream::mInRate/mOutRate. r=kinetik. draft 1274214_remove_WMFMediaDataDecoder_TaskQueue
authorJW Wang <jwwang@mozilla.com>
Wed, 01 Jun 2016 18:00:15 +0800
branch1274214_remove_WMFMediaDataDecoder_TaskQueue
changeset 375535 49589d5bd8ea1b2575caaf608569c64fab307c5b
parent 375534 39c105ad766947ebe350b8b2afc2685bb00339dc
child 375581 7bb59ebda8cf3927995fa6570a8b76fbcd891ec8
push id20304
push userjwwang@mozilla.com
push dateMon, 06 Jun 2016 03:29:59 +0000
reviewerskinetik
bugs1277198
milestone49.0a1
Bug 1277198. Part 3 - remove AudioStream::mInRate/mOutRate. r=kinetik. MozReview-Commit-ID: KTiyzO8VEZh
dom/media/AudioStream.cpp
dom/media/AudioStream.h
--- a/dom/media/AudioStream.cpp
+++ b/dom/media/AudioStream.cpp
@@ -116,18 +116,16 @@ public:
 private:
   AutoTArray<Chunk, 7> mChunks;
   int64_t mBaseOffset;
   double mBasePosition;
 };
 
 AudioStream::AudioStream(DataSource& aSource)
   : mMonitor("AudioStream")
-  , mInRate(0)
-  , mOutRate(0)
   , mChannels(0)
   , mOutChannels(0)
   , mTimeStretcher(nullptr)
   , mDumpFile(nullptr)
   , mState(INITIALIZED)
   , mDataSource(aSource)
 {
 }
@@ -323,17 +321,16 @@ int AudioStream::InvokeCubeb(Function aF
 nsresult
 AudioStream::Init(uint32_t aNumChannels, uint32_t aRate,
                   const dom::AudioChannel aAudioChannel)
 {
   auto startTime = TimeStamp::Now();
   auto isFirst = CubebUtils::GetFirstStream();
 
   LOG("%s channels: %d, rate: %d", __FUNCTION__, aNumChannels, aRate);
-  mInRate = mOutRate = aRate;
   mChannels = aNumChannels;
   mOutChannels = aNumChannels;
 
   mDumpFile = OpenDumpFile(aNumChannels, aRate);
 
   cubeb_stream_params params;
   params.rate = aRate;
   params.channels = mOutChannels;
--- a/dom/media/AudioStream.h
+++ b/dom/media/AudioStream.h
@@ -274,20 +274,16 @@ private:
   void GetTimeStretched(AudioBufferWriter& aWriter);
 
   template <typename Function, typename... Args>
   int InvokeCubeb(Function aFunction, Args&&... aArgs);
 
   // The monitor is held to protect all access to member variables.
   Monitor mMonitor;
 
-  // Input rate in Hz (characteristic of the media being played)
-  uint32_t mInRate;
-  // Output rate in Hz (characteristic of the playback rate)
-  uint32_t mOutRate;
   uint32_t mChannels;
   uint32_t mOutChannels;
   AudioClock mAudioClock;
   soundtouch::SoundTouch* mTimeStretcher;
 
   // Output file for dumping audio
   FILE* mDumpFile;