Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2)

Side by Side Diff: media/base/audio_hash.cc

Issue 377803004: Fixes for re-enabling more MSVC level 4 warnings: media/ edition (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Review comments Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « media/base/audio_hash.h ('k') | media/base/audio_video_metadata_extractor.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 // MSVC++ requires this to be set before any other includes to get M_PI. 5 // MSVC++ requires this to be set before any other includes to get M_PI.
6 #define _USE_MATH_DEFINES 6 #define _USE_MATH_DEFINES
7 #include <cmath> 7 #include <cmath>
8 8
9 #include "media/base/audio_hash.h" 9 #include "media/base/audio_hash.h"
10 10
11 #include "base/strings/stringprintf.h" 11 #include "base/strings/stringprintf.h"
12 #include "media/base/audio_bus.h" 12 #include "media/base/audio_bus.h"
13 13
14 namespace media { 14 namespace media {
15 15
16 AudioHash::AudioHash() 16 AudioHash::AudioHash()
17 : audio_hash_(), 17 : audio_hash_(),
18 sample_count_(0) { 18 sample_count_(0) {
19 COMPILE_ASSERT(arraysize(audio_hash_) == kHashBuckets, audio_hash_size_error);
20 } 19 }
21 20
22 AudioHash::~AudioHash() {} 21 AudioHash::~AudioHash() {}
23 22
24 void AudioHash::Update(const AudioBus* audio_bus, int frames) { 23 void AudioHash::Update(const AudioBus* audio_bus, int frames) {
25 // Use uint32 to ensure overflow is a defined operation. 24 // Use uint32 to ensure overflow is a defined operation.
26 for (uint32 ch = 0; ch < static_cast<uint32>(audio_bus->channels()); ++ch) { 25 for (uint32 ch = 0; ch < static_cast<uint32>(audio_bus->channels()); ++ch) {
27 const float* channel = audio_bus->channel(ch); 26 const float* channel = audio_bus->channel(ch);
28 for (uint32 i = 0; i < static_cast<uint32>(frames); ++i) { 27 for (uint32 i = 0; i < static_cast<uint32>(frames); ++i) {
29 const uint32 kSampleIndex = sample_count_ + i; 28 const uint32 kSampleIndex = sample_count_ + i;
30 const uint32 kHashIndex = (kSampleIndex * (ch + 1)) % kHashBuckets; 29 const uint32 kHashIndex =
30 (kSampleIndex * (ch + 1)) % arraysize(audio_hash_);
31 31
32 // Mix in a sine wave with the result so we ensure that sequences of empty 32 // Mix in a sine wave with the result so we ensure that sequences of empty
33 // buffers don't result in an empty hash. 33 // buffers don't result in an empty hash.
34 if (ch == 0) { 34 if (ch == 0) {
35 audio_hash_[kHashIndex] += 35 audio_hash_[kHashIndex] +=
36 channel[i] + sin(2.0 * M_PI * M_PI * kSampleIndex); 36 channel[i] + sin(2.0 * M_PI * M_PI * kSampleIndex);
37 } else { 37 } else {
38 audio_hash_[kHashIndex] += channel[i]; 38 audio_hash_[kHashIndex] += channel[i];
39 } 39 }
40 } 40 }
41 } 41 }
42 42
43 sample_count_ += static_cast<uint32>(frames); 43 sample_count_ += static_cast<uint32>(frames);
44 } 44 }
45 45
46 std::string AudioHash::ToString() const { 46 std::string AudioHash::ToString() const {
47 std::string result; 47 std::string result;
48 for (size_t i = 0; i < arraysize(audio_hash_); ++i) 48 for (size_t i = 0; i < arraysize(audio_hash_); ++i)
49 result += base::StringPrintf("%.2f,", audio_hash_[i]); 49 result += base::StringPrintf("%.2f,", audio_hash_[i]);
50 return result; 50 return result;
51 } 51 }
52 52
53 } // namespace media 53 } // namespace media
OLDNEW
« no previous file with comments | « media/base/audio_hash.h ('k') | media/base/audio_video_metadata_extractor.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698