webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 20 insertions, 2 deletions

diff --git a/Source/WebCore/platform/mock/mediasource/MockBox.h b/Source/WebCore/platform/mock/mediasource/MockBox.h
index 6ddc21c47..2cc530fe3 100644
--- a/Source/WebCore/platform/mock/mediasource/MockBox.h
+++ b/Source/WebCore/platform/mock/mediasource/MockBox.h
@@ -10,10 +10,10 @@
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
  * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
@@ -117,6 +117,7 @@ protected:
 // 4 bytes : signed : duration time value
 // 4 bytes : signed : track ID
 // 1 byte  : unsigned : flags
+// 1 byte  : unsigned : generation
 //
 class MockSampleBox final : public MockBox {
 public:
@@ -128,17 +129,33 @@ public:
     MediaTime duration() const { return m_duration; }
     int32_t trackID() const { return m_trackID; }
     uint8_t flags() const { return m_flags; }
+    uint8_t generation() const { return m_generation; }
+    void offsetTimestampsBy(const MediaTime& offset)
+    {
+        m_presentationTimestamp += offset;
+        m_decodeTimestamp += offset;
+    }
+    void setTimestamps(const MediaTime& presentationTimestamp, const MediaTime& decodeTimestamp)
+    {
+        m_presentationTimestamp = presentationTimestamp;
+        m_decodeTimestamp = decodeTimestamp;
+    }
+
+    void clearFlag(uint8_t flag) { m_flags &= ~flag; }
+    void setFlag(uint8_t flag) { m_flags |= flag; }
 
     enum {
         IsSync = 1 << 0,
         IsCorrupted = 1 << 1,
         IsDropped = 1 << 2,
         IsDelayed = 1 << 3,
+        IsNonDisplaying = 1 << 4,
     };
     bool isSync() const { return m_flags & IsSync; }
     bool isCorrupted() const { return m_flags & IsCorrupted; }
     bool isDropped() const { return m_flags & IsDropped; }
     bool isDelayed() const { return m_flags & IsDelayed; }
+    bool isNonDisplaying() const { return m_flags & IsNonDisplaying; }
 
 protected:
     MediaTime m_presentationTimestamp;
@@ -146,6 +163,7 @@ protected:
     MediaTime m_duration;
     int32_t m_trackID;
     uint8_t m_flags;
+    uint8_t m_generation;
 };
 
 }