Implement extended syntax for AVC/h264 unit tests

media/formats/mp4/avc_unittest.cc

 // Copyright 2014 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 <string.h>
 
 #include "base/basictypes.h"
 #include "base/strings/string_util.h"
 #include "media/base/decrypt_config.h"
 #include "media/base/stream_parser_buffer.h"
@@ skipping 101 matching lines @@
 
 static void WriteStartCodeAndNALUType(std::vector<uint8>* buffer,
                                       const std::string& nal_unit_type) {
   buffer->push_back(0x00);
   buffer->push_back(0x00);
   buffer->push_back(0x00);
   buffer->push_back(0x01);
   buffer->push_back(StringToNALUType(nal_unit_type));
 }
 
 void StringToAnnexB(const std::string& str, std::vector<uint8>* buffer,

[wolenetz, 2014/10/07 23:37:40]

nit: Document the format of |str| in method comment now that it is less trivial.

[servolk, 2014/10/07 23:57:19]

Done.

                     std::vector<SubsampleEntry>* subsamples) {
   DCHECK(!str.empty());
 
   std::vector<std::string> tokens;

[wolenetz, 2014/10/07 23:37:40]

nit: s/tokens/subsample_specs/

[servolk, 2014/10/07 23:57:18]

Done.

   EXPECT_GT(Tokenize(str, " ", &tokens), 0u);
 
   buffer->clear();
   for (size_t i = 0; i < tokens.size(); ++i) {
     SubsampleEntry entry;
     size_t start = buffer->size();
 
-    WriteStartCodeAndNALUType(buffer, tokens[i]);
+    std::vector<std::string> subsample_nalus;
+    EXPECT_GT(Tokenize(tokens[i], ",", &subsample_nalus), 0u);
+    for (size_t j = 0; j < subsample_nalus.size(); ++j) {
+      WriteStartCodeAndNALUType(buffer, subsample_nalus[j]);
+
+      // Write junk for the payload since the current code doesn't
+      // actually look at it.
+      buffer->push_back(0x32);
+      buffer->push_back(0x12);
+      buffer->push_back(0x67);
+    }
 
     entry.clear_bytes = buffer->size() - start;
 
-    // Write junk for the payload since the current code doesn't
-    // actually look at it.
-    buffer->push_back(0x32);
-    buffer->push_back(0x12);
-    buffer->push_back(0x67);
-
     if (subsamples) {
       // Simulate the encrypted bits containing something that looks
       // like a SPS NALU.
       WriteStartCodeAndNALUType(buffer, "SPS");
     }
 
     entry.cypher_bytes = buffer->size() - start - entry.clear_bytes;
 
     if (subsamples) {
       subsamples->push_back(entry);
     }
   }
 }
 
