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

Unified Diff: media/base/decrypt_config.h

Issue 2132653002: MediaCodecLoop unit tests (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: cl feedback Created 4 years, 4 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/base/android/sdk_media_codec_bridge.cc ('k') | media/base/subsample_entry.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/decrypt_config.h
diff --git a/media/base/decrypt_config.h b/media/base/decrypt_config.h
index 5ce28655575f90ea8776ae22798f24933e40e8a6..e025d0f4282b3f3fd0ded658b127d975525b1570 100644
--- a/media/base/decrypt_config.h
+++ b/media/base/decrypt_config.h
@@ -13,26 +13,10 @@
#include "base/macros.h"
#include "media/base/media_export.h"
+#include "media/base/subsample_entry.h"
namespace media {
-// The Common Encryption spec provides for subsample encryption, where portions
-// of a sample are set in cleartext. A SubsampleEntry specifies the number of
-// clear and encrypted bytes in each subsample. For decryption, all of the
-// encrypted bytes in a sample should be considered a single logical stream,
-// regardless of how they are divided into subsamples, and the clear bytes
-// should not be considered as part of decryption. This is logically equivalent
-// to concatenating all 'cypher_bytes' portions of subsamples, decrypting that
-// result, and then copying each byte from the decrypted block over the
-// position of the corresponding encrypted byte.
-struct SubsampleEntry {
- SubsampleEntry() : clear_bytes(0), cypher_bytes(0) {}
- SubsampleEntry(uint32_t clear_bytes, uint32_t cypher_bytes)
- : clear_bytes(clear_bytes), cypher_bytes(cypher_bytes) {}
- uint32_t clear_bytes;
- uint32_t cypher_bytes;
-};
-
// Contains all information that a decryptor needs to decrypt a media sample.
class MEDIA_EXPORT DecryptConfig {
public:
« no previous file with comments | « media/base/android/sdk_media_codec_bridge.cc ('k') | media/base/subsample_entry.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698