diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-18 16:54:58 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-18 16:54:58 +0000 |
| commit | 0ad1d2d6eb6f1e4edff72dabb8e2b2f9ba051f88 (patch) | |
| tree | 34d232d10e6415100d5b660317c23a14e157ba83 /media/test/ffmpeg_tests | |
| parent | dac096590a0f00f124eb71b12ff6a32cee439fca (diff) | |
| download | chromium_src-0ad1d2d6eb6f1e4edff72dabb8e2b2f9ba051f88.zip chromium_src-0ad1d2d6eb6f1e4edff72dabb8e2b2f9ba051f88.tar.gz chromium_src-0ad1d2d6eb6f1e4edff72dabb8e2b2f9ba051f88.tar.bz2 | |
base: Put md5.* into base namespace.
BUG=89274
TEST=None
R=evan@chromium.org
Review URL: http://codereview.chromium.org/7395021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92861 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/test/ffmpeg_tests')
| -rw-r--r-- | media/test/ffmpeg_tests/ffmpeg_tests.cc | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/media/test/ffmpeg_tests/ffmpeg_tests.cc b/media/test/ffmpeg_tests/ffmpeg_tests.cc index 4bdc6ba..8c0bc7c 100644 --- a/media/test/ffmpeg_tests/ffmpeg_tests.cc +++ b/media/test/ffmpeg_tests/ffmpeg_tests.cc @@ -102,8 +102,8 @@ int main(int argc, const char** argv) { unsigned int hash_value = 5381u; // Seed for DJB2. bool hash_djb2 = false; - MD5Context ctx; // Intermediate MD5 data: do not use - MD5Init(&ctx); + base::MD5Context ctx; // Intermediate MD5 data: do not use + base::MD5Init(&ctx); bool hash_md5 = false; std::ostream* log_out = &std::cout; @@ -316,9 +316,8 @@ int main(int argc, const char** argv) { if (hash_djb2) { hash_value = DJB2Hash(u8_samples, size_out, hash_value); } - if (hash_md5) { - MD5Update(&ctx, u8_samples, size_out); - } + if (hash_md5) + base::MD5Update(&ctx, u8_samples, size_out); } } else if (target_codec == AVMEDIA_TYPE_VIDEO) { int got_picture = 0; @@ -378,8 +377,8 @@ int main(int argc, const char** argv) { } if (hash_md5) { for (size_t i = 0; i < copy_lines; ++i) { - MD5Update(&ctx, reinterpret_cast<const uint8*>(source), - bytes_per_line); + base::MD5Update(&ctx, reinterpret_cast<const uint8*>(source), + bytes_per_line); source += source_stride; } } @@ -482,9 +481,9 @@ int main(int argc, const char** argv) { << " " << in_path.value() << std::endl; } if (hash_md5) { - MD5Digest digest; // The result of the computation. - MD5Final(&digest, &ctx); - *log_out << " MD5 Hash: " << MD5DigestToBase16(digest) + base::MD5Digest digest; // The result of the computation. + base::MD5Final(&digest, &ctx); + *log_out << " MD5 Hash: " << base::MD5DigestToBase16(digest) << " " << in_path.value() << std::endl; } #endif // SHOW_VERBOSE |