diff options
| author | acolwell@chromium.org <acolwell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-19 08:04:35 +0000 |
|---|---|---|
| committer | acolwell@chromium.org <acolwell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-19 08:04:35 +0000 |
| commit | 6a21ce38eadecf5a142844ae2b9f938e10300469 (patch) | |
| tree | d62d45868e250787b52c66e48c2231775d1a6551 /media/formats | |
| parent | b9ef52ec12d457278af6d6616d7a77ddb98ed3a3 (diff) | |
| download | chromium_src-6a21ce38eadecf5a142844ae2b9f938e10300469.zip chromium_src-6a21ce38eadecf5a142844ae2b9f938e10300469.tar.gz chromium_src-6a21ce38eadecf5a142844ae2b9f938e10300469.tar.bz2 | |
Remove reserved value check in IndependentAndDisposableSamples.
Earlier versions of ISO 14496-12 indicated that the upper 2 bits of
the sample_info was reserved and must be 0. The current version of
ISO 14496-12:2012 now allows these bits to be non-zero so we need to
remove the check so the content will play. The new non-zero values are
not needed by the current code so we don't need any extra logic.
BUG=344737
Review URL: https://codereview.chromium.org/166323005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@251989 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/formats')
| -rw-r--r-- | media/formats/mp4/box_definitions.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/media/formats/mp4/box_definitions.cc b/media/formats/mp4/box_definitions.cc index 8367fd4..1912aae 100644 --- a/media/formats/mp4/box_definitions.cc +++ b/media/formats/mp4/box_definitions.cc @@ -801,7 +801,6 @@ bool IndependentAndDisposableSamples::Parse(BoxReader* reader) { for (int i = 0; i < sample_count; ++i) { uint8 sample_info; RCHECK(reader->Read1(&sample_info)); - RCHECK((sample_info >> 6) == 0); // reserved. sample_depends_on_[i] = static_cast<SampleDependsOn>((sample_info >> 4) & 0x3); |