diff options
| author | xhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-04 18:16:21 +0000 |
|---|---|---|
| committer | xhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-04 18:16:21 +0000 |
| commit | d05db09855f6e59254d0ef675149b257406e5e57 (patch) | |
| tree | 9c244281a6c08cd1a5aa5f407f136c3ae861d59d | |
| parent | c3db5de65b2e027530e0a31d703e94ae6f0a27e4 (diff) | |
| download | chromium_src-d05db09855f6e59254d0ef675149b257406e5e57.zip chromium_src-d05db09855f6e59254d0ef675149b257406e5e57.tar.gz chromium_src-d05db09855f6e59254d0ef675149b257406e5e57.tar.bz2 | |
Merge 284869 "Don't check reserved bits when parsing AVCDecoderC..."
> Don't check reserved bits when parsing AVCDecoderConfigurationRecords.
>
> This allows some videos with incorrectly set reserved bits to play.
>
> BUG=393304
>
> Review URL: https://codereview.chromium.org/412693002
R=sandersd@chromium.org
TBR=sandersd@chromium.org
Review URL: https://codereview.chromium.org/439373002
git-svn-id: svn://svn.chromium.org/chrome/branches/1985/src@287369 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | media/formats/mp4/box_definitions.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/media/formats/mp4/box_definitions.cc b/media/formats/mp4/box_definitions.cc index 8d0f554..3665928 100644 --- a/media/formats/mp4/box_definitions.cc +++ b/media/formats/mp4/box_definitions.cc @@ -365,14 +365,13 @@ bool AVCDecoderConfigurationRecord::ParseInternal(BufferReader* reader, reader->Read1(&avc_level)); uint8 length_size_minus_one; - RCHECK(reader->Read1(&length_size_minus_one) && - (length_size_minus_one & 0xfc) == 0xfc); + RCHECK(reader->Read1(&length_size_minus_one)); length_size = (length_size_minus_one & 0x3) + 1; RCHECK(length_size != 3); // Only values of 1, 2, and 4 are valid. uint8 num_sps; - RCHECK(reader->Read1(&num_sps) && (num_sps & 0xe0) == 0xe0); + RCHECK(reader->Read1(&num_sps)); num_sps &= 0x1f; sps_list.resize(num_sps); |