media/formats/mp4/mp4_stream_parser.cc - 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/mp4/mp4_stream_parser.cc

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

« content/renderer/media/crypto/encrypted_media_player_support_impl.cc ('K') | « content/renderer/media/crypto/encrypted_media_player_support_impl.cc ('k') | media/formats/webm/webm_crypto_helpers.h » ('j') | media/formats/webm/webm_crypto_helpers.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: media/formats/mp4/mp4_stream_parser.cc

diff --git a/media/formats/mp4/mp4_stream_parser.cc b/media/formats/mp4/mp4_stream_parser.cc

index 7ad3ccc38649a726fcbf1133507241fb809a73c3..84d80f9191031bec0af1ee0a92cb40a117067739 100644

--- a/media/formats/mp4/mp4_stream_parser.cc

+++ b/media/formats/mp4/mp4_stream_parser.cc

@@ -22,8 +22,7 @@

namespace media {

namespace mp4 {

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

-static const char kMp4InitDataType[] = "video/mp4";

+static const char kMp4InitDataType[] = "cenc";

ddorwin 2014/09/26 22:09:18 nit: s/Mp4/Cenc/ - IDT != container :)

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

MP4StreamParser::MP4StreamParser(const std::set<int>& audio_object_types,

bool has_sbr)