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

Unified Diff: media/filters/chunk_demuxer.h

Issue 784493002: Encrypted Media: Rename NeedKey to EncryptedMediaInitData. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: comments addressed Created 6 years 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/blink/webmediaplayer_impl.cc ('k') | media/filters/chunk_demuxer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/chunk_demuxer.h
diff --git a/media/filters/chunk_demuxer.h b/media/filters/chunk_demuxer.h
index 63698b1d32ab4d47f3668b659a8714b6d2e2ac3a..6e8bdf95c7cde7cd6e767cf9c7b862f0ec0ec1fc 100644
--- a/media/filters/chunk_demuxer.h
+++ b/media/filters/chunk_demuxer.h
@@ -147,8 +147,8 @@ class MEDIA_EXPORT ChunkDemuxer : public Demuxer {
// |open_cb| Run when Initialize() is called to signal that the demuxer
// is ready to receive media data via AppenData().
- // |need_key_cb| Run when the demuxer determines that an encryption key is
- // needed to decrypt the content.
+ // |encrypted_media_init_data_cb| Run when the demuxer determines that an
+ // encryption key is needed to decrypt the content.
// |enable_text| Process inband text tracks in the normal way when true,
// otherwise ignore them.
// |log_cb| Run when parsing error messages need to be logged to the error
@@ -157,7 +157,7 @@ class MEDIA_EXPORT ChunkDemuxer : public Demuxer {
// per the MSE specification. Renderers must understand DecoderBuffer's
// splice_timestamp() field.
ChunkDemuxer(const base::Closure& open_cb,
- const NeedKeyCB& need_key_cb,
+ const EncryptedMediaInitDataCB& encrypted_media_init_data_cb,
const LogCB& log_cb,
const scoped_refptr<MediaLog>& media_log,
bool splice_frames_enabled);
@@ -359,7 +359,7 @@ class MEDIA_EXPORT ChunkDemuxer : public Demuxer {
DemuxerHost* host_;
base::Closure open_cb_;
- NeedKeyCB need_key_cb_;
+ EncryptedMediaInitDataCB encrypted_media_init_data_cb_;
bool enable_text_;
// Callback used to report error strings that can help the web developer
// figure out what is wrong with the content.
« no previous file with comments | « media/blink/webmediaplayer_impl.cc ('k') | media/filters/chunk_demuxer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698