| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "media/audio/null_audio_sink.h" | 5 #include "media/audio/null_audio_sink.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/message_loop_proxy.h" | 8 #include "base/message_loop_proxy.h" |
| 9 #include "media/audio/fake_audio_consumer.h" | 9 #include "media/audio/fake_audio_consumer.h" |
| 10 #include "media/base/audio_hash.h" | 10 #include "media/base/audio_hash.h" |
| (...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 78 | 78 |
| 79 audio_hash_->Update(audio_bus, frames_received); | 79 audio_hash_->Update(audio_bus, frames_received); |
| 80 } | 80 } |
| 81 | 81 |
| 82 void NullAudioSink::StartAudioHashForTesting() { | 82 void NullAudioSink::StartAudioHashForTesting() { |
| 83 DCHECK(!initialized_); | 83 DCHECK(!initialized_); |
| 84 audio_hash_.reset(new AudioHash()); | 84 audio_hash_.reset(new AudioHash()); |
| 85 } | 85 } |
| 86 | 86 |
| 87 std::string NullAudioSink::GetAudioHashForTesting() { | 87 std::string NullAudioSink::GetAudioHashForTesting() { |
| 88 return audio_hash_ ? audio_hash_->ToString() : ""; | 88 return audio_hash_ ? audio_hash_->ToString() : std::string(); |
| 89 } | 89 } |
| 90 | 90 |
| 91 } // namespace media | 91 } // namespace media |
| OLD | NEW |