--- a/dom/media/GraphDriver.h+++ b/dom/media/GraphDriver.h@@ -47,22 +47,16 @@ static const int SCHEDULE_SAFETY_MARGIN_ * given time (until we add processing). * This is not optimal yet. */ static const int AUDIO_TARGET_MS = 2*MEDIA_GRAPH_TARGET_PERIOD_MS + SCHEDULE_SAFETY_MARGIN_MS; class MediaStreamGraphImpl;-/**- * Microseconds relative to the start of the graph timeline.- */-typedef int64_t GraphTime;-const GraphTime GRAPH_TIME_MAX = MEDIA_TIME_MAX;- class AudioCallbackDriver; class OfflineClockDriver; /** * A driver is responsible for the scheduling of the processing, the thread * management, and give the different clocks to a MediaStreamGraph. This is an * abstract base class. A MediaStreamGraph can be driven by an * OfflineClockDriver, if the graph is offline, or a SystemClockDriver, if the

--- a/dom/media/MediaSegment.h+++ b/dom/media/MediaSegment.h@@ -44,16 +44,22 @@ const int64_t MEDIA_TIME_MAX = TRACK_TIC /** * Media time relative to the start of a StreamBuffer. */ typedef MediaTime StreamTime; const StreamTime STREAM_TIME_MAX = MEDIA_TIME_MAX; /**+ * Media time relative to the start of the graph timeline.+ */+typedef MediaTime GraphTime;+const GraphTime GRAPH_TIME_MAX = MEDIA_TIME_MAX;++/** * A MediaSegment is a chunk of media data sequential in time. Different * types of data have different subclasses of MediaSegment, all inheriting * from MediaSegmentBase. * All MediaSegment data is timed using StreamTime. The actual tick rate * is defined on a per-track basis. For some track types, this can be * a fixed constant for all tracks of that type (e.g. 1MHz for video). * * Each media segment defines a concept of "null media data" (e.g. silence