diff options
| author | dominich@chromium.org <dominich@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-26 23:39:50 +0000 |
|---|---|---|
| committer | dominich@chromium.org <dominich@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-26 23:39:50 +0000 |
| commit | a3bcff633580fa9afd4653817f497d8a49235994 (patch) | |
| tree | d81bbfab47ed019ea0eb47ccdfb914944f7bafdf /media | |
| parent | d045e3746c58aa12b603dc596e683f4f9f14f5a9 (diff) | |
| download | chromium_src-a3bcff633580fa9afd4653817f497d8a49235994.zip chromium_src-a3bcff633580fa9afd4653817f497d8a49235994.tar.gz chromium_src-a3bcff633580fa9afd4653817f497d8a49235994.tar.bz2 | |
MD5Update function uses StringPiece instead of raw buffer.
BUG=none
TEST=base_unittests --gtest_filter=MD5.ContextWithStringData*
Review URL: http://codereview.chromium.org/7466003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@94203 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
| -rw-r--r-- | media/test/ffmpeg_tests/ffmpeg_tests.cc | 15 | ||||
| -rw-r--r-- | media/tools/media_bench/media_bench.cc | 14 |
2 files changed, 20 insertions, 9 deletions
diff --git a/media/test/ffmpeg_tests/ffmpeg_tests.cc b/media/test/ffmpeg_tests/ffmpeg_tests.cc index 8c0bc7c..e91ca00 100644 --- a/media/test/ffmpeg_tests/ffmpeg_tests.cc +++ b/media/test/ffmpeg_tests/ffmpeg_tests.cc @@ -316,8 +316,12 @@ int main(int argc, const char** argv) { if (hash_djb2) { hash_value = DJB2Hash(u8_samples, size_out, hash_value); } - if (hash_md5) - base::MD5Update(&ctx, u8_samples, size_out); + if (hash_md5) { + base::MD5Update( + &ctx, + base::StringPiece( + reinterpret_cast<const char*>(u8_samples), size_out)); + } } } else if (target_codec == AVMEDIA_TYPE_VIDEO) { int got_picture = 0; @@ -377,8 +381,10 @@ int main(int argc, const char** argv) { } if (hash_md5) { for (size_t i = 0; i < copy_lines; ++i) { - base::MD5Update(&ctx, reinterpret_cast<const uint8*>(source), - bytes_per_line); + base::MD5Update( + &ctx, + base::StringPiece(reinterpret_cast<const char*>(source), + bytes_per_line)); source += source_stride; } } @@ -497,4 +503,3 @@ int main(int argc, const char** argv) { CommandLine::Reset(); return 0; } - diff --git a/media/tools/media_bench/media_bench.cc b/media/tools/media_bench/media_bench.cc index 1d3872a..66c3536e 100644 --- a/media/tools/media_bench/media_bench.cc +++ b/media/tools/media_bench/media_bench.cc @@ -426,8 +426,12 @@ int main(int argc, const char** argv) { if (hash_djb2) { hash_value = DJB2Hash(u8_samples, size_out, hash_value); } - if (hash_md5) - base::MD5Update(&ctx, u8_samples, size_out); + if (hash_md5) { + base::MD5Update( + &ctx, + base::StringPiece(reinterpret_cast<const char*>(u8_samples), + size_out)); + } } } else if (target_codec == AVMEDIA_TYPE_VIDEO) { int got_picture = 0; @@ -487,8 +491,10 @@ int main(int argc, const char** argv) { } if (hash_md5) { for (size_t i = 0; i < copy_lines; ++i) { - base::MD5Update(&ctx, reinterpret_cast<const uint8*>(source), - bytes_per_line); + base::MD5Update( + &ctx, + base::StringPiece(reinterpret_cast<const char*>(source), + bytes_per_line)); source += source_stride; } } |