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

Unified Diff: media/webm/webm_stream_parser.cc

Issue 23072043: Change NeedKeyCB to use std::vector. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix seek_tester, demuxer_bench, and player_x11 Created 7 years, 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/tools/seek_tester/seek_tester.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/webm/webm_stream_parser.cc
diff --git a/media/webm/webm_stream_parser.cc b/media/webm/webm_stream_parser.cc
index 796a1b3b0950bff38b6ebb7bfad2ca4cca918d72..12be44926842e3d0bd09abc082cd4d9b0adf2830 100644
--- a/media/webm/webm_stream_parser.cc
+++ b/media/webm/webm_stream_parser.cc
@@ -319,11 +319,8 @@ int WebMStreamParser::ParseCluster(const uint8* data, int size) {
}
void WebMStreamParser::FireNeedKey(const std::string& key_id) {
- int key_id_size = key_id.size();
- DCHECK_GT(key_id_size, 0);
- scoped_ptr<uint8[]> key_id_array(new uint8[key_id_size]);
- memcpy(key_id_array.get(), key_id.data(), key_id_size);
- need_key_cb_.Run(kWebMEncryptInitDataType, key_id_array.Pass(), key_id_size);
+ std::vector<uint8> key_id_vector(key_id.begin(), key_id.end());
+ need_key_cb_.Run(kWebMEncryptInitDataType, key_id_vector);
}
} // namespace media
« no previous file with comments | « media/tools/seek_tester/seek_tester.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698