diff options
author | kqyang <kqyang@chromium.org> | 2015-03-11 19:51:05 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-03-12 02:51:24 +0000 |
commit | ced212cdf70057c2a5c57bb7746be66fc1345c79 (patch) | |
tree | 45e9954440121616506c8f3465448a594c148228 | |
parent | 94589f19319991fe570ed9c12aa5716596a323a3 (diff) | |
download | chromium_src-ced212cdf70057c2a5c57bb7746be66fc1345c79.zip chromium_src-ced212cdf70057c2a5c57bb7746be66fc1345c79.tar.gz chromium_src-ced212cdf70057c2a5c57bb7746be66fc1345c79.tar.bz2 |
Remove PSSH version specific code from MP4 parser
BUG=456208
Review URL: https://codereview.chromium.org/985263002
Cr-Commit-Position: refs/heads/master@{#320214}
-rw-r--r-- | media/formats/mp4/box_definitions.cc | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/media/formats/mp4/box_definitions.cc b/media/formats/mp4/box_definitions.cc index 9ee4306..fec356a 100644 --- a/media/formats/mp4/box_definitions.cc +++ b/media/formats/mp4/box_definitions.cc @@ -27,11 +27,8 @@ FourCC ProtectionSystemSpecificHeader::BoxType() const { return FOURCC_PSSH; } bool ProtectionSystemSpecificHeader::Parse(BoxReader* reader) { // Validate the box's contents and hang on to the system ID. - uint32 size; RCHECK(reader->ReadFullBoxHeader() && - reader->ReadVec(&system_id, 16) && - reader->Read4(&size) && - reader->HasBytes(size)); + reader->ReadVec(&system_id, 16)); // Copy the entire box, including the header, for passing to EME as initData. DCHECK(raw_box.empty()); |