Add Common Encryption support to BMFF, including subsample decryption.

media/mp4/mp4_stream_parser_unittest.cc

 // 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 <algorithm>
 #include <string>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/logging.h"
@@ skipping 16 matching lines @@
 class MP4StreamParserTest : public testing::Test {
  public:
   MP4StreamParserTest()
       : parser_(new MP4StreamParser),
         got_configs_(false) {
   }
 
  protected:
   scoped_ptr<MP4StreamParser> parser_;
   base::TimeDelta segment_start_;
   bool got_configs_;

[ddorwin, 2012/07/17 01:14:21]

s/got/have/ seems better

[strobe_, 2012/07/19 02:43:35]

Done.

 
   bool AppendData(const uint8* data, size_t length) {
-    parser_->Parse(data, length);
-    return true;
+    return parser_->Parse(data, length);
   }
 
   bool AppendDataInPieces(const uint8* data, size_t length) {
     return AppendDataInPieces(data, length, 7);

[ddorwin, 2012/07/17 01:14:21]

Why 7? That's an odd size.

[strobe_, 2012/07/19 02:43:35]

Method unused, removed.

   }
 
   bool AppendDataInPieces(const uint8* data, size_t length, size_t piece_size) {
     const uint8* start = data;
     const uint8* end = data + length;
     while (start < end) {
       size_t append_size = std::min(piece_size,
                                     static_cast<size_t>(end - start));
       if (!AppendData(start, append_size))
         return false;
@@ skipping 20 matching lines @@
     return true;
   }
 
   bool NewBuffersF(const StreamParser::BufferQueue& bufs) {
     DVLOG(2) << "NewBuffersF: " << bufs.size() << " buffers";
     for (StreamParser::BufferQueue::const_iterator buf = bufs.begin();
          buf != bufs.end(); buf++) {
       DVLOG(3) << "  n=" << buf - bufs.begin()
                << ", size=" << (*buf)->GetDataSize()
                << ", dur=" << (*buf)->GetDuration().InMilliseconds();
       EXPECT_LE(segment_start_, (*buf)->GetTimestamp());

[ddorwin, 2012/07/17 01:14:21]

You're really testing the timestamp, which means this should be GE(TS, start_),
right?

[strobe_, 2012/07/19 02:43:35]

Well, not according to the macro definition ;) Aaron informed me that the
convention is reversed in media/. Fixed.

     }
     return true;
   }
 
   bool KeyNeededF(scoped_array<uint8> init_data, int init_data_size) {
     DVLOG(1) << "KeyNeededF: " << init_data_size;
     return true;
   }
 
   void NewSegmentF(TimeDelta start_dts) {
     DVLOG(1) << "NewSegmentF: " << start_dts.InMilliseconds();
     segment_start_ = start_dts;
   }
 
   void InitializeParser() {
     parser_->Init(
         base::Bind(&MP4StreamParserTest::InitF, base::Unretained(this)),
         base::Bind(&MP4StreamParserTest::NewConfigF, base::Unretained(this)),
         base::Bind(&MP4StreamParserTest::NewBuffersF, base::Unretained(this)),
         base::Bind(&MP4StreamParserTest::NewBuffersF, base::Unretained(this)),
         base::Bind(&MP4StreamParserTest::KeyNeededF, base::Unretained(this)),
         base::Bind(&MP4StreamParserTest::NewSegmentF, base::Unretained(this)));
   }
 
   bool ParseMP4File(const std::string& filename, int append_size) {

[ddorwin, 2012/07/17 01:14:21]

size=bytes?

[strobe_, 2012/07/19 02:43:35]

Done.

     InitializeParser();
 
     scoped_refptr<DecoderBuffer> buffer = ReadTestDataFile(filename);
     EXPECT_TRUE(AppendDataInPieces(buffer->GetData(),
                                    buffer->GetDataSize(),
                                    append_size));
     return true;
   }
 };
 
 TEST_F(MP4StreamParserTest, TestParseBearDASH) {

[ddorwin, 2012/07/17 01:14:21]

Is "bear" really relevant to the test? What is interesting about the 512?

[strobe_, 2012/07/19 02:43:35]

Renamed and commented.

   ParseMP4File("bear.1280x720_dash.mp4", 512);

[ddorwin, 2012/07/17 01:14:21]

Unrelated to this CL, is this file really "dash" or just BMFF?

[strobe_, 2012/07/19 02:43:35]

It complies with 23009-1 6.3.4 and 14496-12 FAMD3 8.8.14. It's representative of
what you might find in a DASH Live Profile media stream.

 }
 
 TEST_F(MP4StreamParserTest, TestMultiFragmentAppend) {
   ParseMP4File("bear.1280x720_dash.mp4", 768432);

[ddorwin, 2012/07/17 01:14:21]

What do the sizes mean?

[strobe_, 2012/07/19 02:43:35]

Commented.

 }
 
 TEST_F(MP4StreamParserTest, TestReinitialization) {
   InitializeParser();

[ddorwin, 2012/07/17 01:14:21]

Where is the second initialization? Shouldn't re-initialization be tested after
parsing some data?

[strobe_, 2012/07/19 02:43:35]

Commented.

[ddorwin, 2012/07/19 06:11:10]

Where?

 
   scoped_refptr<DecoderBuffer> buffer =
       ReadTestDataFile("bear.1280x720_dash.mp4");
   EXPECT_TRUE(AppendDataInPieces(buffer->GetData(),
                                  buffer->GetDataSize(),
                                  512));
   EXPECT_TRUE(AppendDataInPieces(buffer->GetData(),
                                  buffer->GetDataSize(),
                                  512));
 }
 
 }  // namespace mp4
 }  // namespace media