Move Liveness from DemuxerStreamProvider to DemuxerStream.

media/base/stream_parser.h

 // 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.
 
 #ifndef MEDIA_BASE_STREAM_PARSER_H_
 #define MEDIA_BASE_STREAM_PARSER_H_
 
 #include <deque>
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/callback_forward.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time/time.h"
+#include "media/base/demuxer_stream.h"
 #include "media/base/media_export.h"
 #include "media/base/media_log.h"
 
 namespace media {
 
 class AudioDecoderConfig;
 class StreamParserBuffer;
 class TextTrackConfig;
 class VideoDecoderConfig;
 
@@ skipping 28 matching lines @@
 
     // Indicates the source time associated with presentation timestamp 0. A
     // null Time is returned if no mapping to Time exists.
     base::Time timeline_offset;
 
     // Indicates that timestampOffset should be updated based on the earliest
     // end timestamp (audio or video) provided during each NewBuffersCB.
     bool auto_update_timestamp_offset;
 
     // Indicates live stream.
-    Demuxer::Liveness liveness;
+    DemuxerStream::Liveness liveness;
   };
 
   // Indicates completion of parser initialization.
   //   success - True if initialization was successful.
   //   params - Stream parameters, in case of successful initialization.
   typedef base::Callback<void(bool success,
                               const InitParameters& params)> InitCB;
 
   // Indicates when new stream configurations have been parsed.
   // First parameter - The new audio configuration. If the config is not valid
@@ skipping 77 matching lines @@
 // subtle issues with tie-breaking. See http://crbug.com/338484.
 MEDIA_EXPORT bool MergeBufferQueues(
     const StreamParser::BufferQueue& audio_buffers,
     const StreamParser::BufferQueue& video_buffers,
     const StreamParser::TextBufferQueueMap& text_buffers,
     StreamParser::BufferQueue* merged_buffers);
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_STREAM_PARSER_H_