Fix incorrect opus seek preroll and flaky pre-skip removal.

media/test/pipeline_integration_test_base.cc

 // Copyright (c) 2012 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 "media/test/pipeline_integration_test_base.h"
 
 #include "base/bind.h"
 #include "base/memory/scoped_vector.h"
 #include "media/base/cdm_context.h"
 #include "media/base/media_log.h"
@@ skipping 130 matching lines @@
                  base::Unretained(this)),
       base::Closure(), base::Bind(&PipelineIntegrationTestBase::OnAddTextTrack,
                                   base::Unretained(this)),
       base::Bind(&PipelineIntegrationTestBase::OnWaitingForDecryptionKey,
                  base::Unretained(this)));
   message_loop_.Run();
   return pipeline_status_;
 }
 
 PipelineStatus PipelineIntegrationTestBase::Start(const std::string& filename,
-                                                  kTestType test_type) {
-  hashing_enabled_ = test_type == kHashed;
-  clockless_playback_ = test_type == kClockless;
+                                                  uint8_t test_type) {
+  hashing_enabled_ = test_type & kHashed;
+  clockless_playback_ = test_type & kClockless;
   return Start(filename);
 }
 
 void PipelineIntegrationTestBase::Play() {
   pipeline_->SetPlaybackRate(1);
 }
 
 void PipelineIntegrationTestBase::Pause() {
   pipeline_->SetPlaybackRate(0);
 }
@@ skipping 97 matching lines @@
   ScopedVector<AudioDecoder> audio_decoders;
 
 #if !defined(MEDIA_DISABLE_FFMPEG)
   audio_decoders.push_back(
       new FFmpegAudioDecoder(message_loop_.task_runner(), new MediaLog()));
 #endif
 
   audio_decoders.push_back(
       new OpusAudioDecoder(message_loop_.task_runner()));
 
-  AudioParameters out_params(AudioParameters::AUDIO_PCM_LOW_LATENCY,
-                             CHANNEL_LAYOUT_STEREO,
-                             44100,
-                             16,
-                             512);
-  hardware_config_.UpdateOutputConfig(out_params);
+  // Don't allow the audio renderer to resample buffers if hashing is enabled.
+  if (!hashing_enabled_) {
+    AudioParameters out_params(AudioParameters::AUDIO_PCM_LOW_LATENCY,
+                               CHANNEL_LAYOUT_STEREO,
+                               44100,
+                               16,
+                               512);
+    hardware_config_.UpdateOutputConfig(out_params);
+  }
 
   scoped_ptr<AudioRenderer> audio_renderer(new AudioRendererImpl(
       message_loop_.task_runner(),
       (clockless_playback_)
           ? static_cast<AudioRendererSink*>(clockless_audio_sink_.get())
           : audio_sink_.get(),
       audio_decoders.Pass(), hardware_config_, new MediaLog()));
-  if (hashing_enabled_)
-    audio_sink_->StartAudioHashForTesting();
+  if (hashing_enabled_) {
+    if (clockless_playback_)
+      clockless_audio_sink_->StartAudioHashForTesting();
+    else
+      audio_sink_->StartAudioHashForTesting();
+  }
 
   scoped_ptr<RendererImpl> renderer_impl(
       new RendererImpl(message_loop_.task_runner(),
                        audio_renderer.Pass(),
                        video_renderer.Pass()));
 
   // Prevent non-deterministic buffering state callbacks from firing (e.g., slow
   // machine, valgrind).
   renderer_impl->DisableUnderflowForTesting();
 
@@ skipping 16 matching lines @@
 
 std::string PipelineIntegrationTestBase::GetVideoHash() {
   DCHECK(hashing_enabled_);
   base::MD5Digest digest;
   base::MD5Final(&digest, &md5_context_);
   return base::MD5DigestToBase16(digest);
 }
 
 std::string PipelineIntegrationTestBase::GetAudioHash() {
   DCHECK(hashing_enabled_);
+
+  if (clockless_playback_)
+    return clockless_audio_sink_->GetAudioHashForTesting();
   return audio_sink_->GetAudioHashForTesting();
 }
 
 base::TimeDelta PipelineIntegrationTestBase::GetAudioTime() {
   DCHECK(clockless_playback_);
   return clockless_audio_sink_->render_time();
 }
 
 base::TimeTicks DummyTickClock::NowTicks() {
   now_ += base::TimeDelta::FromSeconds(60);
   return now_;
 }
 
 }  // namespace media