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

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: Rebase 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
« no previous file with comments | « media/filters/chunk_demuxer.h ('k') | media/filters/chunk_demuxer_client.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/chunk_demuxer.cc
diff --git a/media/filters/chunk_demuxer.cc b/media/filters/chunk_demuxer.cc
index fcb36258bd520a246fa7733a376fc79d14195cba..dd98e3aed61edcbb55a48d3433df4d828708a74d 100644
--- a/media/filters/chunk_demuxer.cc
+++ b/media/filters/chunk_demuxer.cc
@@ -606,7 +606,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)),
base::Bind(&ChunkDemuxer::OnNewMediaSegment, base::Unretained(this), id));
stream_parser_map_[id] = stream_parser.release();
@@ -1018,9 +1018,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;
}
« no previous file with comments | « media/filters/chunk_demuxer.h ('k') | media/filters/chunk_demuxer_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698