diff options
| author | strobe@google.com <strobe@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-03 05:00:28 +0000 |
|---|---|---|
| committer | strobe@google.com <strobe@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-03 05:00:28 +0000 |
| commit | e2f6e4636e6ac26314db70af4ea32287f7139f2c (patch) | |
| tree | 22ae6418d6c5dc93b8d515b75fd99bee2dc728cf /media/mp4 | |
| parent | d548566b9a301a42bc1f9aa8147722e87f7b8155 (diff) | |
| download | chromium_src-e2f6e4636e6ac26314db70af4ea32287f7139f2c.zip chromium_src-e2f6e4636e6ac26314db70af4ea32287f7139f2c.tar.gz chromium_src-e2f6e4636e6ac26314db70af4ea32287f7139f2c.tar.bz2 | |
Fix key re-emission on every new segment for BMFF in MSE/EME.
A typo caused a 'needkey' event to be fired on appending any new media segment
if the initialization segment contained 'pssh' atoms for BMFF. This is only one
of a few ways in which we're not yet to spec (not to mention that the spec
itself is still being worked on).
BUG=142467
TEST=Manual
Review URL: https://chromiumcodereview.appspot.com/11365002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165845 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/mp4')
| -rw-r--r-- | media/mp4/mp4_stream_parser.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/mp4/mp4_stream_parser.cc b/media/mp4/mp4_stream_parser.cc index 07135d8..3546be9 100644 --- a/media/mp4/mp4_stream_parser.cc +++ b/media/mp4/mp4_stream_parser.cc @@ -265,7 +265,7 @@ bool MP4StreamParser::ParseMoof(BoxReader* reader) { MovieFragment moof; RCHECK(moof.Parse(reader)); RCHECK(runs_->Init(moof)); - RCHECK(EmitNeedKeyIfNecessary(moov_->pssh)); + RCHECK(EmitNeedKeyIfNecessary(moof.pssh)); new_segment_cb_.Run(runs_->GetMinDecodeTimestamp()); ChangeState(kEmittingSamples); return true; |