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

Unified Diff: media/filters/chunk_demuxer.cc

Issue 10534096: Generalize AesDecryptor to make it more spec compliant. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix compile error on Windows. Created 8 years, 6 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
Index: media/filters/chunk_demuxer.cc
diff --git a/media/filters/chunk_demuxer.cc b/media/filters/chunk_demuxer.cc
index 9a27f526e80450ff4be133693d923ba9927d263b..a7de0dc90c38ea5b1181eb99e164338e1554d4fa 100644
--- a/media/filters/chunk_demuxer.cc
+++ b/media/filters/chunk_demuxer.cc
@@ -563,7 +563,7 @@ ChunkDemuxer::Status ChunkDemuxer::AddId(const std::string& id,
has_audio, has_video),
audio_cb,
video_cb,
- base::Bind(&ChunkDemuxer::OnKeyNeeded, base::Unretained(this)));
+ base::Bind(&ChunkDemuxer::OnNeedKey, base::Unretained(this)));
stream_parser_map_[id] = stream_parser.release();
@@ -970,9 +970,9 @@ bool ChunkDemuxer::OnVideoBuffers(const StreamParser::BufferQueue& buffers) {
return video_->Append(buffers);
}
-bool ChunkDemuxer::OnKeyNeeded(scoped_array<uint8> init_data,
- int init_data_size) {
- client_->KeyNeeded(init_data.Pass(), init_data_size);
+bool ChunkDemuxer::OnNeedKey(scoped_array<uint8> init_data,
+ int init_data_size) {
+ client_->DemuxerNeedKey(init_data.Pass(), init_data_size);
return true;
}

Powered by Google App Engine
This is Rietveld 408576698