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

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: Updated to pass layout tests. 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 8862ad15fa50cf4f3d07f7716a68f017be04c686..0806dcd07922274bd1791be4429d4f4491c3fcb9 100644
--- a/media/filters/chunk_demuxer.cc
+++ b/media/filters/chunk_demuxer.cc
@@ -504,7 +504,7 @@ ChunkDemuxer::Status ChunkDemuxer::AddId(const std::string& id,
base::Bind(&ChunkDemuxer::OnNewConfigs, base::Unretained(this)),
audio_cb,
video_cb,
- base::Bind(&ChunkDemuxer::OnKeyNeeded, base::Unretained(this)));
+ base::Bind(&ChunkDemuxer::OnNeedKey, base::Unretained(this)));
return kOk;
}
@@ -800,9 +800,9 @@ bool ChunkDemuxer::OnVideoBuffers(const StreamParser::BufferQueue& buffers) {
return true;
}
-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