summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorfbarchard@chromium.org <fbarchard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-09 22:44:17 +0000
committerfbarchard@chromium.org <fbarchard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-09 22:44:17 +0000
commitbe967dabc052a642585653c5f0ae2bb505ad807a (patch)
tree178fb12b3ad1531e3b56b21db9e0aadbf3375515 /media
parentaea5c1ff5fddfbb51f2861dea0e7a2876dac28e0 (diff)
downloadchromium_src-be967dabc052a642585653c5f0ae2bb505ad807a.zip
chromium_src-be967dabc052a642585653c5f0ae2bb505ad807a.tar.gz
chromium_src-be967dabc052a642585653c5f0ae2bb505ad807a.tar.bz2
media_bench use djb2 hash from media/base
Review URL: http://codereview.chromium.org/271034 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28615 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
-rw-r--r--media/bench/bench.cc14
1 files changed, 1 insertions, 13 deletions
diff --git a/media/bench/bench.cc b/media/bench/bench.cc
index 366abdd..11afdf9 100644
--- a/media/bench/bench.cc
+++ b/media/bench/bench.cc
@@ -27,6 +27,7 @@
#include "base/md5.h"
#include "base/string_util.h"
#include "base/time.h"
+#include "media/base/djb2.h"
#include "media/base/media.h"
#include "media/bench/file_protocol.h"
#include "media/filters/ffmpeg_common.h"
@@ -46,19 +47,6 @@ const wchar_t kLoop[] = L"loop";
} // namespace switches
-namespace {
-// DJB2 hash
-unsigned int DJB2Hash(const uint8* s,
- size_t len, unsigned int hash) {
- if (len > 0) {
- do {
- hash = hash * 33 + *s++;
- } while (--len);
- }
- return hash;
-}
-}
-
#if defined(OS_WIN)
// warning: disable warning about exception handler.
#pragma warning(disable:4509)