+int FindSubsampleIndex(const std::vector<uint8>& buffer,
+                       const std::vector<SubsampleEntry>* subsamples,
+                       const uint8* ptr) {
+  DCHECK(ptr >= &buffer[0]);
+  DCHECK(ptr <= &buffer[buffer.size()-1]);
+  if (!subsamples || subsamples->empty())
+    return 0;
+
+  const uint8* p = &buffer[0];
+  for (size_t i = 0; i < subsamples->size(); ++i) {
+    p += (*subsamples)[i].clear_bytes + (*subsamples)[i].cypher_bytes;
+    if (p > ptr) {
+      return i;
+    }
+  }
+  DCHECK(false);

[wolenetz, 2014/10/07 23:37:39]

nit: NOTREACHED();

[servolk, 2014/10/07 23:57:18]

Done.

+  return 0;
+}
+
 std::string AnnexBToString(const std::vector<uint8>& buffer,
                            const std::vector<SubsampleEntry>& subsamples) {
   std::stringstream ss;
 
   H264Parser parser;
   parser.SetEncryptedStream(&buffer[0], buffer.size(), subsamples);
 
   H264NALU nalu;
   bool first = true;
+  size_t current_subsample = 0;

[wolenetz, 2014/10/07 23:37:39]

nit: s/ple/ple_index/

[servolk, 2014/10/07 23:57:19]

Done.

   while (parser.AdvanceToNextNALU(&nalu) == H264Parser::kOk) {
+    size_t subsample = FindSubsampleIndex(buffer, &subsamples, nalu.data);

[wolenetz, 2014/10/07 23:37:39]

nit: ditto

[servolk, 2014/10/07 23:57:18]

Done.

     if (!first)
-      ss << " ";
+      ss << (subsample == current_subsample ? "," : " ");
     else
       first = false;

[wolenetz, 2014/10/07 23:37:39]

nit: maybe add a DCHECK_EQ(subsample_index, current_subsample) in this else
clause?

[servolk, 2014/10/07 23:57:19]

Done.

 
     ss << NALUTypeToString(nalu.nal_unit_type);
+    current_subsample = subsample;
   }
   return ss.str();
 }
 
 class AVCConversionTest : public testing::TestWithParam<int> {
  protected:
   void WriteLength(int length_size, int length, std::vector<uint8>* buf) {
     DCHECK_GE(length, 0);
     DCHECK_LE(length, 255);
 
@@ skipping 15 matching lines @@
 };
 
 TEST_P(AVCConversionTest, ParseCorrectly) {
   std::vector<uint8> buf;
   std::vector<SubsampleEntry> subsamples;
   MakeInputForLength(GetParam(), &buf);
   EXPECT_TRUE(AVC::ConvertFrameToAnnexB(GetParam(), &buf));
   EXPECT_TRUE(AVC::IsValidAnnexB(buf, subsamples));
   EXPECT_EQ(buf.size(), sizeof(kExpected));
   EXPECT_EQ(0, memcmp(kExpected, &buf[0], sizeof(kExpected)));
-  EXPECT_EQ("P SDC", AnnexBToString(buf, subsamples));
+  EXPECT_EQ("P,SDC", AnnexBToString(buf, subsamples));
 }
 
 // Intentionally write NALU sizes that are larger than the buffer.
 TEST_P(AVCConversionTest, NALUSizeTooLarge) {
   std::vector<uint8> buf;
   WriteLength(GetParam(), 10 * sizeof(kNALU1), &buf);
   buf.insert(buf.end(), kNALU1, kNALU1 + sizeof(kNALU1));
   EXPECT_FALSE(AVC::ConvertFrameToAnnexB(GetParam(), &buf));
 }
 
@@ skipping 77 matching lines @@
     "I EOSeq",
     "I EOSeq EOStr",
     "I EOStr",
     "P",
     "P P P P",
     "AUD SPS PPS P",
     "SEI SEI I",
     "SEI SEI R14 I",
     "SPS SPSExt SPS PPS I P",
     "R14 SEI I",
+    "AUD,I",
+    "AUD,SEI I",
+    "AUD,SEI,SPS,PPS,I"
   };
 
   for (size_t i = 0; i < arraysize(test_cases); ++i) {
     std::vector<uint8> buf;
     std::vector<SubsampleEntry> subsamples;
     StringToAnnexB(test_cases[i], &buf, NULL);
     EXPECT_TRUE(AVC::IsValidAnnexB(buf, subsamples)) << "'" << test_cases[i]
                                                      << "' failed";
   }
 }
 
 TEST_F(AVCConversionTest, InvalidAnnexBConstructs) {
   static const char* test_cases[] = {
     "AUD",  // No VCL present.
+    "AUD,SEI", // No VCL present.
     "SPS PPS",  // No VCL present.
     "SPS PPS AUD I",  // Parameter sets must come after AUD.
     "SPSExt SPS P",  // SPS must come before SPSExt.
     "SPS PPS SPSExt P",  // SPSExt must follow an SPS.
     "EOSeq",  // EOSeq must come after a VCL.
     "EOStr",  // EOStr must come after a VCL.
     "I EOStr EOSeq",  // EOSeq must come before EOStr.
     "I R14",  // Reserved14-18 must come before first VCL.
     "I SEI",  // SEI must come before first VCL.
     "P SPS P", // SPS after first VCL would indicate a new access unit.
@@ skipping 46 matching lines @@
         << "'" << test_cases[i].input << "' insert failed.";
     EXPECT_TRUE(AVC::IsValidAnnexB(buf, subsamples))
         << "'" << test_cases[i].input << "' created invalid AnnexB.";
     EXPECT_EQ(test_cases[i].expected, AnnexBToString(buf, subsamples))
         << "'" << test_cases[i].input << "' generated unexpected output.";
   }
 }
 
 }  // namespace mp4
 }  // namespace media