diff options
author | gbillock@chromium.org <gbillock@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-15 00:16:08 +0000 |
---|---|---|
committer | gbillock@chromium.org <gbillock@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-15 00:16:08 +0000 |
commit | c6c5237d383d67b672bb4a19d99b1f88a5762e67 (patch) | |
tree | 287b401b0003bb43fb2ee3a6d8270b86edbf01da /media/mp4/cenc.cc | |
parent | aedce1b1e108b47b755bba68291e16f56a7a3550 (diff) | |
download | chromium_src-c6c5237d383d67b672bb4a19d99b1f88a5762e67.zip chromium_src-c6c5237d383d67b672bb4a19d99b1f88a5762e67.tar.gz chromium_src-c6c5237d383d67b672bb4a19d99b1f88a5762e67.tar.bz2 |
Revert 142268 - Implement ISO BMFF support in Media Source.
BUG=129072
TEST=MP4StreamParserTest
Review URL: https://chromiumcodereview.appspot.com/10536014
TBR=strobe@google.com
Review URL: https://chromiumcodereview.appspot.com/10533164
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@142283 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/mp4/cenc.cc')
-rw-r--r-- | media/mp4/cenc.cc | 45 |
1 files changed, 0 insertions, 45 deletions
diff --git a/media/mp4/cenc.cc b/media/mp4/cenc.cc deleted file mode 100644 index 996ebb1..0000000 --- a/media/mp4/cenc.cc +++ /dev/null @@ -1,45 +0,0 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include "media/mp4/cenc.h" - -#include "media/mp4/box_reader.h" -#include "media/mp4/rcheck.h" - -namespace media { -namespace mp4 { - -FrameCENCInfo::FrameCENCInfo() {} -FrameCENCInfo::~FrameCENCInfo() {} - -bool FrameCENCInfo::Parse(int iv_size, BufferReader* reader) { - const int kEntrySize = 6; - - // Mandated by CENC spec - RCHECK(iv_size == 8 || iv_size == 16); - iv.resize(iv_size); - - uint16 subsample_count; - RCHECK(reader->ReadVec(&iv, iv_size) && - reader->Read2(&subsample_count) && - reader->HasBytes(subsample_count * kEntrySize)); - subsamples.resize(subsample_count); - - for (int i = 0; i < subsample_count; i++) { - RCHECK(reader->Read2(&subsamples[i].clear_size) && - reader->Read4(&subsamples[i].encrypted_size)); - } - return true; -} - -size_t FrameCENCInfo::GetTotalSize() const { - size_t size = 0; - for (size_t i = 0; i < subsamples.size(); i++) { - size += subsamples[i].clear_size + subsamples[i].encrypted_size; - } - return size; -} - -} // namespace mp4 -} // namespace media |