Fix ChunkDemuxer so it properly outputs buffered ranges.

media/base/ranges_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 <sstream>
 
 #include "media/base/ranges.h"
 
 #include "base/string_piece.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 81 matching lines @@
   ASSERT_EQ(r.Add(4, 5), 3u) << r;
   ASSERT_EQ(r.Add(0.5, 4.5), 1u) << r;
   ASSERT_RANGES(r, "{ [0,5) }");
 
   r.clear();
   ASSERT_EQ(r.Add(0, 1), 1u) << r;
   ASSERT_EQ(r.Add(1, 2), 1u) << r;
   ASSERT_RANGES(r, "{ [0,2) }");
 }
 
+TEST(RangesTest, IntersectionWith) {
+  Ranges<int> a;
+  Ranges<int> b;
+
+  ASSERT_EQ(a.Add(0, 1), 1u) << a;
+  ASSERT_EQ(a.Add(4, 7), 2u) << a;
+  ASSERT_EQ(a.Add(10, 12), 3u) << a;
+
+  // Test intersections with an empty range.
+  ASSERT_RANGES(a, "{ [0,1) [4,7) [10,12) }");
+  ASSERT_RANGES(b, "{ }");
+  ASSERT_RANGES(a.IntersectionWith(b), "{ }");
+  ASSERT_RANGES(b.IntersectionWith(a), "{ }");
+
+  // Test intersections with a completely overlaping range.
+  ASSERT_EQ(b.Add(-1, 13), 1u) << b;
+  ASSERT_RANGES(a, "{ [0,1) [4,7) [10,12) }");
+  ASSERT_RANGES(b, "{ [-1,13) }");
+  ASSERT_RANGES(a.IntersectionWith(b), "{ [0,1) [4,7) [10,12) }");
+  ASSERT_RANGES(b.IntersectionWith(a), "{ [0,1) [4,7) [10,12) }");
+
+  // Test intersections with a disjoint ranges.
+  b.clear();
+  ASSERT_EQ(b.Add(1, 4), 1u) << b;
+  ASSERT_EQ(b.Add(8, 9), 2u) << b;
+  ASSERT_RANGES(a, "{ [0,1) [4,7) [10,12) }");
+  ASSERT_RANGES(b, "{ [1,4) [8,9) }");
+  ASSERT_RANGES(a.IntersectionWith(b), "{ }");
+  ASSERT_RANGES(b.IntersectionWith(a), "{ }");
+
+  // Test intersections with partially overlapping ranges.

[Ami GONE FROM CHROMIUM, 2012/06/19 17:40:37]

Since the incrementing works based on comparing the .end()'s, IWBN to have a
test that says the right things happen even if they are equal. I.e.
{[0,1), [2,3)} \intersect {[0,3)}
and the reverse order both produce {[0,1), [2,3)}

[acolwell GONE FROM CHROMIUM, 2012/06/19 19:50:15]

Done.

+  b.clear();
+  ASSERT_EQ(b.Add(0, 3), 1u) << b;
+  ASSERT_EQ(b.Add(5, 11), 2u) << b;
+  ASSERT_RANGES(a, "{ [0,1) [4,7) [10,12) }");
+  ASSERT_RANGES(b, "{ [0,3) [5,11) }");
+  ASSERT_RANGES(a.IntersectionWith(b), "{ [0,1) [5,7) [10,11) }");
+  ASSERT_RANGES(b.IntersectionWith(a), "{ [0,1) [5,7) [10,11) }");
+}
+
 }  // namespace media