media/formats/webm/webm_crypto_helpers.h - Issue 611513005: Pass initDataType instead of contentType on OnNeedKey().

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/formats/webm/webm_crypto_helpers.h

Issue 611513005: Pass initDataType instead of contentType on OnNeedKey(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 3 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/formats/webm/webm_crypto_helpers.h

diff --git a/media/formats/webm/webm_crypto_helpers.h b/media/formats/webm/webm_crypto_helpers.h

index 23095f31d3d85155db9181cb0a5acee2dd1ddba3..d602e63398c6f68d574135f8c16b6f2af5c9a05d 100644

--- a/media/formats/webm/webm_crypto_helpers.h

+++ b/media/formats/webm/webm_crypto_helpers.h

@@ -11,10 +11,7 @@

namespace media {

-// TODO(xhwang): Figure out the init data type appropriately once it's spec'ed.

-// See https://www.w3.org/Bugs/Public/show_bug.cgi?id=19096 for more

-// information.

-const char kWebMEncryptInitDataType[] = "video/webm";

+const char kWebMEncryptInitDataType[] = "webm";

ddorwin 2014/09/26 22:09:18 The "Enrypt" part is weird, but oh well.

sandersd (OOO until July 31) 2014/09/26 22:49:56 Acknowledged.

// Fills an initialized DecryptConfig, which can be sent to the Decryptor if

// the stream has potentially encrypted frames. Also sets |data_offset| which

« media/formats/mp4/mp4_stream_parser.cc ('K') | « media/formats/mp4/mp4_stream_parser.cc ('k') | no next file » | no next file with comments »