| Index: media/base/subsample_entry.h
|
| diff --git a/chromecast/public/media/cast_decrypt_config.h b/media/base/subsample_entry.h
|
| similarity index 57%
|
| copy from chromecast/public/media/cast_decrypt_config.h
|
| copy to media/base/subsample_entry.h
|
| index 582bce9b0297af6df7bcbf6a06f4bca97b9da252..07c5eee5ab377c060eb34762c743e0892627bbcb 100644
|
| --- a/chromecast/public/media/cast_decrypt_config.h
|
| +++ b/media/base/subsample_entry.h
|
| @@ -1,15 +1,12 @@
|
| -// Copyright 2015 The Chromium Authors. All rights reserved.
|
| +// Copyright 2016 The Chromium Authors. All rights reserved.
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef CHROMECAST_PUBLIC_MEDIA_CAST_DECRYPT_CONFIG_H_
|
| -#define CHROMECAST_PUBLIC_MEDIA_CAST_DECRYPT_CONFIG_H_
|
| +#ifndef MEDIA_BASE_SUBSAMPLE_ENTRY_H_
|
| +#define MEDIA_BASE_SUBSAMPLE_ENTRY_H_
|
|
|
| #include <stdint.h>
|
| -#include <string>
|
| -#include <vector>
|
|
|
| -namespace chromecast {
|
| namespace media {
|
|
|
| // The Common Encryption spec provides for subsample encryption, where portions
|
| @@ -29,22 +26,6 @@ struct SubsampleEntry {
|
| uint32_t cypher_bytes;
|
| };
|
|
|
| -// Contains all metadata needed to decrypt a media sample.
|
| -class CastDecryptConfig {
|
| - public:
|
| - virtual ~CastDecryptConfig() {}
|
| -
|
| - // Returns the ID for this sample's decryption key.
|
| - virtual const std::string& key_id() const = 0;
|
| -
|
| - // Returns the initialization vector as defined by the encryption format.
|
| - virtual const std::string& iv() const = 0;
|
| -
|
| - // Returns the clear and encrypted portions of the sample as described above.
|
| - virtual const std::vector<SubsampleEntry>& subsamples() const = 0;
|
| -};
|
| -
|
| } // namespace media
|
| -} // namespace chromecast
|
|
|
| -#endif // CHROMECAST_PUBLIC_MEDIA_CAST_DECRYPT_CONFIG_H_
|
| +#endif // MEDIA_BASE_SUBSAMPLE_ENTRY_H_
|
|
|