Removing DataSource from Filter hierarchy

media/base/pipeline_impl.cc

 // Copyright (c) 2011 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.
 //
 // TODO(scherkus): clean up PipelineImpl... too many crazy function names,
 // potential deadlocks, etc...
 
 #include "media/base/pipeline_impl.h"
 
 #include <algorithm>
@@ skipping 322 matching lines @@
   // position but threading issues between BufferedDataSource::DoneRead_Locked()
   // and BufferedDataSource::NetworkEventCallback() can cause them to be
   // temporarily out of sync. The easiest fix for this is to cap both
   // buffered_bytes_ and current_bytes_ to always be legal values in
   // SetCurrentReadPosition() and in SetBufferedBytes().
   if (offset > buffered_bytes_)
     buffered_bytes_ = offset;
   current_bytes_ = offset;
 }
 
-int64 PipelineImpl::GetCurrentReadPosition() {
-  base::AutoLock auto_lock(lock_);
-  return current_bytes_;
-}
-
 void PipelineImpl::ResetState() {
   base::AutoLock auto_lock(lock_);
   const base::TimeDelta kZero;
   running_          = false;
   stop_pending_     = false;
   seek_pending_     = false;
   tearing_down_     = false;
   error_caused_teardown_ = false;
   playback_rate_change_pending_ = false;
   duration_         = kZero;
@@ skipping 92 matching lines @@
     return kStarting;
   } else if (current == kStarting) {
     return kStarted;
   } else if (current == kStopping) {
     return error_caused_teardown_ ? kError : kStopped;
   } else {
     return current;
   }
 }
 
+void PipelineImpl::OnDemuxerError(PipelineStatus error) {
+  SetError(error);
+}
+
 void PipelineImpl::SetError(PipelineStatus error) {
   DCHECK(IsRunning());
   DCHECK_NE(PIPELINE_OK, error);
   VLOG(1) << "Media pipeline error: " << error;
 
   message_loop_->PostTask(FROM_HERE,
      base::Bind(&PipelineImpl::ErrorChangedTask, this, error));
 
   media_log_->AddEvent(media_log_->CreatePipelineErrorEvent(error));
 }
@@ skipping 954 matching lines @@
   message_loop_->PostTask(FROM_HERE,
       base::Bind(&PipelineImpl::NotifyCanPlayThrough, this));
 }
 
 void PipelineImpl::NotifyCanPlayThrough() {
   DCHECK_EQ(MessageLoop::current(), message_loop_);
   NotifyNetworkEventTask(CAN_PLAY_THROUGH);
 }
 
 }  // namespace media