Move Liveness from DemuxerStreamProvider to DemuxerStream.

media/formats/webm/webm_stream_parser.cc

 // Copyright 2014 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 "media/formats/webm/webm_stream_parser.h"
 
 #include <string>
 
 #include "base/callback.h"
 #include "base/callback_helpers.h"
@@ skipping 189 matching lines @@
 
   if (info_parser.duration() > 0) {
     int64 duration_in_us = info_parser.duration() * timecode_scale_in_us;
     params.duration = base::TimeDelta::FromMicroseconds(duration_in_us);
   }
 
   params.timeline_offset = info_parser.date_utc();
 
   if (unknown_segment_size_ && (info_parser.duration() <= 0) &&
       !info_parser.date_utc().is_null()) {
-    params.liveness = Demuxer::LIVENESS_LIVE;
+    params.liveness = DemuxerStream::LIVENESS_LIVE;
   } else if (info_parser.duration() >= 0) {
-    params.liveness = Demuxer::LIVENESS_RECORDED;
+    params.liveness = DemuxerStream::LIVENESS_RECORDED;
   } else {
-    params.liveness = Demuxer::LIVENESS_UNKNOWN;
+    params.liveness = DemuxerStream::LIVENESS_UNKNOWN;
   }
 
   const AudioDecoderConfig& audio_config = tracks_parser.audio_decoder_config();
   if (audio_config.is_encrypted())
     FireNeedKey(tracks_parser.audio_encryption_key_id());
 
   const VideoDecoderConfig& video_config = tracks_parser.video_decoder_config();
   if (video_config.is_encrypted())
     FireNeedKey(tracks_parser.video_encryption_key_id());
 
@@ skipping 49 matching lines @@
 
   return bytes_parsed;
 }
 
 void WebMStreamParser::FireNeedKey(const std::string& key_id) {
   std::vector<uint8> key_id_vector(key_id.begin(), key_id.end());
   need_key_cb_.Run(kWebMInitDataType, key_id_vector);
 }
 
 }  // namespace media