Bug 1409272 - P1: Remove unnecessary and/or unused variables. r?jwwang draft
authorJean-Yves Avenard <jyavenard@mozilla.com>
Thu, 12 Oct 2017 19:07:09 +0200
changeset 681623 1408522bc2f912911909d722db6cd499c61b7221
parent 681622 92cc315a0f97c1587990c00e15a6998ab073b213
child 681624 a99a9f21d891dcdecbf02d0439e15cbff37605bf
push id84874
push userbmo:jyavenard@mozilla.com
push dateTue, 17 Oct 2017 14:09:11 +0000
reviewersjwwang
bugs1409272
milestone58.0a1
Bug 1409272 - P1: Remove unnecessary and/or unused variables. r?jwwang MozReview-Commit-ID: J9qiqEfU05N
dom/media/platforms/agnostic/VorbisDecoder.cpp
--- a/dom/media/platforms/agnostic/VorbisDecoder.cpp
+++ b/dom/media/platforms/agnostic/VorbisDecoder.cpp
@@ -151,18 +151,16 @@ VorbisDataDecoder::Decode(MediaRawData* 
 RefPtr<MediaDataDecoder::DecodePromise>
 VorbisDataDecoder::ProcessDecode(MediaRawData* aSample)
 {
   MOZ_ASSERT(mTaskQueue->IsCurrentThreadIn());
 
   const unsigned char* aData = aSample->Data();
   size_t aLength = aSample->Size();
   int64_t aOffset = aSample->mOffset;
-  auto aTstampUsecs = aSample->mTime;
-  int64_t aTotalFrames = 0;
 
   MOZ_ASSERT(mPacketCount >= 3);
 
   if (!mLastFrameTime ||
       mLastFrameTime.ref() != aSample->mTime.ToMicroseconds()) {
     // We are starting a new block.
     mFrames = 0;
     mLastFrameTime = Some(aSample->mTime.ToMicroseconds());
@@ -220,22 +218,22 @@ VorbisDataDecoder::ProcessDecode(MediaRa
     auto total_duration = FramesToTimeUnit(mFrames, rate);
     if (!total_duration.IsValid()) {
       return DecodePromise::CreateAndReject(
         MediaResult(NS_ERROR_DOM_MEDIA_OVERFLOW_ERR,
                     RESULT_DETAIL("Overflow converting audio total_duration")),
         __func__);
     }
 
-    auto time = total_duration + aTstampUsecs;
+    auto time = total_duration + aSample->mTime;
     if (!time.IsValid()) {
       return DecodePromise::CreateAndReject(
         MediaResult(
           NS_ERROR_DOM_MEDIA_OVERFLOW_ERR,
-          RESULT_DETAIL("Overflow adding total_duration and aTstampUsecs")),
+          RESULT_DETAIL("Overflow adding total_duration and aSample->mTime")),
         __func__);
     };
 
     if (!mAudioConverter) {
       AudioConfig in(
         AudioConfig::ChannelLayout(channels, VorbisLayout(channels)), rate);
       AudioConfig out(channels, rate);
       if (!in.IsValid() || !out.IsValid()) {
@@ -245,18 +243,16 @@ VorbisDataDecoder::ProcessDecode(MediaRa
           __func__);
       }
       mAudioConverter = MakeUnique<AudioConverter>(in, out);
     }
     MOZ_ASSERT(mAudioConverter->CanWorkInPlace());
     AudioSampleBuffer data(Move(buffer));
     data = mAudioConverter->Process(Move(data));
 
-    aTotalFrames += frames;
-
     results.AppendElement(new AudioData(aOffset, time, duration,
                                         frames, data.Forget(), channels, rate));
     mFrames += frames;
     err = vorbis_synthesis_read(&mVorbisDsp, frames);
     if (err) {
       return DecodePromise::CreateAndReject(
         MediaResult(NS_ERROR_DOM_MEDIA_DECODE_ERR,
                     RESULT_DETAIL("vorbis_synthesis_read:%d", err)),