diff options
| author | acolwell@chromium.org <acolwell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-26 18:50:41 +0000 |
|---|---|---|
| committer | acolwell@chromium.org <acolwell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-26 18:50:41 +0000 |
| commit | 322d22cc0ed8ba7b0c64d598c9d0502bdef83b21 (patch) | |
| tree | 9ecccba2e55346e5850ba21b945164397dd04d6f /media/base/demuxer.h | |
| parent | 28af1231f836bbc2da6fc89a32dc8fb44ecc4d31 (diff) | |
| download | chromium_src-322d22cc0ed8ba7b0c64d598c9d0502bdef83b21.zip chromium_src-322d22cc0ed8ba7b0c64d598c9d0502bdef83b21.tar.gz chromium_src-322d22cc0ed8ba7b0c64d598c9d0502bdef83b21.tar.bz2 | |
Change NeedKeyCB to use std::vector.
Changes various NeedKeyCB instances to use std::vector<uint8> instead
of a scoped_ptr<uint8[]> and a size parameter.
TEST=All tests still pass.
Review URL: https://chromiumcodereview.appspot.com/23072043
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@219575 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/base/demuxer.h')
| -rw-r--r-- | media/base/demuxer.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/media/base/demuxer.h b/media/base/demuxer.h index 81ac33b..853a21a 100644 --- a/media/base/demuxer.h +++ b/media/base/demuxer.h @@ -5,6 +5,8 @@ #ifndef MEDIA_BASE_DEMUXER_H_ #define MEDIA_BASE_DEMUXER_H_ +#include <vector> + #include "base/time/time.h" #include "media/base/data_source.h" #include "media/base/demuxer_stream.h" @@ -29,6 +31,12 @@ class MEDIA_EXPORT DemuxerHost : public DataSourceHost { class MEDIA_EXPORT Demuxer { public: + // A new potentially encrypted stream has been parsed. + // First parameter - The type of initialization data. + // Second parameter - The initialization data associated with the stream. + typedef base::Callback<void(const std::string& type, + const std::vector<uint8>& init_data)> NeedKeyCB; + Demuxer(); virtual ~Demuxer(); |