Motown: Rename MediaProducer/Consumer to MediaPacketProducer/Consumer

services/media/factory_service/media_source_impl.cc

 // Copyright 2016 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 "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "services/media/factory_service/media_source_impl.h"
 #include "services/media/framework/util/callback_joiner.h"
 #include "services/media/framework/util/conversion_pipeline_builder.h"
@@ skipping 84 matching lines @@
           MediaSourceStreamDescriptor::New();
       descriptor->index = i;
       descriptor->media_type = streams_[i]->media_type();
       descriptor->original_media_type = streams_[i]->original_media_type();
       result[i] = descriptor.Pass();
     }
     callback.Run(result.Pass());
   });
 }
 
-void MediaSourceImpl::GetProducer(uint32_t stream_index,
-                                  InterfaceRequest<MediaProducer> producer) {
+void MediaSourceImpl::GetPacketProducer(
+    uint32_t stream_index,
+    InterfaceRequest<MediaPacketProducer> producer) {
   RCHECK(init_complete_.occurred());
 
   if (stream_index >= streams_.size()) {
     return;
   }
 
-  streams_[stream_index]->GetProducer(producer.Pass());
-}
-
-void MediaSourceImpl::GetPullModeProducer(
-    uint32_t stream_index,
-    InterfaceRequest<MediaPullModeProducer> producer) {
-  RCHECK(init_complete_.occurred());
-
-  if (stream_index >= streams_.size()) {
-    return;
-  }
-
-  streams_[stream_index]->GetPullModeProducer(producer.Pass());
+  streams_[stream_index]->GetPacketProducer(producer.Pass());
 }
 
 void MediaSourceImpl::GetStatus(uint64_t version_last_seen,
                                 const GetStatusCallback& callback) {
   status_publisher_.Get(version_last_seen, callback);
 }
 
 void MediaSourceImpl::Prepare(const PrepareCallback& callback) {
   RCHECK(init_complete_.occurred());
 
@@ skipping 72 matching lines @@
 MediaSourceImpl::Stream::~Stream() {}
 
 MediaTypePtr MediaSourceImpl::Stream::media_type() const {
   return MediaType::From(stream_type_);
 }
 
 MediaTypePtr MediaSourceImpl::Stream::original_media_type() const {
   return MediaType::From(original_stream_type_);
 }
 
-void MediaSourceImpl::Stream::GetProducer(
-    InterfaceRequest<MediaProducer> producer) {
-  if (pull_mode_producer_) {
-    // Can't have both push mode and pull mode producers.
-    return;
-  }
-
+void MediaSourceImpl::Stream::GetPacketProducer(
+    InterfaceRequest<MediaPacketProducer> producer) {
   if (!producer_) {
-    producer_ = MojoProducer::Create();
+    producer_ = MojoPacketProducer::Create();
     graph_->ConnectOutputToPart(output_, graph_->Add(producer_));
   }
 
   producer_->AddBinding(producer.Pass());
 }
 
-void MediaSourceImpl::Stream::GetPullModeProducer(
-    InterfaceRequest<MediaPullModeProducer> producer) {
-  if (producer_) {
-    // Can't have both push mode and pull mode producers.
-    return;
-  }
-
-  if (!pull_mode_producer_) {
-    pull_mode_producer_ = MojoPullModeProducer::Create();
-    graph_->ConnectOutputToPart(output_, graph_->Add(pull_mode_producer_));
-  }
-
-  pull_mode_producer_->AddBinding(producer.Pass());
-}
-
 void MediaSourceImpl::Stream::EnsureSink() {
-  if (producer_ == nullptr && pull_mode_producer_ == nullptr) {
+  if (producer_ == nullptr) {
     null_sink_ = NullSink::Create();
     graph_->ConnectOutputToPart(output_, graph_->Add(null_sink_));
   }
 }
 
 void MediaSourceImpl::Stream::PrimeConnection(
-    const MojoProducer::PrimeConnectionCallback callback) {
+    const MojoPacketProducer::PrimeConnectionCallback callback) {
   if (producer_ != nullptr) {
     producer_->PrimeConnection(callback);
   } else {
     callback.Run();
   }
 }
 
 void MediaSourceImpl::Stream::FlushConnection(
-    const MojoProducer::FlushConnectionCallback callback) {
+    const MojoPacketProducer::FlushConnectionCallback callback) {
   if (producer_ != nullptr) {
     producer_->FlushConnection(callback);
   } else {
     callback.Run();
   }
 }
 
 }  // namespace media
 }  // namespace mojo