media/mp4/cenc.h - Issue 10651006: Add Common Encryption support to BMFF, including subsample decryption.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: media/mp4/cenc.h

Issue 10651006: Add Common Encryption support to BMFF, including subsample decryption. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Remove references to non-public encrypted files in tests Created 8 years, 6 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

Index: media/mp4/cenc.h

diff --git a/media/mp4/cenc.h b/media/mp4/cenc.h

index ee23743f5ac9c15fdeaef70d61b03c9f0c233b8a..e6b6635892745a41f0aba8d73dde9ca870bd4f8f 100644

--- a/media/mp4/cenc.h

+++ b/media/mp4/cenc.h

@@ -8,20 +8,16 @@

#include <vector>

#include "base/basictypes.h"

+#include "media/base/decrypt_config.h"

namespace media {

namespace mp4 {

class BufferReader;

-struct SubsampleSizes {

- uint16 clear_size;

- uint32 encrypted_size;

-};

struct FrameCENCInfo {

- std::vector<uint8> iv;

- std::vector<SubsampleSizes> subsamples;

+ uint8 iv[16];

+ std::vector<SubsampleEntry> subsamples;

FrameCENCInfo();

~FrameCENCInfo();

« media/mp4/box_definitions.cc ('K') | « media/mp4/box_definitions.cc ('k') | media/mp4/cenc.cc » ('j') | media/mp4/cenc.cc » ('J')