Fold {Audio|Video}Decoder::Stop() into the dtor.

media/filters/audio_decoder_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <deque>
 
 #include "base/bind.h"
 #include "base/format_macros.h"
 #include "base/md5.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 92 matching lines @@
             message_loop_.message_loop_proxy(), LogCB()));
         break;
       case OPUS:
         decoder_.reset(
             new OpusAudioDecoder(message_loop_.message_loop_proxy()));
         break;
     }
   }
 
   virtual ~AudioDecoderTest() {
-    // Always issue a Stop() even if it's already been sent to avoid assertion
-    // failures causing crashes.
-    Stop();
     EXPECT_FALSE(pending_decode_);
     EXPECT_FALSE(pending_reset_);
   }
 
  protected:
   void DecodeBuffer(const scoped_refptr<DecoderBuffer>& buffer) {
     ASSERT_FALSE(pending_decode_);
     pending_decode_ = true;
     last_decode_status_ = AudioDecoder::kDecodeError;
     decoder_->Decode(
@@ skipping 76 matching lines @@
 
   void Reset() {
     ASSERT_FALSE(pending_reset_);
     pending_reset_ = true;
     decoder_->Reset(
         base::Bind(&AudioDecoderTest::ResetFinished, base::Unretained(this)));
     base::RunLoop().RunUntilIdle();
     ASSERT_FALSE(pending_reset_);
   }
 
-  void Stop() {
-    decoder_->Stop();
-  }
-
   void Seek(base::TimeDelta seek_time) {
     Reset();
     decoded_audio_.clear();
     ASSERT_TRUE(reader_->SeekForTesting(seek_time));
   }
 
   void OnDecoderOutput(const scoped_refptr<AudioBuffer>& buffer) {
     EXPECT_FALSE(buffer->end_of_stream());
     decoded_audio_.push_back(buffer);
   }
@@ skipping 86 matching lines @@
   base::TimeDelta start_timestamp_;
 
   DISALLOW_COPY_AND_ASSIGN(AudioDecoderTest);
 };
 
 class OpusAudioDecoderBehavioralTest : public AudioDecoderTest {};
 class FFmpegAudioDecoderBehavioralTest : public AudioDecoderTest {};
 
 TEST_P(AudioDecoderTest, Initialize) {
   ASSERT_NO_FATAL_FAILURE(Initialize());
-  Stop();
 }
 
-// Verifies decode audio as well as the Decode() -> Reset() -> Stop() sequence.
+// Verifies decode audio as well as the Decode() -> Reset() sequence.
 TEST_P(AudioDecoderTest, ProduceAudioSamples) {
   ASSERT_NO_FATAL_FAILURE(Initialize());
 
   // Run the test multiple times with a seek back to the beginning in between.
   std::vector<std::string> decoded_audio_md5_hashes;
   for (int i = 0; i < 2; ++i) {
     for (size_t j = 0; j < kDecodeRuns; ++j) {
       do {
         Decode();
         ASSERT_EQ(last_decode_status(), AudioDecoder::kOk);
@@ skipping 14 matching lines @@
       SCOPED_TRACE(base::StringPrintf("i = %d, j = %" PRIuS, i, j));
       ExpectDecodedAudio(j, i == 0 ? "" : decoded_audio_md5_hashes[j]);
     }
 
     SendEndOfStream();
     ASSERT_EQ(kDecodeRuns, decoded_audio_size());
 
     // Seek back to the beginning.  Calls Reset() on the decoder.
     Seek(start_timestamp());
   }
-
-  Stop();
 }
 
-TEST_P(AudioDecoderTest, DecodeStop) {
+TEST_P(AudioDecoderTest, Decode) {
   ASSERT_NO_FATAL_FAILURE(Initialize());
   Decode();
   EXPECT_EQ(AudioDecoder::kOk, last_decode_status());
-  Stop();
 }
 
-TEST_P(AudioDecoderTest, ResetStop) {
+TEST_P(AudioDecoderTest, Reset) {
   ASSERT_NO_FATAL_FAILURE(Initialize());
   Reset();
-  Stop();
 }
 
 TEST_P(AudioDecoderTest, NoTimestamp) {
   ASSERT_NO_FATAL_FAILURE(Initialize());
   scoped_refptr<DecoderBuffer> buffer(new DecoderBuffer(0));
   buffer->set_timestamp(kNoTimestamp());
   DecodeBuffer(buffer);
   EXPECT_EQ(AudioDecoder::kDecodeError, last_decode_status());
-  Stop();
 }
 
 TEST_P(OpusAudioDecoderBehavioralTest, InitializeWithNoCodecDelay) {
   ASSERT_EQ(GetParam().decoder_type, OPUS);
   AudioDecoderConfig decoder_config;
   decoder_config.Initialize(kCodecOpus,
                             kSampleFormatF32,
                             CHANNEL_LAYOUT_STEREO,
                             48000,
                             kOpusExtraData,
                             ARRAYSIZE_UNSAFE(kOpusExtraData),
                             false,
                             false,
                             base::TimeDelta::FromMilliseconds(80),
                             0);
   InitializeDecoder(decoder_config);
-  Stop();
 }
 
 TEST_P(OpusAudioDecoderBehavioralTest, InitializeWithBadCodecDelay) {
   ASSERT_EQ(GetParam().decoder_type, OPUS);
   AudioDecoderConfig decoder_config;
   decoder_config.Initialize(
       kCodecOpus,
       kSampleFormatF32,
       CHANNEL_LAYOUT_STEREO,
       48000,
       kOpusExtraData,
       ARRAYSIZE_UNSAFE(kOpusExtraData),
       false,
       false,
       base::TimeDelta::FromMilliseconds(80),
       // Use a different codec delay than in the extradata.
       100);
   InitializeDecoderWithStatus(decoder_config, DECODER_ERROR_NOT_SUPPORTED);
-  Stop();
 }
 
 TEST_P(FFmpegAudioDecoderBehavioralTest, InitializeWithBadConfig) {
   const AudioDecoderConfig decoder_config(kCodecVorbis,
                                           kSampleFormatF32,
                                           CHANNEL_LAYOUT_STEREO,
                                           // Invalid sample rate of zero.
                                           0,
                                           NULL,
                                           0,
                                           false);
   InitializeDecoderWithStatus(decoder_config, DECODER_ERROR_NOT_SUPPORTED);
-  Stop();
 }
 
 const DecodedBufferExpectations kSfxOpusExpectations[] = {
     {0, 13500, "-2.70,-1.41,-0.78,-1.27,-2.56,-3.73,"},
     {13500, 20000, "5.48,5.93,6.04,5.83,5.54,5.45,"},
     {33500, 20000, "-3.45,-3.35,-3.57,-4.12,-4.74,-5.14,"},
 };
 
 const DecodedBufferExpectations kBearOpusExpectations[] = {
     {500, 3500, "-0.26,0.87,1.36,0.84,-0.30,-1.22,"},
@@ skipping 95 matching lines @@
 };
 
 INSTANTIATE_TEST_CASE_P(FFmpegAudioDecoderTest,
                         AudioDecoderTest,
                         testing::ValuesIn(kFFmpegTests));
 INSTANTIATE_TEST_CASE_P(FFmpegAudioDecoderBehavioralTest,
                         FFmpegAudioDecoderBehavioralTest,
                         testing::ValuesIn(kFFmpegBehavioralTest));
 
 }  // namespace media