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

Side by Side Diff: media/base/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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef MEDIA_BASE_DEMUXER_H_ 5 #ifndef MEDIA_BASE_DEMUXER_H_
6 #define MEDIA_BASE_DEMUXER_H_ 6 #define MEDIA_BASE_DEMUXER_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/time/time.h" 10 #include "base/time/time.h"
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 protected: 42 protected:
43 virtual ~DemuxerHost(); 43 virtual ~DemuxerHost();
44 }; 44 };
45 45
46 class MEDIA_EXPORT Demuxer : public DemuxerStreamProvider { 46 class MEDIA_EXPORT Demuxer : public DemuxerStreamProvider {
47 public: 47 public:
48 // A new potentially encrypted stream has been parsed. 48 // A new potentially encrypted stream has been parsed.
49 // First parameter - The type of initialization data. 49 // First parameter - The type of initialization data.
50 // Second parameter - The initialization data associated with the stream. 50 // Second parameter - The initialization data associated with the stream.
51 typedef base::Callback<void(const std::string& type, 51 typedef base::Callback<void(const std::string& type,
52 const std::vector<uint8>& init_data)> NeedKeyCB; 52 const std::vector<uint8>& init_data)>
53 EncryptedMediaInitDataCB;
53 54
54 Demuxer(); 55 Demuxer();
55 ~Demuxer() override; 56 ~Demuxer() override;
56 57
57 // Completes initialization of the demuxer. 58 // Completes initialization of the demuxer.
58 // 59 //
59 // The demuxer does not own |host| as it is guaranteed to outlive the 60 // The demuxer does not own |host| as it is guaranteed to outlive the
60 // lifetime of the demuxer. Don't delete it! 61 // lifetime of the demuxer. Don't delete it!
61 virtual void Initialize(DemuxerHost* host, 62 virtual void Initialize(DemuxerHost* host,
62 const PipelineStatusCB& status_cb, 63 const PipelineStatusCB& status_cb,
(...skipping 18 matching lines...) Expand all
81 // a null Time is returned. 82 // a null Time is returned.
82 virtual base::Time GetTimelineOffset() const = 0; 83 virtual base::Time GetTimelineOffset() const = 0;
83 84
84 private: 85 private:
85 DISALLOW_COPY_AND_ASSIGN(Demuxer); 86 DISALLOW_COPY_AND_ASSIGN(Demuxer);
86 }; 87 };
87 88
88 } // namespace media 89 } // namespace media
89 90
90 #endif // MEDIA_BASE_DEMUXER_H_ 91 #endif // MEDIA_BASE_DEMUXER_H_
OLDNEW
« no previous file with comments | « content/renderer/media/android/webmediaplayer_android.cc ('k') | media/base/demuxer_perftest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698