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

Unified Diff: media/tools/demuxer_bench/demuxer_bench.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/mp4/mp4_stream_parser_unittest.cc ('k') | media/tools/player_x11/player_x11.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/tools/demuxer_bench/demuxer_bench.cc
diff --git a/media/tools/demuxer_bench/demuxer_bench.cc b/media/tools/demuxer_bench/demuxer_bench.cc
index d38e5877433d17f9ea6f91850adbf27db7d2e40b..ab8b313c435c1213eab9a676504c175bc4fc830b 100644
--- a/media/tools/demuxer_bench/demuxer_bench.cc
+++ b/media/tools/demuxer_bench/demuxer_bench.cc
@@ -48,8 +48,8 @@ void QuitLoopWithStatus(base::MessageLoop* message_loop,
message_loop->PostTask(FROM_HERE, base::MessageLoop::QuitWhenIdleClosure());
}
-static void NeedKey(const std::string& type, scoped_ptr<uint8[]> init_data,
- int init_data_size) {
+static void NeedKey(const std::string& type,
+ const std::vector<uint8>& init_data) {
LOG(INFO) << "File is encrypted.";
}
@@ -194,7 +194,7 @@ int main(int argc, char** argv) {
media::FileDataSource data_source;
CHECK(data_source.Initialize(file_path));
- media::FFmpegNeedKeyCB need_key_cb = base::Bind(&NeedKey);
+ media::Demuxer::NeedKeyCB need_key_cb = base::Bind(&NeedKey);
media::FFmpegDemuxer demuxer(message_loop.message_loop_proxy(),
&data_source,
need_key_cb,
« no previous file with comments | « media/mp4/mp4_stream_parser_unittest.cc ('k') | media/tools/player_x11/player_x11.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698