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

Unified Diff: media/tools/seek_tester/seek_tester.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/player_x11/player_x11.cc ('k') | media/webm/webm_stream_parser.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/tools/seek_tester/seek_tester.cc
diff --git a/media/tools/seek_tester/seek_tester.cc b/media/tools/seek_tester/seek_tester.cc
index d3f6a35044ee1591eae8860244cffe7f9f1331c7..ca54aa804ec05423a622a1644b02bfae47663719 100644
--- a/media/tools/seek_tester/seek_tester.cc
+++ b/media/tools/seek_tester/seek_tester.cc
@@ -54,8 +54,8 @@ void TimestampExtractor(uint64* timestamp_ms,
loop->PostTask(FROM_HERE, base::MessageLoop::QuitClosure());
}
-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.";
}
@@ -73,7 +73,7 @@ int main(int argc, char** argv) {
DemuxerHostImpl host;
base::MessageLoop loop;
media::PipelineStatusCB quitter = base::Bind(&QuitMessageLoop, &loop);
- media::FFmpegNeedKeyCB need_key_cb = base::Bind(&NeedKey);
+ media::Demuxer::NeedKeyCB need_key_cb = base::Bind(&NeedKey);
scoped_ptr<media::FFmpegDemuxer> demuxer(
new media::FFmpegDemuxer(loop.message_loop_proxy(),
file_data_source.get(),
« no previous file with comments | « media/tools/player_x11/player_x11.cc ('k') | media/webm/webm_stream_parser.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698