Make H264BitReader ignore trailing zero bytes and stop bit.

content/common/gpu/media/h264_bit_reader_unittest.cc

Index: content/common/gpu/media/h264_bit_reader_unittest.cc
diff --git a/content/common/gpu/media/h264_bit_reader_unittest.cc b/content/common/gpu/media/h264_bit_reader_unittest.cc
index a02a21c12547000a3f0b4ec14be8594f55f3451c..e5388591a90949823b639f96872d74ec6557398d 100644
--- a/content/common/gpu/media/h264_bit_reader_unittest.cc
+++ b/content/common/gpu/media/h264_bit_reader_unittest.cc
@@ -18,27 +18,31 @@ TEST(H264BitReaderTest, ReadStreamWithoutEscapeAndTrailingZeroBytes) {
   EXPECT_TRUE(reader.ReadBits(1, &dummy));
   EXPECT_EQ(dummy, 0x00);
   EXPECT_EQ(reader.NumBitsLeft(), 47);
-  EXPECT_TRUE(reader.HasMoreRBSPData());
 
   EXPECT_TRUE(reader.ReadBits(8, &dummy));
   EXPECT_EQ(dummy, 0x02);
   EXPECT_EQ(reader.NumBitsLeft(), 39);
-  EXPECT_TRUE(reader.HasMoreRBSPData());
 
   EXPECT_TRUE(reader.ReadBits(31, &dummy));
   EXPECT_EQ(dummy, 0x23456789);
   EXPECT_EQ(reader.NumBitsLeft(), 8);
-  EXPECT_TRUE(reader.HasMoreRBSPData());
 
   EXPECT_TRUE(reader.ReadBits(1, &dummy));
   EXPECT_EQ(dummy, 1);
   EXPECT_EQ(reader.NumBitsLeft(), 7);
-  EXPECT_TRUE(reader.HasMoreRBSPData());
 
   EXPECT_TRUE(reader.ReadBits(1, &dummy));
   EXPECT_EQ(dummy, 0);
   EXPECT_EQ(reader.NumBitsLeft(), 6);
-  EXPECT_FALSE(reader.HasMoreRBSPData());
+}
+
+TEST(H264BitReaderTest, EmptyStream) {
+  H264BitReader reader;
+  const unsigned char rbsp[] = {0x80, 0x00, 0x00};
+
+  EXPECT_FALSE(reader.Initialize(rbsp, 0));
+  EXPECT_FALSE(reader.Initialize(rbsp, 1));
+  EXPECT_FALSE(reader.Initialize(rbsp, sizeof(rbsp)));
 }
 
 TEST(H264BitReaderTest, SingleByteStream) {
@@ -48,12 +52,10 @@ TEST(H264BitReaderTest, SingleByteStream) {
 
   EXPECT_TRUE(reader.Initialize(rbsp, sizeof(rbsp)));
   EXPECT_EQ(reader.NumBitsLeft(), 8);
-  EXPECT_TRUE(reader.HasMoreRBSPData());
 
   EXPECT_TRUE(reader.ReadBits(4, &dummy));
   EXPECT_EQ(dummy, 0x01);
   EXPECT_EQ(reader.NumBitsLeft(), 4);
-  EXPECT_FALSE(reader.HasMoreRBSPData());
 }
 
 TEST(H264BitReaderTest, StopBitOccupyFullByte) {
@@ -63,10 +65,69 @@ TEST(H264BitReaderTest, StopBitOccupyFullByte) {
 
   EXPECT_TRUE(reader.Initialize(rbsp, sizeof(rbsp)));
   EXPECT_EQ(reader.NumBitsLeft(), 16);
-  EXPECT_TRUE(reader.HasMoreRBSPData());
 
   EXPECT_TRUE(reader.ReadBits(8, &dummy));
   EXPECT_EQ(dummy, 0xab);
   EXPECT_EQ(reader.NumBitsLeft(), 8);
-  EXPECT_FALSE(reader.HasMoreRBSPData());
+}
+
+TEST(H264BitReaderTest, ReadFailure) {
+  H264BitReader reader;
+  const unsigned char rbsp[] = {0x18};
+  int dummy = 0;
+
+  EXPECT_TRUE(reader.Initialize(rbsp, 1));
+  EXPECT_FALSE(reader.ReadBits(5, &dummy));
+}
+
+TEST(H264BitReaderTest, MalformedStream) {
+  const unsigned char rbsp[] = {0x00, 0x00, 0x03, 0x00, 0x00};
+  H264BitReader reader;
+
+  EXPECT_FALSE(reader.Initialize(rbsp, 1));
+  EXPECT_FALSE(reader.Initialize(rbsp, sizeof(rbsp)));
+}
+
+TEST(H264BitReaderTest, EscapeSequence) {
+  H264BitReader reader;
+  const unsigned char rbsp[] =
+      {0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x03, 0x03, 0x00, 0x00, 0x03};
+  int dummy = 0;
+
+  EXPECT_TRUE(reader.Initialize(rbsp, sizeof(rbsp)));
+
+  EXPECT_TRUE(reader.ReadBits(8, &dummy));
+  EXPECT_EQ(dummy, 0x00);
+  EXPECT_EQ(reader.NumBitsLeft(), 80);
+
+  EXPECT_TRUE(reader.ReadBits(24, &dummy));
+  EXPECT_EQ(dummy, 0x00);
+  EXPECT_EQ(reader.NumBitsLeft(), 48);
+
+  EXPECT_TRUE(reader.ReadBits(15, &dummy));
+  EXPECT_EQ(dummy, 0x01);
+  EXPECT_EQ(reader.NumBitsLeft(), 25);
+}
+
+TEST(H264BitReaderTest, NonEscapeFollowedByStopBit) {
+  H264BitReader reader;
+  const unsigned char rbsp[] = {0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00};
+  int dummy = 0;
+
+  EXPECT_TRUE(reader.Initialize(rbsp, sizeof(rbsp)));
+  EXPECT_TRUE(reader.ReadBits(23, &dummy));
+  EXPECT_EQ(dummy, 0x03);
+  EXPECT_EQ(reader.NumBitsLeft(), 33);
+}
+
+TEST(H264BitReaderTest, TrailingZero) {
+  H264BitReader reader;
+  const unsigned char rbsp[] = {0x01, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00};
+  int dummy = 0;
+
+  EXPECT_TRUE(reader.Initialize(rbsp, sizeof(rbsp)));
+  EXPECT_TRUE(reader.ReadBits(8, &dummy));
+  EXPECT_EQ(dummy, 0x01);
+  EXPECT_TRUE(reader.ReadBits(15, &dummy));
+  EXPECT_EQ(dummy, 0x01);
 }